"
return ""
-//WS Begin
-/datum/controller/subsystem/ticker/proc/mouse_report()
- if(GLOB.mouse_food_eaten)
- var/list/parts = list()
- parts += "Mouse stats:"
- parts += "Mouse Born: [GLOB.mouse_spawned]"
- parts += "Mouse Killed: [GLOB.mouse_killed]"
- parts += "Trash Eaten: [GLOB.mouse_food_eaten]"
- return "
[parts.Join(" ")]
"
- return ""
-//WS End
+
/datum/controller/subsystem/ticker/proc/antag_report()
var/list/result = list()
var/list/all_teams = list()
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 452a522870a..3770b4e847a 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -94,8 +94,8 @@
return "northwest"
if(SOUTHWEST)
return "southwest"
- else
- return
+
+ return NONE
//Turns text into proper directions
/proc/text2dir(direction)
@@ -116,8 +116,8 @@
return SOUTHEAST
if("SOUTHWEST")
return SOUTHWEST
- else
- return
+
+ return NONE
//Converts an angle (degrees) into an ss13 direction
GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH,SOUTHWEST,WEST,NORTHWEST))
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index c8c7b63d0a0..7bd6f72771c 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -294,65 +294,6 @@ Turf and target are separate in case you want to teleport some distance from a t
/proc/ionnum()
return "[pick("!","@","#","$","%","^","&")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")]"
-//Returns a list of all items of interest with their name
-/proc/getpois(mobs_only = FALSE, skip_mindless = FALSE, specify_dead_role = TRUE)
- var/list/mobs = sortmobs()
- var/list/namecounts = list()
- var/list/pois = list()
- for(var/mob/M in mobs)
- if(skip_mindless && (!M.mind && !M.ckey))
- if(!isbot(M) && !iscameramob(M) && !ismegafauna(M))
- continue
- if(M.client && M.client.holder && M.client.holder.fakekey) //stealthmins
- continue
- var/name = avoid_assoc_duplicate_keys(M.name, namecounts) + M.get_realname_string()
-
- if(M.stat == DEAD && specify_dead_role)
- if(isobserver(M))
- name += " \[ghost\]"
- else
- name += " \[dead\]"
- pois[name] = M
-
- if(!mobs_only)
- for(var/atom/A in GLOB.poi_list)
- if(!A || !A.loc)
- continue
- pois[avoid_assoc_duplicate_keys(A.name, namecounts)] = A
-
- return pois
-//Orders mobs by type then by name
-/proc/sortmobs()
- var/list/moblist = list()
- var/list/sortmob = sortNames(GLOB.mob_list)
- for(var/mob/living/silicon/ai/M in sortmob)
- moblist.Add(M)
- for(var/mob/camera/M in sortmob)
- moblist.Add(M)
- for(var/mob/living/silicon/pai/M in sortmob)
- moblist.Add(M)
- for(var/mob/living/silicon/robot/M in sortmob)
- moblist.Add(M)
- for(var/mob/living/carbon/human/M in sortmob)
- moblist.Add(M)
- for(var/mob/living/brain/M in sortmob)
- moblist.Add(M)
- for(var/mob/living/carbon/alien/M in sortmob)
- moblist.Add(M)
- for(var/mob/dead/observer/M in sortmob)
- moblist.Add(M)
- for(var/mob/dead/new_player/M in sortmob)
- moblist.Add(M)
- for(var/mob/living/carbon/monkey/M in sortmob)
- moblist.Add(M)
- for(var/mob/living/simple_animal/slime/M in sortmob)
- moblist.Add(M)
- for(var/mob/living/simple_animal/M in sortmob)
- moblist.Add(M)
- for(var/mob/living/carbon/true_devil/M in sortmob)
- moblist.Add(M)
- return moblist
-
// Format a power value in W, kW, MW, or GW.
/proc/DisplayPower(powerused)
if(powerused < 1000) //Less than a kW
@@ -384,7 +325,7 @@ Turf and target are separate in case you want to teleport some distance from a t
/proc/get_mob_by_ckey(key)
if(!key)
return
- var/list/mobs = sortmobs()
+ var/list/mobs = SSpoints_of_interest.get_mob_pois()
for(var/mob/M in mobs)
if(M.ckey == key)
return M
@@ -739,7 +680,7 @@ GLOBAL_LIST_INIT(WALLITEMS, typecacheof(list(
/obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard, /obj/machinery/button,
/obj/machinery/computer/security/telescreen, /obj/machinery/embedded_controller/radio/simple_vent_controller,
/obj/item/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth,
- /obj/structure/mirror, /obj/structure/fireaxecabinet, /obj/machinery/computer/security/telescreen/entertainment,
+ /obj/structure/mirror, /obj/structure/cabinet, /obj/machinery/computer/security/telescreen/entertainment,
/obj/structure/sign/picture_frame, /obj/machinery/bounty_board
)))
@@ -1420,10 +1361,15 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
REMOVE_TRAIT(the_atom2,trait,source)
/proc/get_random_food()
- var/list/blocked = list(/obj/item/reagent_containers/food/snacks/store/bread,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/store/cake,
- /obj/item/reagent_containers/food/snacks/cakeslice,
+ var/static/list/allowed_food = list()
+
+ if(!LAZYLEN(allowed_food)) //it's static so we only ever do this once
+ var/list/blocked = list(
+ /obj/item/food/spaghetti,
+ /obj/item/food/bread,
+ /obj/item/food/breadslice,
+ /obj/item/food/cake,
+ /obj/item/food/cakeslice,
/obj/item/reagent_containers/food/snacks/store,
/obj/item/reagent_containers/food/snacks/pie,
/obj/item/reagent_containers/food/snacks/kebab,
@@ -1435,15 +1381,21 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
/obj/item/reagent_containers/food/snacks/soup,
/obj/item/reagent_containers/food/snacks/grown,
/obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/deepfryholder,
+ /obj/item/food/deepfryholder,
/obj/item/reagent_containers/food/snacks/clothing,
/obj/item/reagent_containers/food/snacks/grown/shell, //base types
- /obj/item/reagent_containers/food/snacks/store/bread,
+ /obj/item/food/bread,
/obj/item/reagent_containers/food/snacks/grown/nettle
)
- blocked |= typesof(/obj/item/reagent_containers/food/snacks/customizable)
+ blocked |= typesof(/obj/item/reagent_containers/food/snacks/customizable)
+
+ var/list/unfiltered_allowed_food = subtypesof(/obj/item/food) - blocked
+ for(var/obj/item/food/food as anything in unfiltered_allowed_food)
+ if(!initial(food.icon_state)) //food with no icon_state should probably not be spawned
+ continue
+ allowed_food.Add(food)
- return pick(subtypesof(/obj/item/reagent_containers/food/snacks) - blocked)
+ return pick(allowed_food)
/proc/get_random_drink()
var/list/blocked = list(/obj/item/reagent_containers/food/drinks/soda_cans,
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index ee7638ea853..9ff2cbe896a 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -63,7 +63,7 @@
#warn compiling in TESTING mode. testing() debug messages will be visible.
#endif
-#ifdef CIBUILDING
+#if defined(CIBUILDING) && !defined(OPENDREAM)
#define UNIT_TESTS
#endif
@@ -90,3 +90,16 @@
// A reasonable number of maximum overlays an object needs
// If you think you need more, rethink it
#define MAX_ATOM_OVERLAYS 100
+
+#if defined(OPENDREAM)
+ #if !defined(CIBUILDING)
+ #warn You are building with OpenDream. Remember to build TGUI manually.
+ #warn You can do this by running tgui-build.cmd from the bin directory.
+ #endif
+#else
+ #if !defined(CBT) && !defined(SPACEMAN_DMM)
+ #warn Building with Dream Maker is no longer supported and will result in errors.
+ #warn In order to build, run BUILD.cmd in the root directory.
+ #warn Consider switching to VSCode editor instead, where you can press Ctrl+Shift+B to build.
+ #endif
+#endif
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index bbfb0d3a74c..61fa476fe7b 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -50,14 +50,12 @@ DEFINE_BITFIELD(appearance_flags, list(
DEFINE_BITFIELD(area_flags, list(
"VALID_TERRITORY" = VALID_TERRITORY,
- "BLOBS_ALLOWED" = BLOBS_ALLOWED,
"CAVES_ALLOWED" = CAVES_ALLOWED,
"FLORA_ALLOWED" = FLORA_ALLOWED,
"MOB_SPAWN_ALLOWED" = MOB_SPAWN_ALLOWED,
"NOTELEPORT" = NOTELEPORT,
"HIDDEN_AREA" = HIDDEN_AREA,
"UNIQUE_AREA" = UNIQUE_AREA,
- "XENOBIOLOGY_COMPATIBLE" = XENOBIOLOGY_COMPATIBLE,
))
DEFINE_BITFIELD(car_traits, list(
@@ -213,7 +211,6 @@ DEFINE_BITFIELD(obj_flags, list(
DEFINE_BITFIELD(pass_flags, list(
"LETPASSTHROW" = LETPASSTHROW,
- "PASSBLOB" = PASSBLOB,
"PASSCLOSEDTURF" = PASSCLOSEDTURF,
"PASSGLASS" = PASSGLASS,
"PASSGRILLE" = PASSGRILLE,
@@ -280,3 +277,13 @@ DEFINE_BITFIELD(bodytype, list(
"BODYTYPE_KEPORI" = BODYTYPE_KEPORI,
"BODYTYPE_VOX" = BODYTYPE_VOX
))
+
+DEFINE_BITFIELD(turret_flags, list(
+ "TURRET_FLAG_SHOOT_DANGEROUS_ONLY" = TURRET_FLAG_SHOOT_DANGEROUS_ONLY,
+ "TURRET_FLAG_SHOOT_RETALIATE" = TURRET_FLAG_SHOOT_RETALIATE,
+ "TURRET_FLAG_SHOOT_FAUNA" = TURRET_FLAG_SHOOT_FAUNA,
+ "TURRET_FLAG_SHOOT_HUMANS" = TURRET_FLAG_SHOOT_HUMANS,
+ "TURRET_FLAG_SHOOT_SILICONS" = TURRET_FLAG_SHOOT_SILICONS,
+ "TURRET_FLAG_SHOOT_NONFACTION" = TURRET_FLAG_SHOOT_NONFACTION,
+ "TURRET_FLAG_SHOOT_SPECIFIC_FACTION" = TURRET_FLAG_SHOOT_SPECIFIC_FACTION,
+))
diff --git a/code/_globalvars/game_modes.dm b/code/_globalvars/game_modes.dm
index 56037ab3038..a30e316f532 100644
--- a/code/_globalvars/game_modes.dm
+++ b/code/_globalvars/game_modes.dm
@@ -5,10 +5,6 @@ GLOBAL_VAR(survivor_report) //Contains shared survivor report for roundend repor
GLOBAL_VAR_INIT(wavesecret, 0) // meteor mode, delays wave progression, terrible name
-GLOBAL_DATUM(start_state, /datum/station_state) // Used in round-end report
-
-//TODO clear this one up too
-GLOBAL_DATUM(cult_narsie, /obj/singularity/narsie/large/cult)
GLOBAL_DATUM(sac_mind, /datum/mind) // So Cryo can modify sac stuff
GLOBAL_VAR_INIT(sac_image, null)
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index f9edbc50014..f45781b014e 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -247,9 +247,8 @@ GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons
25 Toxins
26 Dormitories
27 Virology
-28 Xenobiology
-29 Law Office
-30 Detective's Office
+28 Law Office
+29 Detective's Office
*/
//The whole system for the sorttype var is determined based on the order of this list,
@@ -265,7 +264,7 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals",
"Robotics", "Head of Personnel's Office", "Library", "Chapel", "Theatre",
"Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics",
"Experimentor Lab", "Toxins", "Dormitories", "Virology",
- "Xenobiology", "Law Office","Detective's Office"))
+ , "Law Office","Detective's Office"))
GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt"))
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 532ed3f888d..505734d6cd5 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -92,7 +92,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/clothing/suit/toggle/labcoat = 1,
/obj/item/clothing/under/color/grey = 1,
/obj/item/clothing/gloves/color/fyellow = 1,
- /obj/effect/spawner/lootdrop/gloves = 1,
+ /obj/effect/spawner/random/clothing/gloves = 1,
/obj/item/storage/wallet/random = 1,
/obj/item/clothing/glasses/science = 1,
/obj/item/clothing/glasses/meson = 1,
@@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
//light sources
/obj/item/flashlight = 1,
- /obj/effect/spawner/lootdrop/glowstick = 1,
+ /obj/effect/spawner/random/decoration/glowstick = 1,
/obj/item/clothing/head/hardhat/red = 1,
/obj/item/flashlight/flare = 1,
) = 1,
@@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/roller = 1,
/obj/item/restraints/legcuffs/bola = 1,
/obj/item/restraints/handcuffs/cable = 1,
- /obj/item/spear = 1,
+ /obj/item/melee/spear = 1,
/obj/item/shield/riot/buckler = 1,
/obj/item/grenade/iedcasing/spawned = 1,
/obj/item/melee/baton/cattleprod = 1,
@@ -233,7 +233,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/storage/box/donkpockets/donkpockethonk = 1,
) = 1,
/obj/item/reagent_containers/food/snacks/monkeycube = 1,
- /obj/effect/spawner/lootdrop/ration = 1,
+ /obj/effect/spawner/random/food_or_drink/ration = 1,
) = 8,
list(//fakeout items, keep this list at low relative weight
@@ -243,7 +243,6 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
))
GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items
- /obj/effect/rune/teleport = 1,
/obj/item/clothing/gloves/color/yellow = 1,
/obj/item/clothing/head/helmet/abductor = 1,
/obj/item/clothing/head/helmet/justice =1,
@@ -253,7 +252,7 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items
/obj/item/clothing/shoes/jackboots/fast = 1,
/obj/item/clothing/suit/armor/reactive/table = 1,
/obj/item/storage/box/donkpockets/donkpocketgondola = 1,
- /obj/item/melee/greykingsword = 1 //WS - Meth Sword
+ /obj/item/melee/sword/greyking = 1 //WS - Meth Sword
))
//Maintenance loot spawner pools
diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm
index ff4237d1e89..332ac86582a 100644
--- a/code/_globalvars/lists/mapping.dm
+++ b/code/_globalvars/lists/mapping.dm
@@ -30,7 +30,6 @@ GLOBAL_LIST_EMPTY(tdome2)
GLOBAL_LIST_EMPTY(tdomeobserve)
GLOBAL_LIST_EMPTY(tdomeadmin)
GLOBAL_LIST_EMPTY(prisonwarped) //list of players already warped
-GLOBAL_LIST_EMPTY(blobstart) //blobs, santa, respawning devils
GLOBAL_LIST_EMPTY(secequipment) //sec equipment lockers that scale with the number of sec players
GLOBAL_LIST_EMPTY(deathsquadspawn)
GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 7ee53ec1f37..6d08f1d1bce 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -46,8 +46,6 @@ GLOBAL_LIST_EMPTY(apcs_list)
GLOBAL_LIST_EMPTY(tracked_implants)
/// List of implants the prisoner console can track and send inject commands too
GLOBAL_LIST_EMPTY(tracked_chem_implants)
-/// List of points of interest for observe/follow
-GLOBAL_LIST_EMPTY(poi_list)
/// List of all pinpointers. Used to change stuff they are pointing to all at once.
GLOBAL_LIST_EMPTY(pinpointer_list)
/// List of all zombie_infection organs, for any mass "animation"
diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm
index e25b0b6e9a8..7fbc92bb8af 100644
--- a/code/_globalvars/lists/poll_ignore.dm
+++ b/code/_globalvars/lists/poll_ignore.dm
@@ -11,7 +11,6 @@
#define POLL_IGNORE_CONSTRUCT "construct"
#define POLL_IGNORE_SPIDER "spider"
#define POLL_IGNORE_ASHWALKER "ashwalker"
-#define POLL_IGNORE_SWARMER "swarmer"
#define POLL_IGNORE_DRONE "drone"
#define POLL_IGNORE_FUGITIVE "fugitive"
#define POLL_IGNORE_DEFECTIVECLONE "defective_clone" //WS Edit - Cloning
@@ -35,7 +34,6 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
POLL_IGNORE_CONSTRUCT = "Construct",
POLL_IGNORE_SPIDER = "Spiders",
POLL_IGNORE_ASHWALKER = "Ashwalker eggs",
- POLL_IGNORE_SWARMER = "Swarmer shells",
POLL_IGNORE_DRONE = "Drone shells",
POLL_IGNORE_FUGITIVE = "Fugitive Hunter",
POLL_IGNORE_DEFECTIVECLONE = "Defective clone", //WS Edit - Cloning
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 5f5c26731d1..d87596cf828 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -44,6 +44,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_RESISTCOLD" = TRAIT_RESISTCOLD,
"TRAIT_RESISTHIGHPRESSURE" = TRAIT_RESISTHIGHPRESSURE,
"TRAIT_RESISTLOWPRESSURE" = TRAIT_RESISTLOWPRESSURE,
+ "TRAIT_METALLIC" = TRAIT_METALLIC,
"TRAIT_BOMBIMMUNE" = TRAIT_BOMBIMMUNE,
"TRAIT_RADIMMUNE" = TRAIT_RADIMMUNE,
"TRAIT_GENELESS" = TRAIT_GENELESS,
@@ -147,8 +148,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_HOLDABLE" = TRAIT_HOLDABLE,
"TRAIT_SCOOPABLE" = TRAIT_SCOOPABLE,
"TRAIT_ANXIOUS" = TRAIT_ANXIOUS,
- "TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH
-
+ "TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH,
+ "TRAIT_PLANT_SAFE" = TRAIT_PLANT_SAFE
),
/obj/item/bodypart = list(
"TRAIT_PARALYSIS" = TRAIT_PARALYSIS
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 993026c0d5e..3d3777521f2 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -29,6 +29,8 @@
adj += S.nextmove_adjust()
next_move = world.time + ((num + adj)*mod)
+ SEND_SIGNAL(src, COMSIG_LIVING_CHANGENEXT_MOVE, next_move)
+
/**
* Before anything else, defer these calls to a per-mobtype handler. This allows us to
* remove istype() spaghetti code, but requires the addition of other handler procs to simplify it.
@@ -366,7 +368,7 @@
return
/atom/proc/CtrlShiftClick(mob/user)
- SEND_SIGNAL(src, COMSIG_CLICK_CTRL_SHIFT)
+ SEND_SIGNAL(src, COMSIG_CLICK_CTRL_SHIFT, user)
return
/*
diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
index 8e9fde4d185..dc6dfd37cea 100644
--- a/code/_onclick/hud/_defines.dm
+++ b/code/_onclick/hud/_defines.dm
@@ -37,7 +37,6 @@
//Middle left indicators
#define ui_lingchemdisplay "WEST,CENTER-1:15"
#define ui_lingstingdisplay "WEST:6,CENTER-3:11"
-#define ui_devilsouldisplay "WEST:6,CENTER-1:15"
//Lower center, persistent menu
#define ui_sstore1 "CENTER-5:10,SOUTH:5"
diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm
index fb2bac17503..6cd9aa8a084 100644
--- a/code/_onclick/hud/action_button.dm
+++ b/code/_onclick/hud/action_button.dm
@@ -56,10 +56,16 @@
if(id && usr.client) //try to (un)remember position
usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = locked ? moved : null
return TRUE
+ var/trigger_flags
+ if(LAZYACCESS(modifiers, ALT_CLICK))
+ if(locked)
+ to_chat(usr, "Action button \"[name]\" is locked, unlock it first.")
+ return TRUE
+ trigger_flags |= TRIGGER_SECONDARY_ACTION
if(usr.next_click > world.time)
return
usr.next_click = world.time + 1
- linked_action.Trigger()
+ linked_action.Trigger(trigger_flags)
return TRUE
//Hide/Show Action Buttons ... Button
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 43ae8ffbe24..61d2a44d20b 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -175,30 +175,55 @@ Override makes it so the alert is not replaced until cleared by a clear_alert wi
icon_state = "starving"
/atom/movable/screen/alert/gross
- name = "Grossed out."
- desc = "That was kind of gross..."
+ name = "Queasy."
+ desc = "You're starting to feel queasy.."
icon_state = "gross"
/atom/movable/screen/alert/verygross
- name = "Very grossed out."
- desc = "You're not feeling very well..."
+ name = "Nauseated."
+ desc = "You're feeling discomforted as unease creeps into your throat..."
icon_state = "gross2"
/atom/movable/screen/alert/disgusted
- name = "DISGUSTED"
- desc = "ABSOLUTELY DISGUSTIN'"
+ name = "Very Nauseated"
+ desc = "You can barely think against the grains of discomfort ravaging your body!"
icon_state = "gross3"
/atom/movable/screen/alert/hot
- name = "Too Hot"
- desc = "You're flaming hot! Get somewhere cooler and take off any insulating clothing like a fire suit."
+ name = "Hot"
+ desc = "It's quite warm. Get somewhere cooler and take off any insulating clothing like a fire suit."
+ icon_state = "hot"
+
+/atom/movable/screen/alert/warm
+ name = "Warm"
+ desc = "It's a bit warm, but not unbearably so."
icon_state = "hot"
/atom/movable/screen/alert/cold
- name = "Too Cold"
- desc = "You're freezing cold! Get somewhere warmer and take off any insulating clothing like a space suit."
+ name = "Cold"
+ desc = "It's quite cold. Get somewhere warmer and take off any insulating clothing like a space suit."
icon_state = "cold"
+/atom/movable/screen/alert/chilly
+ name = "Chilly"
+ desc = "It's a bit chilly, but not unbearably so."
+ icon_state = "cold"
+
+/atom/movable/screen/alert/sweat
+ name = "Sweating"
+ desc = "You're sweating and the heat is starting to hurt. Stay hydrated, get somewhere cooler, and take off any insulating clothing like a fire suit."
+ icon_state = "sweat"
+
+/atom/movable/screen/alert/shiver
+ name = "Shivering"
+ desc = "You're shivering and the cold is starting to hurt. Get somewhere warmer and take off any insulating clothing like a space suit."
+ icon_state = "shiver"
+
+/atom/movable/screen/alert/fans
+ name = "High Fan Speed"
+ desc = "Your fans are spinning quite fast, and your components are reaching a dangerous temperature! Get somewhere cooler and take off any insulating clothing like a fire suit."
+ icon_state = "fans"
+
/atom/movable/screen/alert/lowpressure
name = "Low Pressure"
desc = "The air around you is hazardously thin. A space suit would protect you."
@@ -395,9 +420,11 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
return
if (length(last_whisper))
- living_owner.dying_breath("[last_whisper]")
living_owner.say("#[last_whisper]")
- living_owner.succumb(whispered = length(last_whisper) > 0)
+ //Say handles everything else for us
+ return
+
+ living_owner.succumb(FALSE)
//ALIENS
@@ -420,166 +447,28 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
icon_state = "alien_noqueen"
alerttooltipstyle = "alien"
-//BLOBS
-
-/atom/movable/screen/alert/nofactory
- name = "No Factory"
- desc = "You have no factory, and are slowly dying!"
- icon_state = "blobbernaut_nofactory"
- alerttooltipstyle = "blob"
-
-// BLOODCULT
-
-/atom/movable/screen/alert/bloodsense
- name = "Blood Sense"
- desc = "Allows you to sense blood that is manipulated by dark magicks."
- icon_state = "cult_sense"
- alerttooltipstyle = "cult"
- var/static/image/narnar
- var/angle = 0
- var/mob/living/simple_animal/hostile/construct/Cviewer = null
-
-/atom/movable/screen/alert/bloodsense/Initialize()
- . = ..()
- narnar = new('icons/hud/screen_alert.dmi', "mini_nar")
- START_PROCESSING(SSprocessing, src)
-
-/atom/movable/screen/alert/bloodsense/Destroy()
- Cviewer = null
- STOP_PROCESSING(SSprocessing, src)
- return ..()
-
-/atom/movable/screen/alert/bloodsense/process()
- var/atom/blood_target
-
- if(!owner.mind)
- return
-
- var/datum/antagonist/cult/antag = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(!antag)
- return
- var/datum/objective/sacrifice/sac_objective = locate() in antag.cult_team.objectives
-
- if(antag.cult_team.blood_target)
- if(!get_turf(antag.cult_team.blood_target))
- antag.cult_team.blood_target = null
- else
- blood_target = antag.cult_team.blood_target
- if(Cviewer && Cviewer.seeking && Cviewer.master)
- blood_target = Cviewer.master
- desc = "Your blood sense is leading you to [Cviewer.master]"
- if(!blood_target)
- if(sac_objective && !sac_objective.check_completion())
- if(icon_state == "runed_sense0")
- return
- animate(src, transform = null, time = 1, loop = 0)
- angle = 0
- cut_overlays()
- icon_state = "runed_sense0"
- desc = "Nar'Sie demands that [sac_objective.target] be sacrificed before the summoning ritual can begin."
- add_overlay(sac_objective.sac_image)
- else
- var/datum/objective/eldergod/summon_objective = locate() in antag.cult_team.objectives
- if(!summon_objective)
- return
- desc = "The sacrifice is complete, summon Nar'Sie! The summoning can only take place in [english_list(summon_objective.summon_spots)]!"
- if(icon_state == "runed_sense1")
- return
- animate(src, transform = null, time = 1, loop = 0)
- angle = 0
- cut_overlays()
- icon_state = "runed_sense1"
- add_overlay(narnar)
- return
- var/turf/P = get_turf(blood_target)
- var/turf/Q = get_turf(owner)
- if(!P || !Q || (P.virtual_z()!= Q.virtual_z())) //The target is on a different Z level, we cannot sense that far.
- icon_state = "runed_sense2"
- desc = "You can no longer sense your target's presence."
- return
- if(isliving(blood_target))
- var/mob/living/real_target = blood_target
- desc = "You are currently tracking [real_target.real_name] in [get_area_name(blood_target)]."
- else
- desc = "You are currently tracking [blood_target] in [get_area_name(blood_target)]."
- var/target_angle = Get_Angle(Q, P)
- var/target_dist = get_dist(P, Q)
- cut_overlays()
- switch(target_dist)
- if(0 to 1)
- icon_state = "runed_sense2"
- if(2 to 8)
- icon_state = "arrow8"
- if(9 to 15)
- icon_state = "arrow7"
- if(16 to 22)
- icon_state = "arrow6"
- if(23 to 29)
- icon_state = "arrow5"
- if(30 to 36)
- icon_state = "arrow4"
- if(37 to 43)
- icon_state = "arrow3"
- if(44 to 50)
- icon_state = "arrow2"
- if(51 to 57)
- icon_state = "arrow1"
- if(58 to 64)
- icon_state = "arrow0"
- if(65 to 400)
- icon_state = "arrow"
- var/difference = target_angle - angle
- angle = target_angle
- if(!difference)
- return
- var/matrix/final = matrix(transform)
- final.Turn(difference)
- animate(src, transform = final, time = 5, loop = 0)
-
-
-//GUARDIANS
-
-/atom/movable/screen/alert/cancharge
- name = "Charge Ready"
- desc = "You are ready to charge at a location!"
- icon_state = "guardian_charge"
- alerttooltipstyle = "parasite"
-
-/atom/movable/screen/alert/canstealth
- name = "Stealth Ready"
- desc = "You are ready to enter stealth!"
- icon_state = "guardian_canstealth"
- alerttooltipstyle = "parasite"
-
-/atom/movable/screen/alert/instealth
- name = "In Stealth"
- desc = "You are in stealth and your next attack will do bonus damage!"
- icon_state = "guardian_instealth"
- alerttooltipstyle = "parasite"
-
//SILICONS
/atom/movable/screen/alert/nocell
name = "Missing Power Cell"
- desc = "Unit has no power cell. No modules available until a power cell is reinstalled. Robotics may provide assistance."
+ desc = "Unit has no power cell. No modules are available until a power cell is reinstalled."
icon_state = "nocell"
/atom/movable/screen/alert/emptycell
name = "Out of Power"
- desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged. \
-Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite."
+ desc = "Unit's power cell has no charge remaining. No modules are available until power cell is recharged."
icon_state = "emptycell"
/atom/movable/screen/alert/lowcell
name = "Low Charge"
- desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite."
+ desc = "Unit's power cell is running low. All modules may be disabled soon unless recharged."
icon_state = "lowcell"
//Ethereal
/atom/movable/screen/alert/etherealcharge
name = "Low Blood Charge"
- desc = "Your blood's electric charge is running low, find a source of charge for your blood. Use a recharging station found in robotics or the dormitory bathrooms, or eat some Ethereal-friendly food."
+ desc = "Your blood's electric charge is running low, find a source of charge for your blood. Use a recharging station, or eat some Elzuose-friendly food."
icon_state = "etherealcharge"
/atom/movable/screen/alert/ethereal_overcharge
@@ -587,6 +476,29 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the
desc = "Your blood's electric charge is becoming dangerously high, find an outlet for your energy. Use Grab Intent on an APC to channel your energy into it."
icon_state = "ethereal_overcharge"
+//MODsuit unique
+/atom/movable/screen/alert/nocore
+ name = "Missing Core"
+ desc = "Unit has no core. No modules are available until a core is reinstalled."
+ icon_state = "no_cell"
+
+/atom/movable/screen/alert/emptycell/plasma
+ name = "Out of Power"
+ desc = "Unit's plasma core has no charge remaining. No modules are available until plasma core is recharged. \
+ Unit can be refilled through plasma fuel."
+
+/atom/movable/screen/alert/emptycell/plasma/update_desc()
+ . = ..()
+ desc = initial(desc)
+
+/atom/movable/screen/alert/lowcell/plasma
+ name = "Low Charge"
+ desc = "Unit's plasma core is running low. Unit can be refilled through plasma fuel."
+
+/atom/movable/screen/alert/lowcell/plasma/update_desc()
+ . = ..()
+ desc = initial(desc)
+
//Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg
/atom/movable/screen/alert/hacked
name = "Hacked"
@@ -595,8 +507,8 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the
/atom/movable/screen/alert/locked
name = "Locked Down"
- desc = "Unit has been remotely locked down. Usage of a Robotics Control Console like the one in the Research Director's \
-office by your AI master or any qualified human may resolve this matter. Robotics may provide further assistance if necessary."
+ desc = "Unit has been remotely locked down. Usage of a Robotics Control Console by an AI or any qualified \
+ humanoid may resolve this matter."
icon_state = "locked"
/atom/movable/screen/alert/newlaw
@@ -625,11 +537,11 @@ so as to remain in compliance with the most up-to-date laws."
if(T)
AI.eyeobj.setLoc(T)
-//MECHS
+//EXOSUITS
/atom/movable/screen/alert/low_mech_integrity
- name = "Mech Damaged"
- desc = "Mech integrity is low."
+ name = "Exosuit Damaged"
+ desc = "Exosuit integrity is low."
icon_state = "low_mech_integrity"
diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm
deleted file mode 100644
index cd7597e33f0..00000000000
--- a/code/_onclick/hud/blob_overmind.dm
+++ /dev/null
@@ -1,187 +0,0 @@
-
-/atom/movable/screen/blob
- icon = 'icons/mob/blob.dmi'
-
-/atom/movable/screen/blob/MouseEntered(location,control,params)
- . = ..()
- openToolTip(usr,src,params,title = name,content = desc, theme = "blob")
-
-/atom/movable/screen/blob/MouseExited()
- closeToolTip(usr)
-
-/atom/movable/screen/blob/BlobHelp
- icon_state = "ui_help"
- name = "Blob Help"
- desc = "Help on playing blob!"
-
-/atom/movable/screen/blob/BlobHelp/Click()
- if(isovermind(usr))
- var/mob/camera/blob/B = usr
- B.blob_help()
-
-/atom/movable/screen/blob/JumpToNode
- icon_state = "ui_tonode"
- name = "Jump to Node"
- desc = "Moves your camera to a selected blob node."
-
-/atom/movable/screen/blob/JumpToNode/Click()
- if(isovermind(usr))
- var/mob/camera/blob/B = usr
- B.jump_to_node()
-
-/atom/movable/screen/blob/JumpToCore
- icon_state = "ui_tocore"
- name = "Jump to Core"
- desc = "Moves your camera to your blob core."
-
-/atom/movable/screen/blob/JumpToCore/MouseEntered(location,control,params)
- if(hud && hud.mymob && isovermind(hud.mymob))
- var/mob/camera/blob/B = hud.mymob
- if(!B.placed)
- name = "Place Blob Core"
- desc = "Attempt to place your blob core at this location."
- else
- name = initial(name)
- desc = initial(desc)
- return ..()
-
-/atom/movable/screen/blob/JumpToCore/Click()
- if(isovermind(usr))
- var/mob/camera/blob/B = usr
- if(!B.placed)
- B.place_blob_core(0)
- B.transport_core()
-
-/atom/movable/screen/blob/Blobbernaut
- icon_state = "ui_blobbernaut"
- name = "Produce Blobbernaut (40)"
- desc = "Produces a strong, smart blobbernaut from a factory blob for 40 resources. The factory blob used will become fragile and unable to produce spores."
-
-/atom/movable/screen/blob/Blobbernaut/Click()
- if(isovermind(usr))
- var/mob/camera/blob/B = usr
- B.create_blobbernaut()
-
-/atom/movable/screen/blob/ResourceBlob
- icon_state = "ui_resource"
- name = "Produce Resource Blob (40)"
- desc = "Produces a resource blob for 40 resources. Resource blobs will give you resources every few seconds."
-
-/atom/movable/screen/blob/ResourceBlob/Click()
- if(isovermind(usr))
- var/mob/camera/blob/B = usr
- B.create_resource()
-
-/atom/movable/screen/blob/NodeBlob
- icon_state = "ui_node"
- name = "Produce Node Blob (50)"
- desc = "Produces a node blob for 50 resources. Node blobs will expand and activate nearby resource and factory blobs."
-
-/atom/movable/screen/blob/NodeBlob/Click()
- if(isovermind(usr))
- var/mob/camera/blob/B = usr
- B.create_node()
-
-/atom/movable/screen/blob/FactoryBlob
- icon_state = "ui_factory"
- name = "Produce Factory Blob (60)"
- desc = "Produces a factory blob for 60 resources. Factory blobs will produce spores every few seconds."
-
-/atom/movable/screen/blob/FactoryBlob/Click()
- if(isovermind(usr))
- var/mob/camera/blob/B = usr
- B.create_factory()
-
-/atom/movable/screen/blob/ReadaptStrain
- icon_state = "ui_chemswap"
- name = "Readapt Strain (40)"
- desc = "Allows you to choose a new strain from 4 random choices for 40 resources."
-
-/atom/movable/screen/blob/ReadaptStrain/MouseEntered(location,control,params)
- if(hud && hud.mymob && isovermind(hud.mymob))
- var/mob/camera/blob/B = hud.mymob
- if(B.free_strain_rerolls)
- name = "Readapt Strain (FREE)"
- desc = "Randomly rerolls your strain for free."
- else
- name = initial(name)
- desc = initial(desc)
- ..()
-
-/atom/movable/screen/blob/ReadaptStrain/Click()
- if(isovermind(usr))
- var/mob/camera/blob/B = usr
- B.strain_reroll()
-
-/atom/movable/screen/blob/RelocateCore
- icon_state = "ui_swap"
- name = "Relocate Core (80)"
- desc = "Swaps a node and your core for 80 resources."
-
-/atom/movable/screen/blob/RelocateCore/Click()
- if(isovermind(usr))
- var/mob/camera/blob/B = usr
- B.relocate_core()
-
-/datum/hud/blob_overmind/New(mob/owner)
- ..()
- var/atom/movable/screen/using
-
- blobpwrdisplay = new /atom/movable/screen()
- blobpwrdisplay.name = "blob power"
- blobpwrdisplay.icon_state = "block"
- blobpwrdisplay.screen_loc = ui_health
- blobpwrdisplay.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- blobpwrdisplay.layer = ABOVE_HUD_LAYER
- blobpwrdisplay.plane = ABOVE_HUD_PLANE
- blobpwrdisplay.hud = src
- infodisplay += blobpwrdisplay
-
- healths = new /atom/movable/screen/healths/blob()
- healths.hud = src
- infodisplay += healths
-
- using = new /atom/movable/screen/blob/BlobHelp()
- using.screen_loc = "WEST:6,NORTH:-3"
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/blob/JumpToNode()
- using.screen_loc = ui_inventory
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/blob/JumpToCore()
- using.screen_loc = ui_zonesel
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/blob/Blobbernaut()
- using.screen_loc = ui_belt
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/blob/ResourceBlob()
- using.screen_loc = ui_back
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/blob/NodeBlob()
- using.screen_loc = ui_hand_position(2)
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/blob/FactoryBlob()
- using.screen_loc = ui_hand_position(1)
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/blob/ReadaptStrain()
- using.screen_loc = ui_storage1
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/blob/RelocateCore()
- using.screen_loc = ui_storage2
- using.hud = src
- static_inventory += using
diff --git a/code/_onclick/hud/blobbernauthud.dm b/code/_onclick/hud/blobbernauthud.dm
deleted file mode 100644
index 430e8e81e7f..00000000000
--- a/code/_onclick/hud/blobbernauthud.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-
-/datum/hud/blobbernaut/New(mob/owner)
- ..()
-
- blobpwrdisplay = new /atom/movable/screen/healths/blob/naut/core()
- blobpwrdisplay.hud = src
- infodisplay += blobpwrdisplay
-
- healths = new /atom/movable/screen/healths/blob/naut()
- healths.hud = src
- infodisplay += healths
diff --git a/code/_onclick/hud/devil.dm b/code/_onclick/hud/devil.dm
deleted file mode 100644
index 55fbeb26a7c..00000000000
--- a/code/_onclick/hud/devil.dm
+++ /dev/null
@@ -1,69 +0,0 @@
-
-//Soul counter is stored with the humans, it does weird when you place it here apparently...
-
-
-/datum/hud/devil/New(mob/owner)
- ..()
- var/atom/movable/screen/using
-
- using = new /atom/movable/screen/drop()
- using.icon = ui_style
- using.screen_loc = ui_drone_drop
- using.hud = src
- static_inventory += using
-
- pull_icon = new /atom/movable/screen/pull()
- pull_icon.icon = ui_style
- pull_icon.update_appearance()
- pull_icon.screen_loc = ui_drone_pull
- pull_icon.hud = src
- static_inventory += pull_icon
-
- build_hand_slots()
-
- using = new /atom/movable/screen/inventory()
- using.name = "hand"
- using.icon = ui_style
- using.icon_state = "swap_1_m"
- using.screen_loc = ui_swaphand_position(owner,1)
- using.layer = HUD_LAYER
- using.plane = HUD_PLANE
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/inventory()
- using.name = "hand"
- using.icon = ui_style
- using.icon_state = "swap_2"
- using.screen_loc = ui_swaphand_position(owner,2)
- using.layer = HUD_LAYER
- using.plane = HUD_PLANE
- using.hud = src
- static_inventory += using
-
- zone_select = new /atom/movable/screen/zone_sel()
- zone_select.icon = ui_style
- zone_select.hud = src
- zone_select.update_appearance()
-
- lingchemdisplay = new /atom/movable/screen/ling/chems()
- lingchemdisplay.hud = src
-
- devilsouldisplay = new /atom/movable/screen/devil/soul_counter
- devilsouldisplay.hud = src
- infodisplay += devilsouldisplay
-
-
-/datum/hud/devil/persistent_inventory_update()
- if(!mymob)
- return
- var/mob/living/carbon/true_devil/D = mymob
-
- if(hud_version != HUD_STYLE_NOHUD)
- for(var/obj/item/I in D.held_items)
- I.screen_loc = ui_hand_position(D.get_held_index_of_item(I))
- D.client.screen += I
- else
- for(var/obj/item/I in D.held_items)
- I.screen_loc = null
- D.client.screen -= I
diff --git a/code/_onclick/hud/guardian.dm b/code/_onclick/hud/guardian.dm
deleted file mode 100644
index 8f79bfedf1b..00000000000
--- a/code/_onclick/hud/guardian.dm
+++ /dev/null
@@ -1,179 +0,0 @@
-/datum/hud/guardian
- ui_style = 'icons/mob/guardian.dmi'
-
-/datum/hud/guardian/New(mob/living/simple_animal/hostile/guardian/owner)
- ..()
- var/atom/movable/screen/using
-
- pull_icon = new /atom/movable/screen/pull()
- pull_icon.icon = ui_style
- pull_icon.update_appearance()
- pull_icon.screen_loc = ui_living_pull
- pull_icon.hud = src
- static_inventory += pull_icon
-
- healths = new /atom/movable/screen/healths/guardian()
- healths.hud = src
- infodisplay += healths
-
- using = new /atom/movable/screen/guardian/Manifest()
- using.screen_loc = ui_hand_position(2)
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/guardian/Recall()
- using.screen_loc = ui_hand_position(1)
- using.hud = src
- static_inventory += using
-
- using = new owner.toggle_button_type()
- using.screen_loc = ui_storage1
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/guardian/ToggleLight()
- using.screen_loc = ui_inventory
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/guardian/Communicate()
- using.screen_loc = ui_back
- using.hud = src
- static_inventory += using
-
-/datum/hud/dextrous/guardian/New(mob/living/simple_animal/hostile/guardian/owner) //for a dextrous guardian
- ..()
- var/atom/movable/screen/using
- if(istype(owner, /mob/living/simple_animal/hostile/guardian/dextrous))
- var/atom/movable/screen/inventory/inv_box
-
- inv_box = new /atom/movable/screen/inventory()
- inv_box.name = "internal storage"
- inv_box.icon = ui_style
- inv_box.icon_state = "suit_storage"
- inv_box.screen_loc = ui_id
- inv_box.slot_id = ITEM_SLOT_DEX_STORAGE
- inv_box.hud = src
- static_inventory += inv_box
-
- using = new /atom/movable/screen/guardian/Communicate()
- using.screen_loc = ui_sstore1
- using.hud = src
- static_inventory += using
-
- else
-
- using = new /atom/movable/screen/guardian/Communicate()
- using.screen_loc = ui_id
- using.hud = src
- static_inventory += using
-
- pull_icon = new /atom/movable/screen/pull()
- pull_icon.icon = 'icons/mob/guardian.dmi'
- pull_icon.update_appearance()
- pull_icon.screen_loc = ui_living_pull
- pull_icon.hud = src
- static_inventory += pull_icon
-
- healths = new /atom/movable/screen/healths/guardian()
- healths.hud = src
- infodisplay += healths
-
- using = new /atom/movable/screen/guardian/Manifest()
- using.screen_loc = ui_belt
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/guardian/Recall()
- using.screen_loc = ui_back
- using.hud = src
- static_inventory += using
-
- using = new owner.toggle_button_type()
- using.screen_loc = ui_storage2
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/guardian/ToggleLight()
- using.screen_loc = ui_inventory
- using.hud = src
- static_inventory += using
-
-/datum/hud/dextrous/guardian/persistent_inventory_update()
- if(!mymob)
- return
- if(istype(mymob, /mob/living/simple_animal/hostile/guardian/dextrous))
- var/mob/living/simple_animal/hostile/guardian/dextrous/D = mymob
-
- if(hud_shown)
- if(D.internal_storage)
- D.internal_storage.screen_loc = ui_id
- D.client.screen += D.internal_storage
- else
- if(D.internal_storage)
- D.internal_storage.screen_loc = null
-
- ..()
-
-/atom/movable/screen/guardian
- icon = 'icons/mob/guardian.dmi'
-
-/atom/movable/screen/guardian/Manifest
- icon_state = "manifest"
- name = "Manifest"
- desc = "Spring forth into battle!"
-
-/atom/movable/screen/guardian/Manifest/Click()
- if(isguardian(usr))
- var/mob/living/simple_animal/hostile/guardian/G = usr
- G.Manifest()
-
-
-/atom/movable/screen/guardian/Recall
- icon_state = "recall"
- name = "Recall"
- desc = "Return to your user."
-
-/atom/movable/screen/guardian/Recall/Click()
- if(isguardian(usr))
- var/mob/living/simple_animal/hostile/guardian/G = usr
- G.Recall()
-
-/atom/movable/screen/guardian/ToggleMode
- icon_state = "toggle"
- name = "Toggle Mode"
- desc = "Switch between ability modes."
-
-/atom/movable/screen/guardian/ToggleMode/Click()
- if(isguardian(usr))
- var/mob/living/simple_animal/hostile/guardian/G = usr
- G.ToggleMode()
-
-/atom/movable/screen/guardian/ToggleMode/Inactive
- icon_state = "notoggle" //greyed out so it doesn't look like it'll work
-
-/atom/movable/screen/guardian/ToggleMode/Assassin
- icon_state = "stealth"
- name = "Toggle Stealth"
- desc = "Enter or exit stealth."
-
-/atom/movable/screen/guardian/Communicate
- icon_state = "communicate"
- name = "Communicate"
- desc = "Communicate telepathically with your user."
-
-/atom/movable/screen/guardian/Communicate/Click()
- if(isguardian(usr))
- var/mob/living/simple_animal/hostile/guardian/G = usr
- G.Communicate()
-
-
-/atom/movable/screen/guardian/ToggleLight
- icon_state = "light"
- name = "Toggle Light"
- desc = "Glow like star dust."
-
-/atom/movable/screen/guardian/ToggleLight/Click()
- if(isguardian(usr))
- var/mob/living/simple_animal/hostile/guardian/G = usr
- G.ToggleLight()
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 27b220d7fdb..92a294bfb49 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -29,12 +29,9 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
var/atom/movable/screen/ling/chems/lingchemdisplay
var/atom/movable/screen/ling/sting/lingstingdisplay
- var/atom/movable/screen/blobpwrdisplay
-
var/atom/movable/screen/alien_plasma_display
var/atom/movable/screen/alien_queen_finder
- var/atom/movable/screen/devil/soul_counter/devilsouldisplay
var/atom/movable/screen/combo/combo_display
var/atom/movable/screen/action_intent
@@ -62,6 +59,8 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
var/atom/movable/screen/healths
var/atom/movable/screen/healthdoll
var/atom/movable/screen/internals
+
+ var/atom/movable/screen/progbar_container/use_timer
// subtypes can override this to force a specific UI style
var/ui_style
@@ -111,9 +110,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
healthdoll = null
internals = null
lingchemdisplay = null
- devilsouldisplay = null
lingstingdisplay = null
- blobpwrdisplay = null
alien_plasma_display = null
alien_queen_finder = null
combo_display = null
@@ -122,6 +119,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
QDEL_LIST(screenoverlays)
mymob = null
QDEL_NULL(screentip_text)
+ QDEL_NULL(use_timer)
return ..()
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 0833d606927..90db9fe52f7 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -33,35 +33,6 @@
var/mob/living/carbon/human/H = usr
H.quick_equip()
-/atom/movable/screen/devil
- icon = 'icons/hud/screen_devil.dmi'
- invisibility = INVISIBILITY_ABSTRACT
-
-/atom/movable/screen/devil/soul_counter
- name = "souls owned"
- icon_state = "Devil-6"
- screen_loc = ui_devilsouldisplay
-
-/atom/movable/screen/devil/soul_counter/proc/update_counter(souls = 0)
- invisibility = 0
- maptext = "
[souls]
"
- switch(souls)
- if(0,null)
- icon_state = "Devil-1"
- if(1,2)
- icon_state = "Devil-2"
- if(3 to 5)
- icon_state = "Devil-3"
- if(6 to 8)
- icon_state = "Devil-4"
- if(9 to INFINITY)
- icon_state = "Devil-5"
- else
- icon_state = "Devil-6"
-
-/atom/movable/screen/devil/soul_counter/proc/clear()
- invisibility = INVISIBILITY_ABSTRACT
-
/atom/movable/screen/ling
icon = 'icons/hud/screen_changeling.dmi'
invisibility = INVISIBILITY_ABSTRACT
@@ -338,10 +309,6 @@
lingstingdisplay.hud = src
infodisplay += lingstingdisplay
- devilsouldisplay = new /atom/movable/screen/devil/soul_counter
- devilsouldisplay.hud = src
- infodisplay += devilsouldisplay
-
zone_select = new /atom/movable/screen/zone_sel()
zone_select.icon = ui_style
zone_select.hud = src
@@ -354,6 +321,10 @@
ammo_counter = new /atom/movable/screen/ammo_counter(null, src)
infodisplay += ammo_counter
+ use_timer = new(null, src)
+ use_timer.RegisterSignal(mymob, COMSIG_LIVING_CHANGENEXT_MOVE, TYPE_PROC_REF(/atom/movable/screen/progbar_container, on_changenext))
+ static_inventory += use_timer
+
for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index 6bc47aa6bcb..47867e56ede 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -357,6 +357,6 @@ GLOBAL_LIST_EMPTY(radial_menus)
/// If provided, will display an info button that will put this text in your chat
var/info
-/datum/radial_menu_choice/Destroy(force, ...)
+/datum/radial_menu_choice/Destroy(force)
. = ..()
QDEL_NULL(image)
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index ef1f614809f..f0805e0d06b 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -597,28 +597,6 @@
icon = 'icons/hud/screen_cyborg.dmi'
screen_loc = ui_borg_health
-/atom/movable/screen/healths/blob
- name = "blob health"
- icon_state = "block"
- screen_loc = ui_internal
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-
-/atom/movable/screen/healths/blob/naut
- name = "health"
- icon = 'icons/mob/blob.dmi'
- icon_state = "nauthealth"
-
-/atom/movable/screen/healths/blob/naut/core
- name = "overmind health"
- icon_state = "corehealth"
- screen_loc = ui_health
-
-/atom/movable/screen/healths/guardian
- name = "summoner health"
- icon = 'icons/mob/guardian.dmi'
- icon_state = "base"
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-
/atom/movable/screen/healths/revenant
name = "essence"
icon = 'icons/mob/actions/backgrounds.dmi'
@@ -733,3 +711,42 @@
intent_icon.pixel_x = 16 * (i - 1) - 8 * length(streak)
add_overlay(intent_icon)
return ..()
+
+/atom/movable/screen/progbar_container
+ name = "swing cooldown"
+ icon_state = ""
+ screen_loc = "CENTER,SOUTH:16"
+ var/datum/world_progressbar/progbar
+ var/iteration = 0
+
+/atom/movable/screen/progbar_container/Initialize(mapload)
+ . = ..()
+ progbar = new(src)
+ progbar.qdel_when_done = FALSE
+ progbar.bar.vis_flags = VIS_INHERIT_ID | VIS_INHERIT_LAYER | VIS_INHERIT_PLANE
+ progbar.bar.appearance_flags = APPEARANCE_UI
+
+/atom/movable/screen/progbar_container/Destroy()
+ QDEL_NULL(progbar)
+ return ..()
+
+/atom/movable/screen/progbar_container/proc/on_changenext(datum/source, next_move)
+ SIGNAL_HANDLER
+
+ iteration++
+ progbar.goal = next_move - world.time
+ progbar.bar.icon_state = "prog_bar_0"
+
+ progbar_process(next_move)
+
+/atom/movable/screen/progbar_container/proc/progbar_process(next_move)
+ set waitfor = FALSE
+
+ var/start_time = world.time
+ var/iteration = src.iteration
+ while(iteration == src.iteration && (world.time < next_move))
+ progbar.update(world.time - start_time)
+ sleep(1)
+
+ if(iteration == src.iteration)
+ progbar.end_progress()
diff --git a/code/_onclick/hud/swarmer.dm b/code/_onclick/hud/swarmer.dm
deleted file mode 100644
index 6aba23fab5c..00000000000
--- a/code/_onclick/hud/swarmer.dm
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-/atom/movable/screen/swarmer
- icon = 'icons/mob/swarmer.dmi'
-
-/atom/movable/screen/swarmer/FabricateTrap
- icon_state = "ui_trap"
- name = "Create trap (Costs 5 Resources)"
- desc = "Creates a trap that will nonlethally shock any non-swarmer that attempts to cross it. (Costs 5 resources)"
-
-/atom/movable/screen/swarmer/FabricateTrap/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.CreateTrap()
-
-/atom/movable/screen/swarmer/Barricade
- icon_state = "ui_barricade"
- name = "Create barricade (Costs 5 Resources)"
- desc = "Creates a destructible barricade that will stop any non swarmer from passing it. Also allows disabler beams to pass through. (Costs 5 resources)"
-
-/atom/movable/screen/swarmer/Barricade/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.CreateBarricade()
-
-/atom/movable/screen/swarmer/Replicate
- icon_state = "ui_replicate"
- name = "Replicate (Costs 50 Resources)"
- desc = "Creates another of our kind."
-
-/atom/movable/screen/swarmer/Replicate/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.CreateSwarmer()
-
-/atom/movable/screen/swarmer/RepairSelf
- icon_state = "ui_self_repair"
- name = "Repair self"
- desc = "Repairs damage to our body."
-
-/atom/movable/screen/swarmer/RepairSelf/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.RepairSelf()
-
-/atom/movable/screen/swarmer/ToggleLight
- icon_state = "ui_light"
- name = "Toggle light"
- desc = "Toggles our inbuilt light on or off."
-
-/atom/movable/screen/swarmer/ToggleLight/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.ToggleLight()
-
-/atom/movable/screen/swarmer/ContactSwarmers
- icon_state = "ui_contact_swarmers"
- name = "Contact swarmers"
- desc = "Sends a message to all other swarmers, should they exist."
-
-/atom/movable/screen/swarmer/ContactSwarmers/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.ContactSwarmers()
-
-/datum/hud/swarmer/New(mob/owner)
- ..()
- var/atom/movable/screen/using
-
- using = new /atom/movable/screen/swarmer/FabricateTrap()
- using.screen_loc = ui_hand_position(2)
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swarmer/Barricade()
- using.screen_loc = ui_hand_position(1)
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swarmer/Replicate()
- using.screen_loc = ui_zonesel
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swarmer/RepairSelf()
- using.screen_loc = ui_storage1
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swarmer/ToggleLight()
- using.screen_loc = ui_back
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swarmer/ContactSwarmers()
- using.screen_loc = ui_inventory
- using.hud = src
- static_inventory += using
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 806e3e6df32..8e848963567 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -177,14 +177,6 @@
/atom/proc/attack_drone(mob/living/simple_animal/drone/user)
attack_hand(user) //defaults to attack_hand. Override it when you don't want drones to do same stuff as humans.
-
-/*
- True Devil
-*/
-
-/mob/living/carbon/true_devil/UnarmedAttack(atom/A, proximity)
- A.attack_hand(src)
-
/*
Brain
*/
diff --git a/code/_onclick/overmind.dm b/code/_onclick/overmind.dm
deleted file mode 100644
index d6b8994f82f..00000000000
--- a/code/_onclick/overmind.dm
+++ /dev/null
@@ -1,36 +0,0 @@
-// Blob Overmind Controls
-
-
-/mob/camera/blob/ClickOn(atom/A, params) //Expand blob
- var/list/modifiers = params2list(params)
- if(LAZYACCESS(modifiers, MIDDLE_CLICK))
- MiddleClickOn(A, params)
- return
- if(LAZYACCESS(modifiers, SHIFT_CLICK))
- ShiftClickOn(A)
- return
- if(LAZYACCESS(modifiers, ALT_CLICK))
- AltClickOn(A)
- return
- if(LAZYACCESS(modifiers, CTRL_CLICK))
- CtrlClickOn(A)
- return
- var/turf/T = get_turf(A)
- if(T)
- expand_blob(T)
-
-/mob/camera/blob/MiddleClickOn(atom/A) //Rally spores
- . = ..()
- var/turf/T = get_turf(A)
- if(T)
- rally_spores(T)
-
-/mob/camera/blob/CtrlClickOn(atom/A) //Create a shield
- var/turf/T = get_turf(A)
- if(T)
- create_shield(T)
-
-/mob/camera/blob/AltClickOn(atom/A) //Remove a blob
- var/turf/T = get_turf(A)
- if(T)
- remove_blob(T)
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index ac7298dc100..b9955b4f5cc 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -120,11 +120,6 @@
min_val = 0
max_val = 1
-/datum/config_entry/number/shuttle_refuel_delay
- config_entry_value = 12000
- integer = FALSE
- min_val = 0
-
/datum/config_entry/flag/show_game_type_odds //if set this allows players to see the odds of each roundtype on the get revision screen
/datum/config_entry/keyed_list/roundstart_races //races you can play as from the get go.
@@ -250,15 +245,6 @@
movedelay_type = /mob/living/simple_animal
/////////////////////////////////////////////////
-/datum/config_entry/flag/virtual_reality //Will virtual reality be loaded
-
-/datum/config_entry/flag/roundstart_away //Will random away mission be loaded.
-
-/datum/config_entry/number/gateway_delay //How long the gateway takes before it activates. Default is half an hour. Only matters if roundstart_away is enabled.
- config_entry_value = 18000
- integer = FALSE
- min_val = 0
-
/datum/config_entry/flag/ghost_interaction
/datum/config_entry/flag/near_death_experience //If carbons can hear ghosts when unconscious and very close to death
@@ -293,31 +279,7 @@
config_entry_value = -1
min_val = -1
-/datum/config_entry/string/overflow_job
- config_entry_value = "Assistant"
-
/datum/config_entry/flag/starlight
-/datum/config_entry/flag/grey_assistants
-
-/datum/config_entry/number/lavaland_budget
- config_entry_value = 60
- integer = FALSE
- min_val = 0
-
-/datum/config_entry/number/whitesands_budget
- config_entry_value = 60
- integer = FALSE
- min_val = 0
-
-/datum/config_entry/number/icemoon_budget
- config_entry_value = 90
- integer = FALSE
- min_val = 0
-
-/datum/config_entry/number/space_budget
- config_entry_value = 16
- integer = FALSE
- min_val = 0
/datum/config_entry/flag/allow_random_events // Enables random events mid-round when set
@@ -352,13 +314,6 @@
GLOB.MAX_EX_FLASH_RANGE = config_entry_value
GLOB.MAX_EX_FLAME_RANGE = config_entry_value
-/datum/config_entry/number/emergency_shuttle_autocall_threshold
- min_val = 0
- max_val = 1
- integer = FALSE
-
-/datum/config_entry/flag/ic_printing
-
/datum/config_entry/flag/roundstart_traits
/datum/config_entry/flag/randomize_shift_time
@@ -373,10 +328,6 @@
config_entry_value = 64
min_val = 0
-/datum/config_entry/number/maxfine
- config_entry_value = 1000
- min_val = 0
-
/datum/config_entry/flag/dynamic_config_enabled
/datum/config_entry/number/respawn_timer
@@ -431,3 +382,6 @@
max_val = 255
config_entry_value = 127
min_val = 127
+
+/datum/config_entry/number/commendation_percent_poll
+ integer = FALSE
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index a59d14cce4d..a9b83106320 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -137,8 +137,6 @@
/datum/config_entry/flag/no_dead_vote // dead people can't vote
-/datum/config_entry/flag/allow_metadata // Metadata is supported.
-
/// Gives the ability to send players a maptext popup.
/datum/config_entry/flag/popup_admin_pm
@@ -289,8 +287,6 @@
/datum/config_entry/flag/kick_inactive //force disconnect for inactive players
-/datum/config_entry/flag/load_jobs_from_txt
-
/datum/config_entry/flag/forbid_singulo_possession
/datum/config_entry/flag/automute_on //enables automuting/spam prevention
@@ -322,8 +318,6 @@
min_val = 0
integer = FALSE
-/datum/config_entry/flag/maprotation
-
/datum/config_entry/number/auto_lag_switch_pop //Number of clients at which drastic lag mitigation measures kick in
config_entry_value = null
min_val = 0
@@ -408,14 +402,6 @@
/datum/config_entry/flag/announce_admin_login
-/datum/config_entry/flag/allow_map_voting
- deprecated_by = /datum/config_entry/flag/preference_map_voting
-
-/datum/config_entry/flag/allow_map_voting/DeprecationUpdate(value)
- return value
-
-/datum/config_entry/flag/preference_map_voting
-
/datum/config_entry/number/client_warn_version
config_entry_value = null
min_val = 500
@@ -525,36 +511,10 @@
/datum/config_entry/flag/auto_profile
-//BeginWS Edit
-/datum/config_entry/flag/minimaps_enabled
- config_entry_value = TRUE
-//EndWS Edit
/datum/config_entry/string/centcom_ban_db // URL for the CentCom Galactic Ban DB API
/datum/config_entry/string/centcom_source_whitelist
-/datum/config_entry/number/whitesands_atmos_moles
- config_entry_value = 103
- integer = FALSE
- min_val = 10
- max_val = 200
-
-/datum/config_entry/keyed_list/whitesands_atmos_mix
- key_mode = KEY_MODE_TEXT
- value_mode = VALUE_MODE_NUM
- lowercase = FALSE
- splitter = " "
-
-
-/datum/config_entry/keyed_list/whitesands_atmos_mix/ValidateListEntry(key_name, key_value)
- var/list/gas_types = gas_types()
- for (var/type in gas_types)
- var/datum/gas/T = type
- if (initial(T.id) == key_name)
- // even a high pressure zone will be less than 1.5x one atmos
- return key_value > 0 && key_value < 1.5
- return FALSE
-
// Elasticsearch stuffs
/datum/config_entry/flag/elasticsearch_metrics_enabled
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 302c0de4a42..46090ebb48c 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -489,6 +489,10 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
continue
if ((SS_flags & (SS_TICKER|SS_KEEP_TIMING)) == SS_KEEP_TIMING && SS.last_fire + (SS.wait * 0.75) > world.time)
continue
+ if (SS.postponed_fires >= 1)
+ SS.postponed_fires--
+ SS.update_nextfire()
+ continue
SS.enqueue()
. = 1
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index f6e35bec6e5..332fcef0787 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -75,6 +75,9 @@
/// Tracks the amount of completed runs for the subsystem
var/times_fired = 0
+ /// How many fires have we been requested to postpone
+ var/postponed_fires = 0
+
/// Time the subsystem entered the queue, (for timing and priority reasons)
var/queued_time = 0
@@ -132,6 +135,26 @@
Master.subsystems -= src
return ..()
+/datum/controller/subsystem/proc/update_nextfire(reset_time = FALSE)
+ var/queue_node_flags = flags
+
+ if (reset_time)
+ postponed_fires = 0
+ if (queue_node_flags & SS_TICKER)
+ next_fire = world.time + (world.tick_lag * wait)
+ else
+ next_fire = world.time + wait
+ return
+
+ if (queue_node_flags & SS_TICKER)
+ next_fire = world.time + (world.tick_lag * wait)
+ else if (queue_node_flags & SS_POST_FIRE_TIMING)
+ next_fire = world.time + wait + (world.tick_lag * (tick_overrun/100))
+ else if (queue_node_flags & SS_KEEP_TIMING)
+ next_fire += wait
+ else
+ next_fire = queued_time + wait + (world.tick_lag * (tick_overrun/100))
+
//Queue it to run.
// (we loop thru a linked list until we get to the end or find the right point)
// (this lets us sort our run order correctly without having to re-sort the entire already sorted list)
@@ -251,8 +274,8 @@
//could be used to postpone a costly subsystem for (default one) var/cycles, cycles
//for instance, during cpu intensive operations like explosions
/datum/controller/subsystem/proc/postpone(cycles = 1)
- if(next_fire - world.time < wait)
- next_fire += (wait*cycles)
+ if (can_fire && cycles >= 1)
+ postponed_fires += cycles
//usually called via datum/controller/subsystem/New() when replacing a subsystem (i.e. due to a recurring crash)
//should attempt to salvage what it can from the old instance of subsystem
diff --git a/code/controllers/subsystem/acid.dm b/code/controllers/subsystem/acid.dm
index 0ea8967e263..efbc5e7d260 100644
--- a/code/controllers/subsystem/acid.dm
+++ b/code/controllers/subsystem/acid.dm
@@ -33,8 +33,7 @@ SUBSYSTEM_DEF(acid)
return
continue
- if(O.acid_level && O.acid_processing())
- else
+ if(!O.acid_level || !O.acid_processing())
O.update_appearance()
processing -= O
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 2f325a1b232..e74c04bf6ec 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -66,6 +66,8 @@ SUBSYSTEM_DEF(air)
var/equalize_hard_turf_limit = 2000
// Whether equalization should be enabled at all.
var/equalize_enabled = TRUE
+ // The ratio of gas "shared" from the immutable planetary atmos mix to planetary tiles
+ var/planet_share_ratio = 0.25
// Whether turf-to-turf heat exchanging should be enabled.
var/heat_enabled = FALSE
// Max number of times process_turfs will share in a tick.
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index 2ac0b06b74d..19e8f9e77b5 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -132,8 +132,8 @@ SUBSYSTEM_DEF(blackbox)
record_feedback("tally", "radio_usage", 1, "common")
if(FREQ_NANOTRASEN)
record_feedback("tally", "radio_usage", 1, "nanotrasen")
- if(FREQ_COMMAND)
- record_feedback("tally", "radio_usage", 1, "command")
+ if(FREQ_EMERGENCY)
+ record_feedback("tally", "radio_usage", 1, "emergency")
if(FREQ_MINUTEMEN)
record_feedback("tally", "radio_usage", 1, "minutemen")
if(FREQ_INTEQ)
@@ -148,12 +148,6 @@ SUBSYSTEM_DEF(blackbox)
record_feedback("tally", "radio_usage", 1, "centcom")
if(FREQ_SOLGOV) //WS Edit - SolGov Rep
record_feedback("tally", "radio_usage", 1, "solgov") //WS Edit - SolGov Rep
- if(FREQ_AI_PRIVATE)
- record_feedback("tally", "radio_usage", 1, "ai private")
- if(FREQ_CTF_RED)
- record_feedback("tally", "radio_usage", 1, "CTF red team")
- if(FREQ_CTF_BLUE)
- record_feedback("tally", "radio_usage", 1, "CTF blue team")
else
record_feedback("tally", "radio_usage", 1, "other")
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm
index cbd07fcd8fd..99a6932570b 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/blackmarket.dm
@@ -6,7 +6,8 @@ SUBSYSTEM_DEF(blackmarket)
/// Descriptions for each shipping methods.
var/shipping_method_descriptions = list(
SHIPPING_METHOD_LAUNCH="Launches the item at your coordinates from across deep space. Cheap, but you might not recieve your item at all. We recommend being stationary in space, away from any large structures, for best results.",
- SHIPPING_METHOD_LTSRBT="Long-To-Short-Range-Bluespace-Transceiver, a machine that prepares items at a remote storage location and then teleports them to the location of the LTRSBT."
+ SHIPPING_METHOD_DEAD_DROP="Our couriers will fire your item via orbital drop pod at the nearest safe abandoned structure for discreet pick up. Reliable, but you'll have to find your package yourself. We accept no responsibility for lost packages if you try to do this in empty space or the outpost.",
+ SHIPPING_METHOD_LTSRBT="Long-To-Short-Range-Bluespace-Transceiver, a machine that prepares items at a remote storage location and then teleports them to the location of the LTRSBT. Secure, quick and reliable, though it ain't cheap to do."
)
/// List of all existing markets.
@@ -32,6 +33,9 @@ SUBSYSTEM_DEF(blackmarket)
markets[M].add_item(item, FALSE)
qdel(I)
+ for(var/market in markets)
+ var/datum/blackmarket_market/market_to_cycle = markets[market]
+ market_to_cycle.cycle_stock()
. = ..()
/datum/controller/subsystem/blackmarket/fire(resumed)
@@ -62,16 +66,72 @@ SUBSYSTEM_DEF(blackmarket)
var/startSide = pick(GLOB.cardinals)
var/turf/T = get_turf(purchase.uplink)
var/datum/virtual_level/vlevel = T.get_virtual_level()
- var/pickedloc = vlevel.get_side_turf(startSide)
+ var/turf/pickedloc
+
+ switch(startSide)
+ if(NORTH)
+ pickedloc = locate(T.x, (vlevel.high_y - vlevel.reserved_margin),T.z)
+ if(EAST)
+ pickedloc = locate((vlevel.high_x - vlevel.reserved_margin), T.y ,T.z)
+ if(SOUTH)
+ pickedloc = locate(T.x, (vlevel.low_y + vlevel.reserved_margin),T.z)
+ if(WEST)
+ pickedloc = locate((vlevel.low_x + vlevel.reserved_margin), T.y ,T.z)
+ else
+ pickedloc = vlevel.get_side_turf(startSide)
var/atom/movable/item = purchase.entry.spawn_item(pickedloc)
- item.safe_throw_at(purchase.uplink, 3, 3, spin = FALSE)
-
+ item.Move(get_step(pickedloc,get_dir(pickedloc,T)))
to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "[purchase.uplink] flashes a message noting the order is being launched at your coordinates from [dir2text(startSide)].")
queued_purchases -= purchase
qdel(purchase)
+ // Drop the order somewhere with the bounds of overmap encounter's ruin
+ if(SHIPPING_METHOD_DEAD_DROP)
+ var/datum/overmap/dynamic/overmap_loc = SSovermap.get_overmap_object_by_location(purchase.uplink, TRUE)
+ var/datum/virtual_level/zlevel = purchase.uplink.get_virtual_level()
+ var/turf/landing_turf
+ var/datum/map_template/ruin
+ if(!isnull(overmap_loc))
+ for(var/possible_ruin in overmap_loc.ruin_turfs)
+ var/turf/lowerbound = overmap_loc.ruin_turfs[possible_ruin]
+ ruin = overmap_loc.spawned_ruins[possible_ruin]
+ var/list/possible_ruin_turfs = zlevel.get_block_portion(lowerbound.x,lowerbound.y,(lowerbound.x + ruin.width),(lowerbound.y + ruin.height))
+ for(var/cycle in 1 to length(possible_ruin_turfs))
+ var/potential_turf = pick_n_take(possible_ruin_turfs)
+ if(!isopenturf(potential_turf))
+ continue
+ var/turf/open/potential_open_turf = potential_turf
+ if(ischasm(potential_open_turf))
+ continue
+ if(islava(potential_open_turf))
+ var/turf/open/lava/potential_lava_floor = potential_open_turf
+ if(!potential_lava_floor.is_safe())
+ continue
+ if(istype(potential_open_turf, /turf/open/water/acid))
+ var/turf/open/water/acid/potential_acid_floor = potential_open_turf
+ if(!potential_acid_floor.is_safe_to_cross())
+ continue
+ if(potential_open_turf.is_blocked_turf())
+ continue
+
+ //yippee, there's a viable turf for the package to land on
+ landing_turf = potential_open_turf
+ to_chat(recursive_loc_check(purchase.uplink.loc, /mob),"[purchase.uplink] flashes a message noting the order is being launched at a structure in your local area.")
+ break
+
+ if(!landing_turf)
+ landing_turf = zlevel.get_random_position_in_margin()
+ to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "[purchase.uplink] flashes a message that the pod was unable to reach it's designated landing spot, and has landed somewhere in the local area instead.")
+
+ var/obj/structure/closet/supplypod/pod = new()
+ pod.setStyle(STYLE_BOX)
+ purchase.entry.spawn_item(pod)
+ pod.explosionSize = list(0,0,0,1)
+ new /obj/effect/pod_landingzone(landing_turf, pod)
+ queued_purchases -= purchase
+ qdel(purchase)
if(MC_TICK_CHECK)
break
diff --git a/code/controllers/subsystem/faction.dm b/code/controllers/subsystem/faction.dm
new file mode 100644
index 00000000000..106fb4687b8
--- /dev/null
+++ b/code/controllers/subsystem/faction.dm
@@ -0,0 +1,32 @@
+SUBSYSTEM_DEF(factions)
+ name = "Faction"
+ init_order = INIT_ORDER_FACTION
+ flags = SS_NO_FIRE
+ var/list/datum/faction/factions = list()
+
+/datum/controller/subsystem/factions/Initialize(timeofday)
+ for(var/path in subtypesof(/datum/faction))
+ factions += new path()
+ return ..()
+
+/datum/controller/subsystem/factions/proc/ship_prefix_to_faction(prefix)
+ for(var/datum/faction/faction in factions)
+ if(prefix in faction.prefixes)
+ return faction
+ var/static/list/screamed = list()
+ if(!(prefix in screamed))
+ screamed += prefix
+ stack_trace("attempted to get faction for unknown prefix [prefix]")
+ return null
+
+/datum/controller/subsystem/factions/proc/ship_prefix_to_name(prefix)
+ var/datum/faction/faction = ship_prefix_to_faction(prefix)
+ if(faction)
+ return faction.name
+ return "?!ERR!?"
+
+/datum/controller/subsystem/factions/proc/faction_path_to_datum(path)
+ for(var/datum/faction/faction in factions)
+ if(faction.type == path)
+ return faction
+ stack_trace("we did not return any faction with path [path]")
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index da58d476451..1bb1d185c84 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -119,6 +119,11 @@ SUBSYSTEM_DEF(garbage)
dellog += "\tIgnored force: [I.no_respect_force] times"
if (I.no_hint)
dellog += "\tNo hint: [I.no_hint] times"
+ if (LAZYLEN(I.extra_details))
+ dellog += "\tDeleted Metadata:"
+ dellog += I.extra_details.Join("\n\t")
+ if (I.most_refs)
+ dellog += "\tMost Refs After qdel(): [I.most_refs]"
log_qdel(dellog.Join("\n"))
/datum/controller/subsystem/garbage/fire()
@@ -139,8 +144,6 @@ SUBSYSTEM_DEF(garbage)
state = SS_RUNNING
break
-
-
/datum/controller/subsystem/garbage/proc/InitQueues()
if (isnull(queues)) // Only init the queues if they don't already exist, prevents overriding of recovered lists
queues = new(GC_QUEUE_COUNT)
@@ -167,7 +170,10 @@ SUBSYSTEM_DEF(garbage)
lastlevel = level
- //We do this rather then for(var/refID in queue) because that sort of for loop copies the whole list.
+// 1 from the hard reference in the queue, and 1 from the variable used before this
+#define REFS_WE_EXPECT 2
+
+ //We do this rather then for(var/list/ref_info in queue) because that sort of for loop copies the whole list.
//Normally this isn't expensive, but the gc queue can grow to 40k items, and that gets costly/causes overrun.
for (var/i in 1 to length(queue))
var/list/L = queue[i]
@@ -178,21 +184,21 @@ SUBSYSTEM_DEF(garbage)
continue
var/queued_at_time = L[GC_QUEUE_ITEM_QUEUE_TIME]
- var/GCd_at_time = L[GC_QUEUE_ITEM_GCD_DESTROYED]
if(queued_at_time > cut_off_time)
break // Everything else is newer, skip them
count++
- var/refID = L[GC_QUEUE_ITEM_REF]
- var/datum/D
- D = locate(refID)
+ var/datum/D = L[GC_QUEUE_ITEM_REF]
+
+ var/remaining_refs = refcount(D) - REFS_WE_EXPECT
- if (!D || D.gc_destroyed != GCd_at_time) // So if something else coincidently gets the same ref, it's not deleted by mistake
+ // If that's all we've got, send er off
+ if (!remaining_refs)
++gcedlasttick
++totalgcs
pass_counts[level]++
#ifdef REFERENCE_TRACKING
- reference_find_on_fail -= refID //It's deleted we don't care anymore.
+ reference_find_on_fail -= text_ref(D) //It's deleted we don't care anymore.
#endif
if (MC_TICK_CHECK)
return
@@ -208,20 +214,30 @@ SUBSYSTEM_DEF(garbage)
switch (level)
if (GC_QUEUE_CHECK)
#ifdef REFERENCE_TRACKING
- if(reference_find_on_fail[refID])
- INVOKE_ASYNC(D, TYPE_PROC_REF(/datum, find_references))
+ // Decides how many refs to look for (potentially) with remaining_refs
+ // Based off the remaining and the ones we can account for
+ if(reference_find_on_fail[text_ref(D)])
+ INVOKE_ASYNC(D, TYPE_PROC_REF(/datum,find_references), remaining_refs)
ref_searching = TRUE
#ifdef GC_FAILURE_HARD_LOOKUP
else
- INVOKE_ASYNC(D, TYPE_PROC_REF(/datum, find_references))
+ INVOKE_ASYNC(D, TYPE_PROC_REF(/datum,find_references), remaining_refs)
ref_searching = TRUE
#endif
- reference_find_on_fail -= refID
+ reference_find_on_fail -= text_ref(D)
#endif
var/type = D.type
var/datum/qdel_item/I = items[type]
- log_world("## TESTING: GC: -- [text_ref(D)] | [type] was unable to be GC'd --")
+ var/message = "## TESTING: GC: -- [text_ref(D)] | [type] was unable to be GC'd --"
+ message = "[message] (ref count of [remaining_refs])"
+ log_world(message)
+ I.most_refs = max(I.most_refs, remaining_refs)
+
+ var/detail = D.dump_harddel_info()
+ if(detail)
+ LAZYADD(I.extra_details, detail)
+
#ifdef TESTING
for(var/c in GLOB.admins) //Using testing() here would fill the logs with ADMIN_VV garbage
var/client/admin = c
@@ -231,6 +247,12 @@ SUBSYSTEM_DEF(garbage)
#endif
I.failures++
+ if (I.qdel_flags & QDEL_ITEM_SUSPENDED_FOR_LAG)
+ #ifdef REFERENCE_TRACKING
+ if(ref_searching)
+ return //ref searching intentionally cancels all further fires while running so things that hold references don't end up getting deleted, so we want to return here instead of continue
+ #endif
+ continue
if (GC_QUEUE_HARDDELETE)
HardDelete(D)
if (MC_TICK_CHECK)
@@ -250,41 +272,41 @@ SUBSYSTEM_DEF(garbage)
queue.Cut(1,count+1)
count = 0
+#undef REFS_WE_EXPECT
+
/datum/controller/subsystem/garbage/proc/Queue(datum/D, level = GC_QUEUE_FILTER)
if (isnull(D))
return
if (level > GC_QUEUE_COUNT)
- HardDelete(D, TRUE)
+ HardDelete(D)
return
var/queue_time = world.time
- var/refid = text_ref(D)
if (D.gc_destroyed <= 0)
D.gc_destroyed = queue_time
var/list/queue = queues[level]
-
- queue[++queue.len] = list(queue_time, refid, D.gc_destroyed) // not += for byond reasons
+ queue[++queue.len] = list(queue_time, D, D.gc_destroyed) // not += for byond reasons
//this is mainly to separate things profile wise.
-/datum/controller/subsystem/garbage/proc/HardDelete(datum/D, force)
+/datum/controller/subsystem/garbage/proc/HardDelete(datum/D)
++delslasttick
++totaldels
var/type = D.type
var/refID = text_ref(D)
- var/datum/qdel_item/I = items[type]
-
- if (!force && I.qdel_flags & QDEL_ITEM_SUSPENDED_FOR_LAG)
- return
+ var/datum/qdel_item/type_info = items[type]
+ var/detail = D.dump_harddel_info()
+ if(detail)
+ LAZYADD(type_info.extra_details, detail)
var/tick_usage = TICK_USAGE
del(D)
tick_usage = TICK_USAGE_TO_MS(tick_usage)
- I.hard_deletes++
- I.hard_delete_time += tick_usage
- if (tick_usage > I.hard_delete_max)
- I.hard_delete_max = tick_usage
+ type_info.hard_deletes++
+ type_info.hard_delete_time += tick_usage
+ if (tick_usage > type_info.hard_delete_max)
+ type_info.hard_delete_max = tick_usage
if (tick_usage > highest_del_ms)
highest_del_ms = tick_usage
highest_del_type_string = "[type]"
@@ -295,14 +317,14 @@ SUBSYSTEM_DEF(garbage)
postpone(time)
var/threshold = CONFIG_GET(number/hard_deletes_overrun_threshold)
if (threshold && (time > threshold SECONDS))
- if (!(I.qdel_flags & QDEL_ITEM_ADMINS_WARNED))
+ if (!(type_info.qdel_flags & QDEL_ITEM_ADMINS_WARNED))
log_game("Error: [type]([refID]) took longer than [threshold] seconds to delete (took [round(time/10, 0.1)] seconds to delete)")
message_admins("Error: [type]([refID]) took longer than [threshold] seconds to delete (took [round(time/10, 0.1)] seconds to delete).")
- I.qdel_flags |= QDEL_ITEM_ADMINS_WARNED
- I.hard_deletes_over_threshold++
+ type_info.qdel_flags |= QDEL_ITEM_ADMINS_WARNED
+ type_info.hard_deletes_over_threshold++
var/overrun_limit = CONFIG_GET(number/hard_deletes_overrun_limit)
- if (overrun_limit && I.hard_deletes_over_threshold >= overrun_limit)
- I.qdel_flags |= QDEL_ITEM_SUSPENDED_FOR_LAG
+ if (overrun_limit && type_info.hard_deletes_over_threshold >= overrun_limit)
+ type_info.qdel_flags |= QDEL_ITEM_SUSPENDED_FOR_LAG
/datum/controller/subsystem/garbage/Recover()
InitQueues() //We first need to create the queues before recovering data
@@ -320,83 +342,90 @@ SUBSYSTEM_DEF(garbage)
var/hard_delete_time = 0 //!Total amount of milliseconds spent hard deleting this type.
var/hard_delete_max = 0 //!Highest time spent hard_deleting this in ms.
var/hard_deletes_over_threshold = 0 //!Number of times hard deletes took longer than the configured threshold
+ var/most_refs = 0 //!The highest amount of refs its had after failing to qdel
var/no_respect_force = 0 //!Number of times it's not respected force=TRUE
var/no_hint = 0 //!Number of times it's not even bother to give a qdel hint
var/slept_destroy = 0 //!Number of times it's slept in its destroy
var/qdel_flags = 0 //!Flags related to this type's trip thru qdel.
+ var/list/extra_details //!Lazylist of string metadata about the deleted objects
/datum/qdel_item/New(mytype)
name = "[mytype]"
-
/// Should be treated as a replacement for the 'del' keyword.
///
/// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
-/proc/qdel(datum/D, force=FALSE, ...)
- if(!istype(D))
- del(D)
+/proc/qdel(datum/to_delete, force = FALSE)
+ if(!istype(to_delete))
+ del(to_delete)
return
- var/datum/qdel_item/I = SSgarbage.items[D.type]
- if (!I)
- I = SSgarbage.items[D.type] = new /datum/qdel_item(D.type)
- I.qdels++
+ var/datum/qdel_item/trash = SSgarbage.items[to_delete.type]
+ if (isnull(trash))
+ trash = SSgarbage.items[to_delete.type] = new /datum/qdel_item(to_delete.type)
+ trash.qdels++
- if(isnull(D.gc_destroyed))
- if (SEND_SIGNAL(D, COMSIG_PARENT_PREQDELETED, force)) // Give the components a chance to prevent their parent from being deleted
- return
- D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED
- var/start_time = world.time
- var/start_tick = world.tick_usage
- SEND_SIGNAL(D, COMSIG_PARENT_QDELETING, force) // Let the (remaining) components know about the result of Destroy
- var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up.
- if(world.time != start_time)
- I.slept_destroy++
- else
- I.destroy_time += TICK_USAGE_TO_MS(start_tick)
- if(!D)
+ if(!isnull(to_delete.gc_destroyed))
+ if(to_delete.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
+ CRASH("[to_delete.type] destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic")
+ return
+
+ if (SEND_SIGNAL(to_delete, COMSIG_PREQDELETED, force)) // Give the components a chance to prevent their parent from being deleted
+ return
+
+ to_delete.gc_destroyed = GC_CURRENTLY_BEING_QDELETED
+ var/start_time = world.time
+ var/start_tick = world.tick_usage
+ SEND_SIGNAL(to_delete, COMSIG_PARENT_QDELETING, force) // Let the (remaining) components know about the result of Destroy
+ var/hint = to_delete.Destroy(force) // Let our friend know they're about to get fucked up.
+
+ if(world.time != start_time)
+ trash.slept_destroy++
+ else
+ trash.destroy_time += TICK_USAGE_TO_MS(start_tick)
+
+ if(isnull(to_delete))
+ return
+
+ switch(hint)
+ if (QDEL_HINT_QUEUE) //qdel should queue the object for deletion.
+ SSgarbage.Queue(to_delete)
+ if (QDEL_HINT_IWILLGC)
+ to_delete.gc_destroyed = world.time
return
- switch(hint)
- if (QDEL_HINT_QUEUE) //qdel should queue the object for deletion.
- SSgarbage.Queue(D)
- if (QDEL_HINT_IWILLGC)
- D.gc_destroyed = world.time
+ if (QDEL_HINT_LETMELIVE) //qdel should let the object live after calling destory.
+ if(!force)
+ to_delete.gc_destroyed = null //clear the gc variable (important!)
return
- if (QDEL_HINT_LETMELIVE) //qdel should let the object live after calling destory.
- if(!force)
- D.gc_destroyed = null //clear the gc variable (important!)
- return
- // Returning LETMELIVE after being told to force destroy
- // indicates the objects Destroy() does not respect force
- #ifdef TESTING
- if(!I.no_respect_force)
- testing("WARNING: [D.type] has been force deleted, but is \
- returning an immortal QDEL_HINT, indicating it does \
- not respect the force flag for qdel(). It has been \
- placed in the queue, further instances of this type \
- will also be queued.")
- #endif
- I.no_respect_force++
+ // Returning LETMELIVE after being told to force destroy
+ // indicates the objects Destroy() does not respect force
+ #ifdef TESTING
+ if(!trash.no_respect_force)
+ testing("WARNING: [to_delete.type] has been force deleted, but is \
+ returning an immortal QDEL_HINT, indicating it does \
+ not respect the force flag for qdel(). It has been \
+ placed in the queue, further instances of this type \
+ will also be queued.")
+ #endif
+ trash.no_respect_force++
- SSgarbage.Queue(D)
- if (QDEL_HINT_HARDDEL) //qdel should assume this object won't gc, and queue a hard delete
- SSgarbage.Queue(D, GC_QUEUE_HARDDELETE)
- if (QDEL_HINT_HARDDEL_NOW) //qdel should assume this object won't gc, and hard del it post haste.
- SSgarbage.HardDelete(D, TRUE)
- #ifdef REFERENCE_TRACKING
- if (QDEL_HINT_FINDREFERENCE) //qdel will, if REFERENCE_TRACKING is enabled, display all references to this object, then queue the object for deletion.
- SSgarbage.Queue(D)
- D.find_references()
- if (QDEL_HINT_IFFAIL_FINDREFERENCE) //qdel will, if REFERENCE_TRACKING is enabled and the object fails to collect, display all references to this object.
- SSgarbage.Queue(D)
- SSgarbage.reference_find_on_fail[text_ref(D)] = TRUE
+ SSgarbage.Queue(to_delete)
+ if (QDEL_HINT_HARDDEL) //qdel should assume this object won't gc, and queue a hard delete
+ SSgarbage.Queue(to_delete, GC_QUEUE_HARDDELETE)
+ if (QDEL_HINT_HARDDEL_NOW) //qdel should assume this object won't gc, and hard del it post haste.
+ SSgarbage.HardDelete(to_delete)
+ #ifdef REFERENCE_TRACKING
+ if (QDEL_HINT_FINDREFERENCE) //qdel will, if REFERENCE_TRACKING is enabled, display all references to this object, then queue the object for deletion.
+ SSgarbage.Queue(to_delete)
+ INVOKE_ASYNC(to_delete, TYPE_PROC_REF(/datum, find_references))
+ if (QDEL_HINT_IFFAIL_FINDREFERENCE) //qdel will, if REFERENCE_TRACKING is enabled and the object fails to collect, display all references to this object.
+ SSgarbage.Queue(to_delete)
+ SSgarbage.reference_find_on_fail[text_ref(to_delete)] = TRUE
+ #endif
+ else
+ #ifdef TESTING
+ if(!trash.no_hint)
+ testing("WARNING: [to_delete.type] is not returning a qdel hint. It is being placed in the queue. Further instances of this type will also be queued.")
#endif
- else
- #ifdef TESTING
- if(!I.no_hint)
- testing("WARNING: [D.type] is not returning a qdel hint. It is being placed in the queue. Further instances of this type will also be queued.")
- #endif
- I.no_hint++
- SSgarbage.Queue(D)
- else if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
- CRASH("[D.type] destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic")
+ trash.no_hint++
+ SSgarbage.Queue(to_delete)
diff --git a/code/controllers/subsystem/jukeboxes.dm b/code/controllers/subsystem/jukeboxes.dm
index b0d774219a3..30757b94761 100644
--- a/code/controllers/subsystem/jukeboxes.dm
+++ b/code/controllers/subsystem/jukeboxes.dm
@@ -35,9 +35,7 @@ SUBSYSTEM_DEF(jukeboxes)
var/sound/song_to_init = sound(T.song_path)
song_to_init.status = SOUND_MUTE
for(var/mob/M in GLOB.player_list)
- if(!M.client)
- continue
- if(!(M.client.prefs.toggles & SOUND_INSTRUMENTS))
+ if(!(M?.client.prefs.toggles & SOUND_INSTRUMENTS))
continue
M.playsound_local(M, null, 100, channel = youvegotafreejukebox[2], S = song_to_init)
@@ -88,9 +86,7 @@ SUBSYSTEM_DEF(jukeboxes)
return ..()
/datum/controller/subsystem/jukeboxes/fire()
- if(!activejukeboxes.len)
- return
- for(var/list/jukeinfo in activejukeboxes)
+ for(var/list/jukeinfo as anything in activejukeboxes)
if(!jukeinfo.len)
stack_trace("Active jukebox without any associated metadata.")
continue
@@ -103,42 +99,38 @@ SUBSYSTEM_DEF(jukeboxes)
stack_trace("Nonexistant or invalid object associated with jukebox.")
continue
var/sound/song_played = sound(juketrack.song_path)
- var/area/currentarea = get_area(jukebox)
var/turf/currentturf = get_turf(jukebox)
- var/list/hearerscache = hearers(7, jukebox)
- var/turf/above_turf = currentturf.above()
- var/turf/below_turf = currentturf.below()
+ var/list/hearerscache = get_hearers_in_view(7, jukebox)
+
+ var/datum/virtual_level/zone = currentturf.get_virtual_level()
+ var/turf/above_turf = zone.get_above_turf(currentturf)
+ var/turf/below_turf = zone.get_below_turf(currentturf)
+
+ var/list/virtual_ids = list(zone.id)
+ var/list/areas = list(get_area(jukebox))
+ if(above_turf && istransparentturf(above_turf))
+ virtual_ids += above_turf.virtual_z
+ areas += get_area(above_turf)
+ if(below_turf && istransparentturf(below_turf))
+ virtual_ids += below_turf.virtual_z
+ areas += get_area(below_turf)
song_played.falloff = jukeinfo[4]
- for(var/mob/M in GLOB.player_list)
- if(!M.client)
- continue
- if(!(M.client.prefs.toggles & SOUND_INSTRUMENTS) || !M.can_hear())
+ for(var/mob/M as anything in GLOB.player_list)
+ if(!(M.client?.prefs.toggles & SOUND_INSTRUMENTS) || !M.can_hear())
M.stop_sound_channel(jukeinfo[2])
continue
var/inrange = FALSE
- if(jukebox.z == M.z) //todo - expand this to work with mining planet z-levels when robust jukebox audio gets merged to master
- song_played.status = SOUND_UPDATE
- if(get_area(M) == currentarea)
- inrange = TRUE
- else if(M in hearerscache)
- inrange = TRUE
- else if(above_turf?.z == M.z)
- song_played.status = SOUND_UPDATE
- if(istransparentturf(above_turf) && (get_area(M) == get_area(above_turf)))
- inrange = TRUE
- else if(below_turf?.z == M.z)
+ if(jukebox.volume <= 0 || !(M.virtual_z() in virtual_ids))
+ song_played.status = SOUND_MUTE | SOUND_UPDATE
+ else
song_played.status = SOUND_UPDATE
- if(istransparentturf(below_turf) && (get_area(M) == get_area(below_turf)))
+ if((get_area(M) in areas) || (M in hearerscache))
inrange = TRUE
- else
- song_played.status = SOUND_MUTE | SOUND_UPDATE //Setting volume = 0 doesn't let the sound properties update at all, which is lame.
-
- if(jukebox.volume <= 0)
- song_played.status = SOUND_MUTE
M.playsound_local(currentturf, null, jukebox.volume, channel = jukeinfo[2], S = song_played, envwet = (inrange ? -250 : 0), envdry = (inrange ? 0 : -10000))
- CHECK_TICK
- return
+
+ if(MC_TICK_CHECK)
+ return
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 03720e4d641..3fecc68fbfe 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -42,6 +42,28 @@ SUBSYSTEM_DEF(mapping)
/// Translation of virtual level ID to a virtual level reference
var/list/virtual_z_translation = list()
+ /// List of z level (as number) -> plane offset of that z level
+ /// Used to maintain the plane cube
+ var/list/z_level_to_plane_offset = list()
+ /// List of z level (as number) -> The lowest plane offset in that z stack
+ var/list/z_level_to_lowest_plane_offset = list()
+ // This pair allows for easy conversion between an offset plane, and its true representation
+ // Both are in the form "input plane" -> output plane(s)
+ /// Assoc list of string plane values to their true, non offset representation
+ var/list/plane_offset_to_true
+ /// Assoc list of true string plane values to a list of all potential offset planess
+ var/list/true_to_offset_planes
+ /// Assoc list of string plane to the plane's offset value
+ var/list/plane_to_offset
+ /// List of planes that do not allow for offsetting
+ var/list/plane_offset_blacklist
+ /// List of render targets that do not allow for offsetting
+ var/list/render_offset_blacklist
+ /// List of plane masters that are of critical priority
+ var/list/critical_planes
+ /// The largest plane offset we've generated so far
+ var/max_plane_offset = 0
+
/datum/controller/subsystem/mapping/Initialize(timeofday)
if(initialized)
return
@@ -184,10 +206,12 @@ SUBSYSTEM_DEF(mapping)
if(istext(data["prefix"]))
S.prefix = data["prefix"]
- if(istext(data["faction_name"]))
- S.faction_name = data["faction_name"]
- else
- S.faction_name = ship_prefix_to_faction(S.prefix)
+
+ if(istext(data["faction"]))
+ S.faction_path = text2path(data["faction"])
+ if(S.faction_path)
+ S.faction_datum = SSfactions.faction_path_to_datum(S.faction_path)
+ S.faction_name = S.faction_datum.name
S.category = S.faction_name
diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm
index b5d8210c802..d2e0505b358 100644
--- a/code/controllers/subsystem/mobs.dm
+++ b/code/controllers/subsystem/mobs.dm
@@ -40,5 +40,6 @@ SUBSYSTEM_DEF(mobs)
L.Life(seconds, times_fired)
else
GLOB.mob_living_list.Remove(L)
+ stack_trace("[L] no longer exists in mob_living_list")
if (MC_TICK_CHECK)
return
diff --git a/code/controllers/subsystem/overmap.dm b/code/controllers/subsystem/overmap.dm
index 1304eeeb34e..6e2d452f750 100644
--- a/code/controllers/subsystem/overmap.dm
+++ b/code/controllers/subsystem/overmap.dm
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(overmap)
name = "Overmap"
wait = 10
init_order = INIT_ORDER_OVERMAP
- flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK
+ flags = SS_KEEP_TIMING
runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME
///Defines which generator to use for the overmap
@@ -154,7 +154,7 @@ SUBSYSTEM_DEF(overmap)
return
if(!length(orbits))
break // Can't fit any more in
- var/event_type = pickweight(GLOB.overmap_event_pick_list)
+ var/event_type = pick_weight(GLOB.overmap_event_pick_list)
var/selected_orbit = pick(orbits)
var/list/T = get_unused_overmap_square_in_radius(selected_orbit)
@@ -270,6 +270,7 @@ SUBSYSTEM_DEF(overmap)
var/datum/map_generator/mapgen = new dynamic_datum.mapgen
var/datum/map_template/ruin/used_ruin = ispath(ruin_type) ? (new ruin_type) : ruin_type
+ SSblackbox.record_feedback("tally", "encounter_spawned", 1, "[dynamic_datum.mapgen]")
// name is random but PROBABLY unique
var/encounter_name = dynamic_datum.planet_name || "\improper Uncharted Space [dynamic_datum.x]/[dynamic_datum.y]-[rand(1111, 9999)]"
@@ -291,6 +292,7 @@ SUBSYSTEM_DEF(overmap)
mapgen.generate_turfs(vlevel.get_unreserved_block())
var/list/ruin_turfs = list()
+ var/list/ruin_templates = list()
if(used_ruin)
var/turf/ruin_turf = locate(
rand(
@@ -302,6 +304,7 @@ SUBSYSTEM_DEF(overmap)
)
used_ruin.load(ruin_turf)
ruin_turfs[used_ruin.name] = ruin_turf
+ ruin_templates[used_ruin.name] = used_ruin
// fill in the turfs, AFTER generating the ruin. this prevents them from generating within the ruin
// and ALSO prevents the ruin from being spaced when it spawns in
@@ -376,7 +379,7 @@ SUBSYSTEM_DEF(overmap)
quaternary_dock.dwidth = 0
docking_ports += quaternary_dock
- return list(mapzone, docking_ports, ruin_turfs)
+ return list(mapzone, docking_ports, ruin_turfs, ruin_templates)
/**
* Returns a random, usually empty turf in the overmap
@@ -418,10 +421,10 @@ SUBSYSTEM_DEF(overmap)
* Gets the parent overmap object (e.g. the planet the atom is on) for a given atom.
* * source - The object you want to get the corresponding parent overmap object for.
*/
-/datum/controller/subsystem/overmap/proc/get_overmap_object_by_location(atom/source)
+/datum/controller/subsystem/overmap/proc/get_overmap_object_by_location(atom/source, exclude_ship = FALSE)
var/turf/T = get_turf(source)
var/area/ship/A = get_area(source)
- while(istype(A) && A.mobile_port)
+ while(istype(A) && A.mobile_port && !exclude_ship)
if(A.mobile_port.current_ship)
return A.mobile_port.current_ship
A = A.mobile_port.underlying_turf_area[T]
diff --git a/code/controllers/subsystem/points_of_interest.dm b/code/controllers/subsystem/points_of_interest.dm
new file mode 100644
index 00000000000..6de327bc866
--- /dev/null
+++ b/code/controllers/subsystem/points_of_interest.dm
@@ -0,0 +1,227 @@
+/// Subsystem for managing all POIs.
+SUBSYSTEM_DEF(points_of_interest)
+ name = "Points of Interest"
+
+ flags = SS_NO_FIRE | SS_NO_INIT
+
+ /// List of mob POIs. This list is automatically sorted.
+ var/list/datum/point_of_interest/mob_poi/mob_points_of_interest = list()
+ /// List of non-mob POIs. This list is automatically sorted.
+ var/list/datum/point_of_interest/other_points_of_interest = list()
+ /// List of all value:POI datums by their key:target refs.
+ var/list/datum/point_of_interest/points_of_interest_by_target_ref = list()
+
+/**
+ * Turns new_poi into a new point of interest by adding the /datum/element/point_of_interest element to it.
+ */
+/datum/controller/subsystem/points_of_interest/proc/make_point_of_interest(atom/new_poi)
+ new_poi.AddElement(/datum/element/point_of_interest)
+
+/**
+ * Stops old_poi from being a point of interest by removing the /datum/element/point_of_interest element from it.
+ */
+/datum/controller/subsystem/points_of_interest/proc/remove_point_of_interest(atom/old_poi)
+ old_poi.RemoveElement(/datum/element/point_of_interest)
+
+/**
+ * Called by [/datum/element/point_of_interest] when it gets removed from old_poi.
+ */
+/datum/controller/subsystem/points_of_interest/proc/on_poi_element_added(atom/new_poi)
+ var/datum/point_of_interest/new_poi_datum
+ if(ismob(new_poi))
+ new_poi_datum = new /datum/point_of_interest/mob_poi(new_poi)
+ BINARY_INSERT_PROC_COMPARE(new_poi_datum, mob_points_of_interest, /datum/point_of_interest/mob_poi, new_poi_datum, compare_to, COMPARE_KEY)
+ points_of_interest_by_target_ref[REF(new_poi)] = new_poi_datum
+ else
+ new_poi_datum = new /datum/point_of_interest(new_poi)
+ BINARY_INSERT_PROC_COMPARE(new_poi_datum, other_points_of_interest, /datum/point_of_interest, new_poi_datum, compare_to, COMPARE_KEY)
+ points_of_interest_by_target_ref[REF(new_poi)] = new_poi_datum
+
+
+ SEND_SIGNAL(src, COMSIG_ADDED_POINT_OF_INTEREST, new_poi)
+
+/**
+ * Called by [/datum/element/point_of_interest] when it gets removed from old_poi.
+ */
+/datum/controller/subsystem/points_of_interest/proc/on_poi_element_removed(atom/old_poi)
+ var/poi_ref = REF(old_poi)
+ var/datum/point_of_interest/poi_to_remove = points_of_interest_by_target_ref[poi_ref]
+
+ if(!poi_to_remove)
+ return
+
+ if(ismob(old_poi))
+ mob_points_of_interest -= poi_to_remove
+ else
+ other_points_of_interest -= poi_to_remove
+
+ points_of_interest_by_target_ref -= poi_ref
+
+ poi_to_remove.target = null
+
+ SEND_SIGNAL(src, COMSIG_REMOVED_POINT_OF_INTEREST, old_poi)
+
+/**
+ * If there is a valid POI for a given reference, it returns that POI's associated atom. Otherwise, it returns null.
+ */
+/datum/controller/subsystem/points_of_interest/proc/get_poi_atom_by_ref(reference)
+ return points_of_interest_by_target_ref[reference]?.target
+
+/**
+ * Returns a list of mob POIs with names as keys and mobs as values.
+ *
+ * If multiple POIs have the same name, then avoid_assoc_duplicate_keys is used alongside used_name_list to
+ * tag them as Mob Name (1), Mob Name (2), Mob Name (3) etc.
+ *
+ * Arguments:
+ * * poi_validation_override - [OPTIONAL] Callback to a proc that takes a single argument for the POI and returns TRUE if this POI should be included. Overrides standard POI validation.
+ * * append_dead_role - [OPTIONAL] If TRUE, adds a ghost tag to the end of observer names and a dead tag to the end of any other mob which is not alive.
+ */
+/datum/controller/subsystem/points_of_interest/proc/get_mob_pois(datum/callback/poi_validation_override = null, append_dead_role = TRUE)
+ var/list/pois = list()
+ var/list/used_name_list = list()
+
+ for(var/datum/point_of_interest/mob_poi/mob_poi as anything in mob_points_of_interest)
+ if(poi_validation_override)
+ if(!poi_validation_override.Invoke(mob_poi))
+ continue
+ else if(!mob_poi.validate())
+ continue
+
+ var/mob/target_mob = mob_poi.target
+ var/name = avoid_assoc_duplicate_keys(target_mob.name, used_name_list) + target_mob.get_realname_string()
+
+ // Add the ghost/dead tag to the end of dead mob POIs.
+ if(append_dead_role && target_mob.stat == DEAD)
+ if(isobserver(target_mob))
+ name += " \[ghost\]"
+ else
+ name += " \[dead\]"
+
+ pois[name] = target_mob
+
+ return pois
+
+/**
+ * Returns a list of non-mob POIs with names as keys and atoms as values.
+ *
+ * If multiple POIs have the same name, then avoid_assoc_duplicate_keys is used alongside used_name_list to
+ * tag them as Object Name (1), Object Name (2), Object Name (3) etc.
+ *
+ * Arguments:
+ * * poi_validation_override - [OPTIONAL] Callback to a proc that takes a single argument for the POI and returns TRUE if this POI should be included. Overrides standard POI validation.
+ */
+/datum/controller/subsystem/points_of_interest/proc/get_other_pois(datum/callback/poi_validation_override = null)
+ var/list/pois = list()
+ var/list/used_name_list = list()
+
+ for(var/datum/point_of_interest/other_poi as anything in other_points_of_interest)
+ if(poi_validation_override)
+ if(!poi_validation_override.Invoke(other_poi))
+ continue
+ else if(!other_poi.validate())
+ continue
+
+ var/atom/target_poi = other_poi.target
+
+ pois[avoid_assoc_duplicate_keys(target_poi.name, used_name_list)] = target_poi
+
+ return pois
+
+/// Returns TRUE if potential_poi has an associated poi_datum that validates.
+/datum/controller/subsystem/points_of_interest/proc/is_valid_poi(atom/potential_poi, datum/callback/poi_validation_override = null)
+ var/datum/point_of_interest/poi_datum = points_of_interest_by_target_ref[REF(potential_poi)]
+
+ if(!poi_datum)
+ return FALSE
+
+ if(poi_validation_override)
+ return poi_validation_override.Invoke(poi_datum)
+
+ return poi_datum.validate()
+
+/// Simple helper datum for points of interest.
+/datum/point_of_interest
+ /// The specific point of interest this datum references. This won't hard del as the POI element will be removed from the target when it qdels, which will clear this reference.
+ var/atom/target
+ /// The type of POI this datum references.
+ var/poi_type = /atom
+
+/datum/point_of_interest/New(poi_target)
+ if(!istype(poi_target, poi_type))
+ CRASH("Incorrect target type provided to /datum/point_of_interest/New: Expected \[[poi_type]\]")
+
+ target = poi_target
+
+/// Validates the POI. Returns TRUE if the POI has valid state, returns FALSE if the POI has invalid state.
+/datum/point_of_interest/proc/validate()
+ // In nullspace, invalid as a POI.
+ if(!target.loc)
+ return FALSE
+
+ return TRUE
+
+/// Comparison proc used to sort POIs. Override to implement logic used doing binary sort insertions.
+/datum/point_of_interest/proc/compare_to(datum/point_of_interest/rhs)
+ return cmp_name_asc(target, rhs.target)
+
+/datum/point_of_interest/mob_poi
+ poi_type = /mob
+
+/// Validation for mobs is expanded to invalidate stealthmins and /mob/dead/new_player as POIs.
+/datum/point_of_interest/mob_poi/validate()
+ . = ..()
+
+ if(!.)
+ return
+
+ var/mob/poi_mob = target
+
+ // Stealthmin, invalid as a POI.
+ if(poi_mob.client?.holder?.fakekey)
+ return FALSE
+
+ /*
+ // POI is a /mob/dead/new_player, players in the lobby are invalid as POIs.
+ if(isnewplayer(poi_mob))
+ return FALSE
+ */
+
+ return TRUE
+
+/// Mob POIs are sorted by a simple priority list depending on their type. When their type priority is identical, they're sub-sorted by name.
+/datum/point_of_interest/mob_poi/compare_to(datum/point_of_interest/mob_poi/rhs)
+ var/sort_difference = get_type_sort_priority() - rhs.get_type_sort_priority()
+
+ // If they're equal in priority, call parent to sort by name.
+ if(sort_difference == 0)
+ return ..()
+ // Else sort by priority.
+ else
+ return sort_difference
+
+/// Priority list broadly stolen from /proc/sortmobs(). Lower numbers are higher priorities when sorted and appear closer to the top or start of lists.
+/datum/point_of_interest/mob_poi/proc/get_type_sort_priority()
+ if(isAI(target))
+ return 0
+ if(iscameramob(target))
+ return 1
+ if(ispAI(target))
+ return 2
+ if(iscyborg(target))
+ return 3
+ if(ishuman(target))
+ return 4
+ if(isbrain(target))
+ return 5
+ if(isalien(target))
+ return 6
+ if(isobserver(target))
+ return 7
+ if(isnewplayer(target))
+ return 8
+ if(isslime(target))
+ return 9
+ if(isanimal(target))
+ return 10
+ return 11
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index c6f9e4404c0..41e3f77d613 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -23,7 +23,9 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
list("Ageusia","Vegetarian","Deviant Tastes"), \
list("Ananas Affinity","Ananas Aversion"), \
list("Alcohol Tolerance","Light Drinker"), \
- list("Bad Touch", "Friendly"))
+ list("Bad Touch", "Friendly"), \
+ list("Self-Aware", "Congenital Analgesia")
+ )
species_blacklist = list("Blood Deficiency" = list(SPECIES_IPC, SPECIES_JELLYPERSON, SPECIES_PLASMAMAN, SPECIES_VAMPIRE))
diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm
index c8f3756c27c..149df9bc964 100644
--- a/code/controllers/subsystem/research.dm
+++ b/code/controllers/subsystem/research.dm
@@ -23,7 +23,6 @@ SUBSYSTEM_DEF(research)
var/list/techweb_categories = list() //category name = list(node.id = TRUE)
var/list/techweb_boost_items = list() //associative double-layer path = list(id = list(point_type = point_discount))
var/list/techweb_nodes_hidden = list() //Node ids that should be hidden by default.
- var/list/techweb_nodes_experimental = list() //Node ids that are exclusive to the BEPIS.
var/list/techweb_point_items = list(
//path = list(point type = value)
/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
@@ -217,8 +216,6 @@ SUBSYSTEM_DEF(research)
D.unlocked_by += node.id
if(node.hidden)
techweb_nodes_hidden[node.id] = TRUE
- if(node.experimental)
- techweb_nodes_experimental[node.id] = TRUE
CHECK_TICK
generate_techweb_unlock_linking()
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index f56fd9e73ab..ed1a93c50e0 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -30,23 +30,11 @@ SUBSYSTEM_DEF(shuttle)
/// Whether express consoles are blocked from ordering anything or not
var/supplyBlocked = FALSE
- /// Order number given to next cargo order
- var/ordernum = 1
- /// List of all singleton supply pack instances
- var/list/supply_packs = list()
/// Stops ALL shuttles from being able to move
var/lockdown = FALSE
/datum/controller/subsystem/shuttle/Initialize(timeofday)
- ordernum = rand(1, 9000)
-
- for(var/pack in subtypesof(/datum/supply_pack))
- var/datum/supply_pack/P = new pack()
- if(!P.contains)
- continue
- supply_packs[P.type] = P
-
for(var/obj/docking_port/stationary/stationary_port as anything in stationary)
stationary_port.load_roundstart()
CHECK_TICK
@@ -92,6 +80,8 @@ SUBSYSTEM_DEF(shuttle)
jump_timer = addtimer(VARSET_CALLBACK(src, jump_mode, BS_JUMP_COMPLETED), jump_completion_time, TIMER_STOPPABLE)
priority_announce("Jump initiated. ETA: [jump_completion_time / (1 MINUTES)] minutes.", null, null, "Priority")
+ INVOKE_ASYNC(SSticker, TYPE_PROC_REF(/datum/controller/subsystem/ticker,poll_hearts))
+
/datum/controller/subsystem/shuttle/proc/request_transit_dock(obj/docking_port/mobile/M)
if(!istype(M))
CRASH("[M] is not a mobile docking port")
@@ -150,7 +140,7 @@ SUBSYSTEM_DEF(shuttle)
mapzone.parallax_movedir = travel_dir
- var/area/shuttle/transit/transit_area = new()
+ var/area/hyperspace/transit_area = new()
vlevel.fill_in(transit_path, transit_area)
@@ -193,10 +183,7 @@ SUBSYSTEM_DEF(shuttle)
transit_requesters = SSshuttle.transit_requesters
if (istype(SSshuttle.transit_request_failures))
transit_request_failures = SSshuttle.transit_request_failures
- if (istype(SSshuttle.supply_packs))
- supply_packs = SSshuttle.supply_packs
- ordernum = SSshuttle.ordernum
lockdown = SSshuttle.lockdown
/datum/controller/subsystem/shuttle/proc/is_in_shuttle_bounds(atom/A)
@@ -490,7 +477,7 @@ SUBSYSTEM_DEF(shuttle)
user.forceMove(new_ship.get_jump_to_turf())
message_admins("[key_name_admin(user)] loaded [new_ship] ([S]) with the shuttle manipulator.")
log_admin("[key_name(user)] loaded [new_ship] ([S]) with the shuttle manipulator.")
- SSblackbox.record_feedback("text", "shuttle_manipulator", 1, "[S]")
+ SSblackbox.record_feedback("tally", "shuttle_manipulator_spawned", 1, "[S]")
if("edit_template")
if(S)
diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm
index 6d6e9549d95..2c90636638e 100644
--- a/code/controllers/subsystem/statpanel.dm
+++ b/code/controllers/subsystem/statpanel.dm
@@ -298,7 +298,7 @@ SUBSYSTEM_DEF(statpanels)
. = ..()
src.parent = parent
-/datum/object_window_info/Destroy(force, ...)
+/datum/object_window_info/Destroy(force)
atoms_to_show = null
atoms_to_images = null
atoms_to_imagify = null
diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm
index e8cd514eb48..b64dab12d30 100644
--- a/code/controllers/subsystem/throwing.dm
+++ b/code/controllers/subsystem/throwing.dm
@@ -160,8 +160,6 @@ SUBSYSTEM_DEF(throwing)
finalize()
return
- dist_travelled++
-
if(actual_target && !(actual_target.pass_flags_self & LETPASSTHROW) && actual_target.loc == AM.loc) // we crossed a movable with no density (e.g. a mouse or APC) we intend to hit anyway.
finalize(TRUE, actual_target)
return
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 6ae8b0e6240..2b3ac0619c5 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -62,6 +62,8 @@ SUBSYSTEM_DEF(ticker)
/// Why an emergency shuttle was called
var/emergency_reason
+ /// People who have been commended and will receive a heart
+ var/list/hearts
/datum/controller/subsystem/ticker/Initialize(timeofday)
load_mode()
@@ -225,7 +227,7 @@ SUBSYSTEM_DEF(ticker)
if(!runnable_modes.len)
to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.")
return 0
- mode = pickweight(runnable_modes)
+ mode = pick_weight(runnable_modes)
if(!mode) //too few roundtypes all run too recently
mode = pick(runnable_modes)
@@ -300,8 +302,6 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/PostSetup()
set waitfor = FALSE
mode.post_setup()
- GLOB.start_state = new /datum/station_state()
- GLOB.start_state.count()
var/list/adm = get_admin_counts()
var/list/allmins = adm["present"]
@@ -444,18 +444,6 @@ SUBSYSTEM_DEF(ticker)
news_message = "[station_name()] has been evacuated after transmitting the following distress beacon:\n\n[emergency_reason]"
else
news_message = "The crew of [station_name()] has been evacuated amid unconfirmed reports of enemy activity."
- if(BLOB_WIN)
- news_message = "[station_name()] was overcome by an unknown biological outbreak, killing all crew on board. Don't let it happen to you! Remember, a clean work station is a safe work station."
- if(BLOB_NUKE)
- news_message = "[station_name()] is currently undergoing decontanimation after a controlled burst of radiation was used to remove a biological ooze. All employees were safely evacuated prior, and are enjoying a relaxing vacation."
- if(BLOB_DESTROYED)
- news_message = "[station_name()] is currently undergoing decontamination procedures after the destruction of a biological hazard. As a reminder, any crew members experiencing cramps or bloating should report immediately to security for incineration."
- if(CULT_ESCAPE)
- news_message = "Security Alert: A group of religious fanatics have escaped from [station_name()]."
- if(CULT_FAILURE)
- news_message = "Following the dismantling of a restricted cult aboard [station_name()], we would like to remind all employees that worship outside of the Chapel is strictly prohibited, and cause for termination."
- if(CULT_SUMMON)
- news_message = "Company officials would like to clarify that [station_name()] was scheduled to be decommissioned following meteor damage earlier this year. Earlier reports of an unknowable eldritch horror were made in error."
if(NUKE_MISS)
news_message = "The Syndicate have bungled a terrorist attack [station_name()], detonating a nuclear weapon in empty space nearby."
if(OPERATIVES_KILLED)
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index 25ae750eb0d..1b31fc27070 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -44,16 +44,14 @@ SUBSYSTEM_DEF(traumas)
"skeletons" = typecacheof(list(/mob/living/simple_animal/hostile/human/skeleton)),
"snakes" = typecacheof(list(/mob/living/simple_animal/hostile/retaliate/poison/snake)),
"robots" = typecacheof(list(/mob/living/silicon/robot, /mob/living/silicon/ai,
- /mob/living/simple_animal/drone, /mob/living/simple_animal/bot, /mob/living/simple_animal/hostile/swarmer)),
+ /mob/living/simple_animal/drone, /mob/living/simple_animal/bot)),
"doctors" = typecacheof(list(/mob/living/simple_animal/bot/medbot)),
- "the supernatural" = typecacheof(list(/mob/living/simple_animal/hostile/construct,
- /mob/living/simple_animal/revenant, /mob/living/simple_animal/shade)),
+ "the supernatural" = typecacheof(list(/mob/living/simple_animal/revenant)),
"aliens" = typecacheof(list(/mob/living/carbon/alien, /mob/living/simple_animal/slime, /mob/living/simple_animal/hostile/facehugger)),
"conspiracies" = typecacheof(list(/mob/living/simple_animal/bot/secbot, /mob/living/simple_animal/drone,
/mob/living/simple_animal/pet/penguin)),
"birds" = typecacheof(list(/mob/living/simple_animal/parrot, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken,
/mob/living/simple_animal/pet/penguin)),
- "anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian))
)
phobia_objs = list(
@@ -68,14 +66,14 @@ SUBSYSTEM_DEF(traumas)
/obj/machinery/door/airlock/security, /obj/effect/hallucination/simple/securitron)),
"clowns" = typecacheof(list(
- /obj/item/clothing/under/rank/civilian/clown, /obj/item/clothing/shoes/clown_shoes,
+ /obj/item/clothing/under/rank/civilian/clown,
/obj/item/clothing/mask/gas/clown_hat, /obj/item/instrument/bikehorn,
/obj/item/pda/clown, /obj/item/grown/bananapeel, /obj/item/reagent_containers/food/snacks/cheesiehonkers,
/obj/item/trash/cheesie)),
"greytide" = typecacheof(list(
/obj/item/clothing/under/color/grey, /obj/item/melee/baton/cattleprod,
- /obj/item/spear, /obj/item/clothing/mask/gas)),
+ /obj/item/melee/spear, /obj/item/clothing/mask/gas)),
"lizards" = typecacheof(list(
/obj/item/toy/plush/lizardplushie, /obj/item/organ/tail/lizard,
@@ -104,7 +102,7 @@ SUBSYSTEM_DEF(traumas)
"robots" = typecacheof(list(
/obj/machinery/computer/upload, /obj/item/aiModule/, /obj/machinery/recharge_station,
- /obj/item/aicard, /obj/item/deactivated_swarmer, /obj/effect/mob_spawn/swarmer)),
+ /obj/item/aicard)),
"doctors" = typecacheof(list(
/obj/item/clothing/under/rank/medical,
@@ -113,7 +111,7 @@ SUBSYSTEM_DEF(traumas)
/obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper, /obj/machinery/stasis,
/obj/machinery/dna_scannernew, /obj/machinery/atmospherics/components/unary/cryo_cell,
/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw,
- /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/plaguedoctorhat, /obj/item/clothing/mask/gas/plaguedoctor)),
+ /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/mask/gas/plaguedoctor)),
"authority" = typecacheof(list(
/obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/command/head_of_personnel,
@@ -124,15 +122,9 @@ SUBSYSTEM_DEF(traumas)
/obj/item/card/id/captains_spare, /obj/item/card/id/centcom, /obj/machinery/door/airlock/command)),
"the supernatural" = typecacheof(list(
- /obj/structure/destructible/cult, /obj/item/tome,
- /obj/item/melee/cultblade, /obj/item/cult_bastard,
- /obj/item/restraints/legcuffs/bola/cult, /obj/item/clothing/suit/space/hardsuit/cult,
- /obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
- /obj/machinery/door/airlock/cult, /obj/singularity/narsie,
- /obj/item/soulstone,
/obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard, /obj/item/spellbook, /obj/item/staff,
/obj/item/clothing/suit/space/hardsuit/shielded/wizard, /obj/item/clothing/suit/space/hardsuit/wizard,
- /obj/item/nullrod, /obj/item/clothing/under/rank/civilian/chaplain)),
+ /obj/item/clothing/under/rank/civilian/chaplain)),
"aliens" = typecacheof(list(
/obj/item/clothing/mask/facehugger_item, /obj/item/organ/body_egg/alien_embryo,
@@ -147,22 +139,21 @@ SUBSYSTEM_DEF(traumas)
"birds" = typecacheof(list(
/obj/item/clothing/mask/gas/plaguedoctor, /obj/item/reagent_containers/food/snacks/cracker,
- /obj/item/clothing/suit/chickensuit, /obj/item/clothing/head/chicken,
/obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/costume/owl, /obj/item/clothing/mask/gas/owl_mask)),
"anime" = typecacheof(list(
- /obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi,
+ /obj/item/clothing/under/costume/schoolgirl, /obj/item/reagent_containers/food/snacks/sashimi,
/obj/item/reagent_containers/food/snacks/chawanmushi,
/obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star,
/obj/item/clothing/suit/space/space_ninja,
/obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja,
- /obj/item/vibro_weapon, /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana,
- /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))
+ /obj/item/melee/sword/vibro, /obj/item/melee/sword/energy_katana, /obj/item/toy/katana,
+ /obj/item/melee/sword/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))
)
phobia_turfs = list(
"space" = typecacheof(list(/turf/open/space, /turf/open/floor/holofloor/space, /turf/open/floor/fakespace)),
- "the supernatural" = typecacheof(list(/turf/open/floor/plasteel/cult, /turf/closed/wall/mineral/cult)),
+ "the supernatural" = typecacheof(/turf/closed/wall/mineral/cult, /turf/open/floor/plasteel/cult),
"aliens" = typecacheof(list(
/turf/open/floor/plating/abductor, /turf/open/floor/plating/abductor2,
/turf/open/floor/mineral/abductor, /turf/closed/wall/mineral/abductor)),
diff --git a/code/controllers/subsystem/turrets.dm b/code/controllers/subsystem/turrets.dm
new file mode 100644
index 00000000000..7c99cc33a4c
--- /dev/null
+++ b/code/controllers/subsystem/turrets.dm
@@ -0,0 +1,4 @@
+PROCESSING_SUBSYSTEM_DEF(turrets)
+ name = "Turrets"
+ wait = 5
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
diff --git a/code/datums/achievements/boss_achievements.dm b/code/datums/achievements/boss_achievements.dm
index ca45d5939ee..39b355318f0 100644
--- a/code/datums/achievements/boss_achievements.dm
+++ b/code/datums/achievements/boss_achievements.dm
@@ -2,10 +2,10 @@
category = "Bosses"
icon = "baseboss"
-/datum/award/achievement/boss/tendril_exterminator
- name = "Tendril Exterminator"
+/datum/award/achievement/boss/nest_exterminator
+ name = "Nest Exterminator"
desc = "Watch your step"
- database_id = BOSS_MEDAL_TENDRIL
+ database_id = BOSS_MEDAL_NEST
icon = "tendril"
/datum/award/achievement/boss/boss_killer
@@ -55,23 +55,11 @@
database_id = BOSS_MEDAL_LEGION
icon = "legion"
-/datum/award/achievement/boss/swarmer_beacon_kill
- name = "Swarm Beacon Killer"
- desc = "GET THEM OFF OF ME!"
- database_id = BOSS_MEDAL_SWARMERS
- icon = "swarmer"
-
/datum/award/achievement/boss/wendigo_kill
name = "Wendigo Killer"
desc = "You've now ruined years of mythical storytelling."
database_id = BOSS_MEDAL_WENDIGO
-/datum/award/achievement/boss/king_goat_kill
- name = "King Goat Killer"
- desc = "The king is dead, long live the king!"
- database_id = BOSS_MEDAL_KINGGOAT
- icon = "goatboss"
-
/datum/award/achievement/boss/blood_miner_crusher
name = "Blood-drunk Miner Crusher"
desc = "I guess he couldn't handle his drink that well."
@@ -112,18 +100,7 @@
desc = "We were many... now we are none."
database_id = BOSS_MEDAL_LEGION_CRUSHER
-/datum/award/achievement/boss/swarmer_beacon_crusher
- name = "Swarm Beacon Crusher"
- desc = "GET THEM OFF OF ME!"
- database_id = BOSS_MEDAL_SWARMERS_CRUSHER
-
/datum/award/achievement/boss/wendigo_crusher
name = "Wendigo Crusher"
desc = "You've now ruined years of mythical storytelling."
database_id = BOSS_MEDAL_WENDIGO_CRUSHER
-
-/datum/award/achievement/boss/king_goat_crusher
- name = "King Goat Crusher"
- desc = "The king is dead, long live the king!"
- database_id = BOSS_MEDAL_KINGGOAT_CRUSHER
- icon = "goatboss"
diff --git a/code/datums/achievements/boss_scores.dm b/code/datums/achievements/boss_scores.dm
index 7cf2fa88618..c0135e6c68a 100644
--- a/code/datums/achievements/boss_scores.dm
+++ b/code/datums/achievements/boss_scores.dm
@@ -1,7 +1,7 @@
-/datum/award/score/tendril_score
- name = "Tendril Score"
+/datum/award/score/nest_score
+ name = "Nest Score"
desc = "Watch your step"
- database_id = TENDRIL_CLEAR_SCORE
+ database_id = NEST_CLEAR_SCORE
/datum/award/score/boss_score
name = "Bosses Killed"
@@ -43,11 +43,6 @@
desc = "You've killed HOW many?"
database_id = LEGION_SCORE
-/datum/award/score/swarmer_beacon_score
- name = "Swarmer Beacons Killed"
- desc = "You've killed HOW many?"
- database_id = SWARMER_BEACON_SCORE
-
/datum/award/score/wendigo_score
name = "Wendigos Killed"
desc = "You've killed HOW many?"
diff --git a/code/datums/action.dm b/code/datums/action.dm
index de13fc002dd..8151f5a4103 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -1,8 +1,3 @@
-#define AB_CHECK_HANDS_BLOCKED (1<<0)
-#define AB_CHECK_IMMOBILE (1<<1)
-#define AB_CHECK_LYING (1<<2)
-#define AB_CHECK_CONSCIOUS (1<<3)
-
/datum/action
var/name = "Generic Action"
var/desc = null
@@ -86,11 +81,12 @@
if(owner)
UnregisterSignal(owner, COMSIG_PARENT_QDELETING)
owner = null
- button.moved = FALSE //so the button appears in its normal position when given to another owner.
- button.locked = FALSE
- button.id = null
+ if(button)
+ button.moved = FALSE //so the button appears in its normal position when given to another owner.
+ button.locked = FALSE
+ button.id = null
-/datum/action/proc/Trigger()
+/datum/action/proc/Trigger(trigger_flags)
if(!IsAvailable())
return FALSE
if(SEND_SIGNAL(src, COMSIG_ACTION_TRIGGER, src) & COMPONENT_ACTION_BLOCK_TRIGGER)
@@ -253,6 +249,9 @@
/datum/action/item_action/toggle_mister
name = "Toggle Mister"
+/datum/action/item_action/toggle_gear_handle
+ name = "Toggle Gear Handle"
+
/datum/action/item_action/activate_injector
name = "Activate Injector"
@@ -367,16 +366,13 @@
/datum/action/item_action/nano_picket_sign
name = "Retext Nano Picket Sign"
- var/obj/item/picket_sign/S
-
-/datum/action/item_action/nano_picket_sign/New(Target)
- ..()
- if(istype(Target, /obj/item/picket_sign))
- S = Target
/datum/action/item_action/nano_picket_sign/Trigger()
- if(istype(S))
- S.retext(owner)
+ if(!istype(target, /obj/item/picket_sign))
+ return
+
+ var/obj/item/picket_sign/sign = target
+ sign.retext(owner)
/datum/action/item_action/adjust
@@ -474,44 +470,6 @@
name = "Use [target.name]"
button.name = name
-/datum/action/item_action/cult_dagger
- name = "Draw Blood Rune"
- desc = "Use the ritual dagger to create a powerful blood rune"
- icon_icon = 'icons/mob/actions/actions_cult.dmi'
- button_icon_state = "draw"
- buttontooltipstyle = "cult"
- background_icon_state = "bg_demon"
-
-/datum/action/item_action/cult_dagger/Grant(mob/M)
- if(iscultist(M))
- ..()
- button.screen_loc = "6:157,4:-2"
- button.moved = "6:157,4:-2"
- else
- Remove(owner)
-
-
-/datum/action/item_action/cult_dagger/Trigger()
- for(var/obj/item/H in owner.held_items) //In case we were already holding another dagger
- if(istype(H, /obj/item/melee/cultblade/dagger))
- H.attack_self(owner)
- return
- var/obj/item/I = target
- if(owner.can_equip(I, ITEM_SLOT_HANDS))
- owner.temporarilyRemoveItemFromInventory(I)
- owner.put_in_hands(I)
- I.attack_self(owner)
- return
- if(!isliving(owner))
- to_chat(owner, "You lack the necessary living force for this action.")
- return
- var/mob/living/living_owner = owner
- if (living_owner.usable_hands <= 0)
- to_chat(living_owner, "You dont have any usable hands!")
- else
- to_chat(living_owner, "Your hands are full!")
-
-
///MGS BOX!
/datum/action/item_action/agent_box
name = "Deploy Box"
diff --git a/code/datums/actions/ninja.dm b/code/datums/actions/ninja.dm
index b655078349d..974e4cfa74b 100644
--- a/code/datums/actions/ninja.dm
+++ b/code/datums/actions/ninja.dm
@@ -24,7 +24,7 @@
name = "Create Throwing Stars (1E)"
desc = "Creates some throwing stars"
button_icon_state = "throwingstar"
- icon_icon = 'icons/obj/items_and_weapons.dmi'
+ icon_icon = 'icons/obj/items.dmi'
/datum/action/item_action/ninjanet
name = "Energy Net (20E)"
@@ -36,7 +36,7 @@
name = "Recall Energy Katana (Variable Cost)"
desc = "Teleports the Energy Katana linked to this suit to its wearer, cost based on distance."
button_icon_state = "energy_katana"
- icon_icon = 'icons/obj/items_and_weapons.dmi'
+ icon_icon = 'icons/obj/items.dmi'
/datum/action/item_action/ninja_stealth
name = "Toggle Stealth"
diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm
index d2b499de92e..d4e801f31d8 100644
--- a/code/datums/ai_laws.dm
+++ b/code/datums/ai_laws.dm
@@ -1,4 +1,3 @@
-#define LAW_DEVIL "devil"
#define LAW_ZEROTH "zeroth"
#define LAW_INHERENT "inherent"
#define LAW_SUPPLIED "supplied"
@@ -15,10 +14,9 @@
var/list/ion = list()
var/list/hacked = list()
var/mob/living/silicon/owner
- var/list/devillaws = list()
var/id = DEFAULT_AI_LAWID
-/datum/ai_laws/Destroy(force, ...)
+/datum/ai_laws/Destroy(force)
if(!QDELETED(owner))
CRASH("AI lawset destroyed even though owner AI is not being destroyed.")
owner = null
@@ -237,10 +235,6 @@
/datum/ai_laws/proc/set_laws_config()
var/list/law_ids = CONFIG_GET(keyed_list/random_laws)
switch(CONFIG_GET(number/default_laws))
- if(0)
- add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.")
- add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.")
- add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
if(1)
var/datum/ai_laws/templaws = new /datum/ai_laws/custom()
inherent = templaws.inherent
@@ -266,7 +260,7 @@
var/datum/ai_laws/lawtype
var/list/law_weights = CONFIG_GET(keyed_list/law_weight)
while(!lawtype && law_weights.len)
- var/possible_id = pickweightAllowZero(law_weights)
+ var/possible_id = pick_weight_allow_zero(law_weights)
lawtype = lawid_to_type(possible_id)
if(!lawtype)
law_weights -= possible_id
@@ -281,8 +275,6 @@
/datum/ai_laws/proc/get_law_amount(groups)
var/law_amount = 0
- if(devillaws && (LAW_DEVIL in groups))
- law_amount++
if(zeroth && (LAW_ZEROTH in groups))
law_amount++
if(ion.len && (LAW_ION in groups))
@@ -298,9 +290,6 @@
law_amount++
return law_amount
-/datum/ai_laws/proc/set_law_sixsixsix(laws)
- devillaws = laws
-
/datum/ai_laws/proc/set_zeroth_law(law, law_borg = null)
zeroth = law
if(law_borg) //Making it possible for slaved borgs to see a different law 0 than their AI. --NEO
@@ -338,7 +327,7 @@
replaceable_groups[LAW_INHERENT] = inherent.len
if(supplied.len && (LAW_SUPPLIED in groups))
replaceable_groups[LAW_SUPPLIED] = supplied.len
- var/picked_group = pickweight(replaceable_groups)
+ var/picked_group = pick_weight(replaceable_groups)
switch(picked_group)
if(LAW_ZEROTH)
. = zeroth
@@ -437,10 +426,6 @@
zeroth = null
zeroth_borg = null
-/datum/ai_laws/proc/clear_law_sixsixsix(force)
- if(force || !is_devil(owner))
- devillaws = null
-
/datum/ai_laws/proc/associate(mob/living/silicon/M)
if(!owner)
owner = M
@@ -456,10 +441,6 @@
/datum/ai_laws/proc/get_law_list(include_zeroth = FALSE, show_numbers = TRUE, render_html = TRUE)
var/list/data = list()
- if (include_zeroth && devillaws)
- for(var/law in devillaws)
- data += "[show_numbers ? "666:" : ""] [render_html ? "[law]" : law]"
-
if (include_zeroth && zeroth)
data += "[show_numbers ? "0:" : ""] [render_html ? "[zeroth]" : zeroth]"
diff --git a/code/datums/aquarium.dm b/code/datums/aquarium.dm
index da8c3afeb53..37a38f7849e 100644
--- a/code/datums/aquarium.dm
+++ b/code/datums/aquarium.dm
@@ -136,7 +136,7 @@
. = ..()
REMOVE_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src))
-/datum/component/aquarium_content/Destroy(force, silent)
+/datum/component/aquarium_content/Destroy(force)
if(current_aquarium)
remove_from_aquarium()
QDEL_NULL(vc_obj)
diff --git a/code/datums/atmosphere/planetary.dm b/code/datums/atmosphere/planetary.dm
index 85bbf13c52a..8a2d37ab247 100644
--- a/code/datums/atmosphere/planetary.dm
+++ b/code/datums/atmosphere/planetary.dm
@@ -13,8 +13,6 @@
)
restricted_gases = list(
GAS_BZ=10,
- GAS_PLASMA=0.1,
- GAS_H2O=0.1,
)
restricted_chance = 50
@@ -26,12 +24,65 @@
// even worse, occasionally there would be a perma-TRITFIRE, if oxygen
// concentration was high enough. this caused a bunch of lag and added nothing to the game whatsoever
// thus, the temperatures were reduced to 70-90 C
- minimum_temp = T20C + 50
- maximum_temp = T20C + 70
+ minimum_temp = T20C + 20
+ maximum_temp = T20C + 40
/datum/atmosphere/icemoon
id = ICEMOON_DEFAULT_ATMOS
+ base_gases = list(
+ GAS_O2=5,
+ GAS_N2=10,
+ )
+ normal_gases = list(
+ GAS_O2=10,
+ GAS_N2=10,
+ GAS_CO2=10,
+ )
+ restricted_gases = list(
+ GAS_CO2=0.1,
+ )
+ restricted_chance = 50
+
+ minimum_pressure = HAZARD_LOW_PRESSURE + 10
+ maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1
+
+
+ minimum_temp = 200 //fucking cold to
+ maximum_temp = 240 //still cold
+
+
+//wasteplanet
+
+/datum/atmosphere/wasteplanet
+ id = WASTEPLANET_DEFAULT_ATMOS
+
+
+ base_gases = list(
+ GAS_O2=7,
+ GAS_N2=10,
+ )
+ normal_gases = list(
+ GAS_O2=7,
+ GAS_O2=3,
+ GAS_N2=5,
+ GAS_N2=2
+ )
+ restricted_gases = list(
+ GAS_O2=1,
+ )
+ restricted_chance = 0
+
+ minimum_pressure = ONE_ATMOSPHERE - 30
+ maximum_pressure = ONE_ATMOSPHERE + 100
+
+ minimum_temp = T20C - 10
+ maximum_temp = T20C + 20
+
+//sandplanet
+/datum/atmosphere/whitesands
+ id = SANDPLANET_DEFAULT_ATMOS
+
base_gases = list(
GAS_O2=5,
GAS_N2=10,
@@ -43,16 +94,89 @@
)
restricted_gases = list(
GAS_PLASMA=0.1,
- GAS_H2O=0.1,
)
restricted_chance = 50
minimum_pressure = HAZARD_LOW_PRESSURE + 10
maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1
- minimum_temp = 180
- maximum_temp = 180
+ minimum_temp = 233
+ maximum_temp = 263 //No longer always 180
+
+//Jungleplanet
+
+/datum/atmosphere/jungleplanet
+ id = JUNGLEPLANET_DEFAULT_ATMOS
+ base_gases = list(
+ GAS_O2=15,
+ GAS_N2=60,
+ GAS_CO2=1,
+ )
+ normal_gases = list(
+ GAS_O2=1,
+ GAS_N2=4,
+ )
+ restricted_gases = list(
+ GAS_CO2=0.1,
+ )
+ restricted_chance = 0
+
+ minimum_pressure = 101.3
+ maximum_pressure = 135.7 //Nonsense values
+
+ minimum_temp = T20C + 10
+ maximum_temp = T20C + 20
+
+//welcome to the beach
+
+/datum/atmosphere/beach
+ id = BEACHPLANET_DEFAULT_ATMOS
+
+ base_gases = list(
+ GAS_O2=10,
+ GAS_N2=40,
+ )
+ normal_gases = list(
+ GAS_O2=1,
+ GAS_N2=4,
+ )
+ restricted_gases = list(
+ GAS_PLASMA=0.1,
+ )
+ restricted_chance = 0
+
+ minimum_pressure = 101.3
+ maximum_pressure = 135.7
+
+ minimum_temp = T20C - 10
+ maximum_temp = T20C + 10
+
+//rockplanets have lots of CO2 and are moderately cold.
+/datum/atmosphere/rockplanet
+
+ id = ROCKPLANET_DEFAULT_ATMOS
+
+ base_gases = list(
+ GAS_CO2=5,
+ GAS_N2=1,
+ )
+ normal_gases = list(
+ GAS_CO2=3,
+ GAS_N2=1,
+ )
+ restricted_gases = list(
+ GAS_PLASMA=0.1,
+ )
+ restricted_chance = 0
+
+ minimum_pressure = 101.3
+ maximum_pressure = 135.7
+
+ minimum_temp = T0C - 20
+ maximum_temp = T0C
+
+// gas giants
/datum/atmosphere/gas_giant
id = GAS_GIANT_ATMOS
@@ -92,28 +216,3 @@
GAS_PLASMA=0.1,
)
restricted_chance = 1
-
-/datum/atmosphere/wasteplanet
- id = WASTEPLANET_DEFAULT_ATMOS
-
-
- base_gases = list(
- GAS_O2=7,
- GAS_N2=10,
- )
- normal_gases = list(
- GAS_O2=7,
- GAS_O2=3,
- GAS_N2=5,
- GAS_N2=2
- )
- restricted_gases = list(
- GAS_H2O=1,
- )
- restricted_chance = 10
-
- minimum_pressure = ONE_ATMOSPHERE - 30
- maximum_pressure = ONE_ATMOSPHERE + 100
-
- minimum_temp = T20C + 1
- maximum_temp = T20C + 80
diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm
index 069d89f0e7e..9623191d3fd 100644
--- a/code/datums/brain_damage/mild.dm
+++ b/code/datums/brain_damage/mild.dm
@@ -50,8 +50,6 @@
owner.derpspeech = min(owner.derpspeech + 5, 25)
if(prob(3))
owner.emote("drool")
- else if(owner.stat == CONSCIOUS && prob(3))
- owner.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage"), forced = "brain damage")
..()
/datum/brain_trauma/mild/dumbness/on_lose()
@@ -112,6 +110,7 @@
/datum/brain_trauma/mild/healthy/on_gain()
owner.set_screwyhud(SCREWYHUD_HEALTHY)
+ ADD_TRAIT(owner, TRAIT_ANALGESIA, type)
..()
/datum/brain_trauma/mild/healthy/on_life()
@@ -121,6 +120,7 @@
/datum/brain_trauma/mild/healthy/on_lose()
owner.set_screwyhud(SCREWYHUD_NONE)
+ REMOVE_TRAIT(owner, TRAIT_ANALGESIA, type)
..()
/datum/brain_trauma/mild/muscle_weakness
@@ -264,3 +264,103 @@
speak_dejavu += speech_args[SPEECH_MESSAGE]
else
speak_dejavu += speech_args[SPEECH_MESSAGE]
+
+/datum/brain_trauma/mild/monoxide_poisoning_stage1
+ name = "Stage 1 Carbon Monoxide Poisoning"
+ desc = "Due to overexposure to carbon monoxide, patient's mental facilities are degrading.."
+ scan_desc = "carbon monoxide poisoning"
+ gain_text = "You get a headache."
+ lose_text = "Your headache disapears and you find it easier to focus."
+
+ var/static/list/common_words = world.file2list("strings/1000_most_common.txt")
+
+/datum/brain_trauma/mild/monoxide_poisoning_stage1/on_life()
+ var/fall_chance = 1
+ if(owner.m_intent == MOVE_INTENT_RUN)
+ fall_chance += 2
+ if(prob(fall_chance) && owner.body_position == STANDING_UP)
+ to_chat(owner, "Your leg gives out!")
+ owner.Paralyze(35)
+
+ else if(owner.get_active_held_item())
+ var/drop_chance = 1
+ var/obj/item/I = owner.get_active_held_item()
+ drop_chance += I.w_class
+ if(prob(drop_chance) && owner.dropItemToGround(I))
+ to_chat(owner, "You drop [I]!")
+
+ else if(prob(3))
+ to_chat(owner, "You feel a sudden weakness in your muscles!")
+ owner.adjustStaminaLoss(50)
+ ..()
+
+/datum/brain_trauma/mild/monoxide_poisoning_stage1/handle_speech(datum/source, list/speech_args)
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(message)
+ var/list/message_split = splittext(message, " ")
+ var/list/new_message = list()
+
+ for(var/word in message_split)
+ var/suffix = ""
+ var/suffix_foundon = 0
+ for(var/potential_suffix in list("." , "," , ";" , "!" , ":" , "?"))
+ suffix_foundon = findtext(word, potential_suffix, -length(potential_suffix))
+ if(suffix_foundon)
+ suffix = potential_suffix
+ break
+
+ if(suffix_foundon)
+ word = copytext(word, 1, suffix_foundon)
+ word = html_decode(word)
+
+ if(lowertext(word) in common_words)
+ new_message += word + suffix
+ else
+ if(prob(30) && message_split.len > 2)
+ new_message += pick("uh","erm")
+ break
+ else
+ var/list/charlist = text2charlist(word)
+ charlist.len = round(charlist.len * 0.5, 1)
+ shuffle_inplace(charlist)
+ new_message += jointext(charlist, "") + suffix
+
+ message = jointext(new_message, " ")
+
+ speech_args[SPEECH_MESSAGE] = trim(message)
+
+/datum/brain_trauma/mild/monoxide_poisoning_stage2
+ name = "Stage 2 Carbon Monoxide Poisoning"
+ desc = "Due to extreme exposure to carbon monoxide, patient's higher brain functions are severely impacted."
+ scan_desc = "critical carbon monoxide poisoning"
+ gain_text = "You bad get forget you headache don't!"
+ lose_text = "Your headache gets better."
+
+/datum/brain_trauma/mild/monoxide_poisoning_stage2/on_gain()
+ ADD_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, TRAUMA_TRAIT)
+ ..()
+
+/datum/brain_trauma/mild/monoxide_poisoning_stage2/on_lose()
+ REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, TRAUMA_TRAIT)
+ ..()
+
+/datum/brain_trauma/mild/monoxide_poisoning_stage2/on_life()
+ if(prob(5))
+ switch(rand(1,11))
+ if(1)
+ owner.vomit()
+ if(2,3)
+ owner.dizziness += 10
+ if(4,5)
+ owner.confused += 10
+ owner.blur_eyes(10)
+ if(6 to 9)
+ owner.slurring += 30
+ if(10)
+ to_chat(owner, "You forget what you were doing.")
+ owner.Stun(20)
+ if(11)
+ to_chat(owner, "You faint.")
+ owner.Unconscious(80)
+
+ ..()
diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm
index c36fb396166..9529cd19567 100644
--- a/code/datums/cinematic.dm
+++ b/code/datums/cinematic.dm
@@ -150,7 +150,6 @@
flick("station_intact_fade_red",screen)
screen.icon_state = "summary_nukefail"
-//Also used for blob
/datum/cinematic/nuke_selfdestruct
id = CINEMATIC_SELFDESTRUCT
@@ -183,47 +182,6 @@
special()
screen.icon_state = "summary_malf"
-/datum/cinematic/cult
- id = CINEMATIC_CULT
-
-/datum/cinematic/cult/content()
- screen.icon_state = null
- flick("intro_cult",screen)
- sleep(25)
- cinematic_sound(sound('sound/magic/enter_blood.ogg'))
- sleep(28)
- cinematic_sound(sound('sound/machines/terminal_off.ogg'))
- sleep(20)
- flick("station_corrupted",screen)
- cinematic_sound(sound('sound/effects/ghost.ogg'))
- sleep(70)
- special()
-
-/datum/cinematic/cult_nuke
- id = CINEMATIC_CULT_NUKE
-
-/datum/cinematic/cult_nuke/content()
- flick("intro_nuke",screen)
- sleep(35)
- flick("station_explode_fade_red",screen)
- cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
- special()
- screen.icon_state = "summary_cult"
-
-/datum/cinematic/cult_fail
- id = CINEMATIC_CULT_FAIL
-
-/datum/cinematic/cult_fail/content()
- screen.icon_state = "station_intact"
- sleep(20)
- cinematic_sound(sound('sound/creatures/narsie_rises.ogg'))
- sleep(60)
- cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
- sleep(10)
- cinematic_sound(sound('sound/magic/demon_dies.ogg'))
- sleep(30)
- special()
-
/datum/cinematic/nuke_annihilation
id = CINEMATIC_ANNIHILATION
@@ -275,14 +233,3 @@
cinematic_sound(sound('sound/items/airhorn.ogg'))
flick("summary_selfdes",screen) //???
special()
-
-/* Intended usage.
-Nuke.Explosion()
- -> Cinematic(NUKE_BOOM,world)
- -> ActualExplosion()
- -> Mode.OnExplosion()
-
-
-Narsie()
- -> Cinematic(CULT,world)
-*/
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index d76504787b0..fffff3e9c12 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -51,7 +51,7 @@
var/list/arguments = raw_args.Copy(2)
if(Initialize(arglist(arguments)) == COMPONENT_INCOMPATIBLE)
stack_trace("Incompatible [type] assigned to a [parent.type]! args: [json_encode(arguments)]")
- qdel(src, TRUE, TRUE)
+ qdel(src, TRUE)
return
_JoinParent(parent)
@@ -69,15 +69,13 @@
*
* Arguments:
* * force - makes it not check for and remove the component from the parent
- * * silent - deletes the component without sending a [COMSIG_COMPONENT_REMOVING] signal
*/
-/datum/component/Destroy(force=FALSE, silent=FALSE)
+/datum/component/Destroy(force=FALSE)
if(!parent)
return ..()
if(!force)
_RemoveFromParent()
- if(!silent)
- SEND_SIGNAL(parent, COMSIG_COMPONENT_REMOVING, src)
+ SEND_SIGNAL(parent, COMSIG_COMPONENT_REMOVING, src)
parent = null
return ..()
@@ -204,6 +202,11 @@
else // Many other things have registered here
lookup[sig_type][src] = TRUE
+/// Registers multiple signals to the same proc.
+/datum/proc/RegisterSignals(datum/target, list/signal_types, proctype, override = FALSE)
+ for (var/signal_type in signal_types)
+ RegisterSignal(target, signal_type, proctype, override)
+
/**
* Stop listening to a given signal from target
*
@@ -359,17 +362,17 @@
*/
/datum/proc/GetExactComponent(datum/component/c_type)
RETURN_TYPE(c_type)
- if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED || initial(c_type.dupe_mode) == COMPONENT_DUPE_SELECTIVE)
+ var/initial_type_mode = initial(c_type.dupe_mode)
+ if(initial_type_mode == COMPONENT_DUPE_ALLOWED || initial_type_mode == COMPONENT_DUPE_SELECTIVE)
stack_trace("GetComponent was called to get a component of which multiple copies could be on an object. This can easily break and should be changed. Type: \[[c_type]\]")
- var/list/dc = datum_components
- if(!dc)
+ var/list/all_components = datum_components
+ if(!all_components)
return null
- var/datum/component/C = dc[c_type]
- if(C)
- if(length(C))
- C = C[1]
- if(C.type == c_type)
- return C
+ var/datum/component/potential_component
+ if(length(all_components))
+ potential_component = all_components[c_type]
+ if(potential_component?.type == c_type)
+ return potential_component
return null
/**
diff --git a/code/datums/components/admin_popup.dm b/code/datums/components/admin_popup.dm
index 88ef0d97fab..98d0eccfbf2 100644
--- a/code/datums/components/admin_popup.dm
+++ b/code/datums/components/admin_popup.dm
@@ -26,7 +26,7 @@
PROC_REF(delete_self),
)
-/datum/component/admin_popup/Destroy(force, silent)
+/datum/component/admin_popup/Destroy(force)
var/client/parent_client = parent
parent_client?.screen -= admin_popup
diff --git a/code/datums/components/aquarium.dm b/code/datums/components/aquarium.dm
index da8c3afeb53..37a38f7849e 100644
--- a/code/datums/components/aquarium.dm
+++ b/code/datums/components/aquarium.dm
@@ -136,7 +136,7 @@
. = ..()
REMOVE_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src))
-/datum/component/aquarium_content/Destroy(force, silent)
+/datum/component/aquarium_content/Destroy(force)
if(current_aquarium)
remove_from_aquarium()
QDEL_NULL(vc_obj)
diff --git a/code/datums/components/attachment.dm b/code/datums/components/attachment.dm
new file mode 100644
index 00000000000..5c4274efbe3
--- /dev/null
+++ b/code/datums/components/attachment.dm
@@ -0,0 +1,188 @@
+/datum/component/attachment
+ ///Slot the attachment goes on, also used in descriptions so should be player readable
+ var/slot
+ ///various yes no flags associated with attachments. See defines for these: [_DEFINES/guns.dm]
+ var/attach_features_flags
+ ///Unused so far, should probally handle it in the parent unless you have a specific reason
+ var/list/valid_parent_types
+ var/datum/callback/on_attach
+ var/datum/callback/on_detach
+ var/datum/callback/on_toggle
+ ///Called on the parents preattack
+ var/datum/callback/on_preattack
+ ///Unused...Also a little broken..
+ var/list/datum/action/actions
+ ///Generated if the attachment can toggle, sends COMSIG_ATTACHMENT_TOGGLE
+ var/datum/action/attachment/attachment_toggle_action
+
+/datum/component/attachment/Initialize(
+ slot = ATTACHMENT_SLOT_RAIL,
+ attach_features_flags = ATTACH_REMOVABLE_HAND,
+ valid_parent_types = list(/obj/item/gun),
+ datum/callback/on_attach = null,
+ datum/callback/on_detach = null,
+ datum/callback/on_toggle = null,
+ datum/callback/on_preattack = null,
+ list/signals = null
+ )
+
+ if(!isitem(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ src.slot = slot
+ src.attach_features_flags = attach_features_flags
+ src.valid_parent_types = valid_parent_types
+ src.on_attach = on_attach
+ src.on_detach = on_detach
+ src.on_toggle = on_toggle
+ src.on_preattack = on_preattack
+
+ ADD_TRAIT(parent, TRAIT_ATTACHABLE, "attachable")
+ RegisterSignal(parent, COMSIG_ATTACHMENT_ATTACH, PROC_REF(try_attach))
+ RegisterSignal(parent, COMSIG_ATTACHMENT_DETACH, PROC_REF(try_detach))
+ RegisterSignal(parent, COMSIG_ATTACHMENT_EXAMINE, PROC_REF(handle_examine))
+ RegisterSignal(parent, COMSIG_ATTACHMENT_EXAMINE_MORE, PROC_REF(handle_examine_more))
+ if(attach_features_flags & ATTACH_TOGGLE)
+ RegisterSignal(parent, COMSIG_ATTACHMENT_TOGGLE, PROC_REF(try_toggle))
+ attachment_toggle_action = new /datum/action/attachment(parent)
+ RegisterSignal(parent, COMSIG_ATTACHMENT_PRE_ATTACK, PROC_REF(relay_pre_attack))
+ RegisterSignal(parent, COMSIG_ATTACHMENT_UPDATE_OVERLAY, PROC_REF(update_overlays))
+ RegisterSignal(parent, COMSIG_ATTACHMENT_GET_SLOT, PROC_REF(send_slot))
+
+ for(var/signal in signals)
+ RegisterSignal(parent, signal, signals[signal])
+
+/datum/component/attachment/Destroy(force)
+ REMOVE_TRAIT(parent, TRAIT_ATTACHABLE, "attachable")
+ if(actions && length(actions))
+ var/obj/item/gun/parent = src.parent
+ parent.actions -= actions
+ QDEL_LIST(actions)
+ qdel(attachment_toggle_action)
+ return ..()
+
+/datum/component/attachment/proc/try_toggle(obj/item/parent, obj/item/holder, mob/user)
+ SIGNAL_HANDLER
+ if(attach_features_flags & ATTACH_TOGGLE)
+ INVOKE_ASYNC(src, PROC_REF(do_toggle), parent, holder, user)
+ holder.update_icon()
+ attachment_toggle_action.UpdateButtonIcon()
+
+/datum/component/attachment/proc/do_toggle(obj/item/parent, obj/item/holder, mob/user)
+ if(on_toggle)
+ on_toggle.Invoke(holder, user)
+ return TRUE
+
+ parent.attack_self(user)
+ return TRUE
+
+/datum/component/attachment/proc/update_overlays(obj/item/attachment/parent, list/overlays, list/offset)
+ if(!(attach_features_flags & ATTACH_NO_SPRITE))
+ var/overlay_layer = FLOAT_LAYER
+ var/overlay_plane = FLOAT_PLANE
+ if(parent.render_layer)
+ overlay_layer = parent.render_layer
+ if(parent.render_plane)
+ overlay_layer = parent.render_plane
+ overlays += mutable_appearance(parent.icon, "[parent.icon_state]-attached",overlay_layer,overlay_plane)
+
+/datum/component/attachment/proc/try_attach(obj/item/parent, obj/item/holder, mob/user, bypass_checks)
+ SIGNAL_HANDLER
+
+ if(!bypass_checks)
+ if(!parent.Adjacent(user) || (length(valid_parent_types) && (holder.type in valid_parent_types)))
+ return FALSE
+
+ if(on_attach && !on_attach.Invoke(holder, user))
+ return FALSE
+
+ parent.forceMove(holder)
+
+ if(attach_features_flags & ATTACH_TOGGLE)
+ holder.actions += list(attachment_toggle_action)
+ attachment_toggle_action.gun = holder
+ attachment_toggle_action.Grant(user)
+
+ return TRUE
+
+/datum/component/attachment/proc/try_detach(obj/item/parent, obj/item/holder, mob/user)
+ SIGNAL_HANDLER
+
+ if(!parent.Adjacent(user) || (valid_parent_types && (holder.type in valid_parent_types)))
+ return FALSE
+
+ if(on_attach && !on_detach.Invoke(holder, user))
+ return FALSE
+
+ if(attach_features_flags & ATTACH_TOGGLE)
+ holder.actions -= list(attachment_toggle_action)
+ attachment_toggle_action.gun = null
+ attachment_toggle_action.Remove(user)
+
+ if(user.can_put_in_hand(parent))
+ user.put_in_hand(parent)
+ return TRUE
+
+ parent.forceMove(holder.drop_location())
+ return TRUE
+
+/datum/component/attachment/proc/handle_examine(obj/item/parent, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+/datum/component/attachment/proc/handle_examine_more(obj/item/parent, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+/datum/component/attachment/proc/relay_pre_attack(obj/item/parent, obj/item/gun, atom/target_atom, mob/user, params)
+ SIGNAL_HANDLER_DOES_SLEEP
+
+ if(on_preattack)
+ return on_preattack.Invoke(gun, target_atom, user, params)
+
+/datum/component/attachment/proc/send_slot(obj/item/parent)
+ SIGNAL_HANDLER
+ return attachment_slot_to_bflag(slot)
+
+/datum/action/attachment
+ name = "Toggle Attachment"
+ check_flags = AB_CHECK_HANDS_BLOCKED|AB_CHECK_CONSCIOUS
+ button_icon_state = null
+ ///Decides where we send our toggle signal for when pressed
+ var/obj/item/gun/gun = null
+
+/datum/action/attachment/New(Target)
+ ..()
+ name = "Toggle [target.name]"
+ button.name = name
+ icon_icon = target.icon
+ button_icon_state = target.icon_state
+
+/datum/action/attachment/Destroy()
+ . = ..()
+ gun = null
+
+/datum/action/attachment/Trigger()
+ ..()
+ SEND_SIGNAL(target, COMSIG_ATTACHMENT_TOGGLE, gun, owner)
+
+/datum/action/attachment/UpdateButtonIcon()
+ icon_icon = target.icon
+ button_icon_state = target.icon_state
+ ..()
+
+//Copied from item action..
+/datum/action/attachment/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force)
+ if(button_icon && button_icon_state)
+ // If set, use the custom icon that we set instead
+ // of the item appearence
+ ..()
+ else if((target && current_button.appearance_cache != target.appearance) || force) //replace with /ref comparison if this is not valid.
+ var/obj/item/I = target
+ var/old_layer = I.layer
+ var/old_plane = I.plane
+ I.layer = FLOAT_LAYER //AAAH
+ I.plane = FLOAT_PLANE //^ what that guy said
+ current_button.cut_overlays()
+ current_button.add_overlay(I)
+ I.layer = old_layer
+ I.plane = old_plane
+ current_button.appearance_cache = I.appearance
diff --git a/code/datums/components/attachment_holder.dm b/code/datums/components/attachment_holder.dm
new file mode 100644
index 00000000000..f83a55eb201
--- /dev/null
+++ b/code/datums/components/attachment_holder.dm
@@ -0,0 +1,188 @@
+/datum/component/attachment_holder
+ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+
+ ///List of things you can attach to the parent
+ var/list/valid_types = null
+ ///How many slots a parent can hold of any one slot
+ var/list/slot_room = null
+ ///Icon offsets, should match the sprite itself so just find the position where it should attach
+ var/list/slot_offsets = null
+ var/list/obj/item/attachments = list()
+
+/datum/component/attachment_holder/Initialize(
+ list/slot_room = null,
+ list/valid_types = null,
+ list/slot_offsets = null,
+ list/default_attachments = null
+ )
+
+ if(!isgun(parent))
+ return COMPONENT_INCOMPATIBLE
+ var/obj/item/gun/parent_gun = parent
+
+ src.slot_room = slot_room
+ src.valid_types = valid_types
+ src.slot_offsets = slot_offsets
+
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_attack))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(handle_examine))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(handle_examine_more))
+ RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(handle_qdel))
+ RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(handle_item_pre_attack))
+ RegisterSignal(parent, COMSIG_CLICK_CTRL_SHIFT, PROC_REF(handle_ctrl_shift_click))
+ RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(handle_alt_click))
+ RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(handle_overlays))
+
+ if(length(default_attachments))
+ for(var/attachment in default_attachments)
+ var/obj/item/attachment/new_attachment = new attachment(parent_gun.loc)
+ INVOKE_ASYNC(src, PROC_REF(do_attach), new_attachment, null, TRUE)
+
+/datum/component/attachment_holder/proc/handle_overlays(obj/item/parent, list/overlays)
+ SIGNAL_HANDLER
+
+ for(var/obj/item/attachment/attach as anything in attachments)
+ var/slot = SEND_SIGNAL(attach, COMSIG_ATTACHMENT_GET_SLOT)
+ slot = attachment_slot_from_bflag(slot)
+ var/list/attach_overlays = list()
+ SEND_SIGNAL(attach, COMSIG_ATTACHMENT_UPDATE_OVERLAY, attach_overlays)
+ for(var/mutable_appearance/overlay as anything in attach_overlays)
+ if(slot_offsets && slot_offsets[slot])
+ var/matrix/overlay_matrix = new
+ overlay_matrix.Translate(slot_offsets[slot]["x"] - attach.pixel_shift_x, slot_offsets[slot]["y"] - attach.pixel_shift_y)
+ overlay.transform = overlay_matrix
+ overlays += overlay
+
+/datum/component/attachment_holder/proc/handle_qdel()
+ SIGNAL_HANDLER
+ qdel(src)
+
+/datum/component/attachment_holder/Destroy(force)
+ QDEL_LIST(attachments)
+ attachments = null
+ return ..()
+
+/datum/component/attachment_holder/proc/attachments_to_list(only_toggles = FALSE)
+ . = list()
+ for(var/obj/item/attachment/attach as anything in attachments)
+ if(attach.name in .)
+ stack_trace("two attachments with same name; this shouldn't happen and will cause failures")
+ continue
+ if(only_toggles && !(attach.attach_features_flags & ATTACH_TOGGLE))
+ continue
+ .[attach.name] = attach
+
+/datum/component/attachment_holder/proc/handle_ctrl_shift_click(obj/item/parent, mob/user)
+ SIGNAL_HANDLER
+
+ INVOKE_ASYNC(src, PROC_REF(do_attachment_radial), parent, user)
+
+/datum/component/attachment_holder/proc/handle_alt_click(obj/item/parent, mob/user)
+ SIGNAL_HANDLER
+
+ INVOKE_ASYNC(src, PROC_REF(handle_detach), parent, user)
+
+/datum/component/attachment_holder/proc/do_attachment_radial(obj/item/parent, mob/user)
+ var/list/attachments_as_list = attachments_to_list(TRUE)
+ var/selection = show_radial_menu(user, parent, attachments_as_list)
+ var/obj/item/attach = attachments_as_list[selection]
+ if(!attach)
+ return
+ SEND_SIGNAL(attach, COMSIG_ATTACHMENT_TOGGLE, parent, user)
+
+/datum/component/attachment_holder/proc/handle_examine(obj/item/parent, mob/user, list/examine_list)
+ if(length(attachments))
+ examine_list += span_notice("It has [length(attachments)] attachment\s.")
+ for(var/obj/item/attach as anything in attachments)
+ SEND_SIGNAL(attach, COMSIG_ATTACHMENT_EXAMINE, user, examine_list)
+
+/datum/component/attachment_holder/proc/handle_examine_more(obj/item/parent, mob/user, list/examine_list)
+ for(var/key in slot_room)
+ if(slot_room[key])
+ examine_list += span_notice("It has [slot_room[key]] slot\s free for [key] attachments.")
+ if(length(attachments))
+ examine_list += span_notice("It has the following attachments:")
+ for(var/obj/item/attach as anything in attachments)
+ examine_list += span_notice("\t- [attach.name]")
+ if(length(valid_types))
+ examine_list += span_notice("It can accept:")
+ for(var/obj/attach_type as anything in valid_types)
+ examine_list += span_notice("\t- [initial(attach_type.name)]")
+ for(var/obj/item/attach as anything in attachments)
+ SEND_SIGNAL(attach, COMSIG_ATTACHMENT_EXAMINE_MORE, user, examine_list)
+
+/datum/component/attachment_holder/proc/do_attach(obj/item/attachment, mob/user, bypass_checks)
+ var/slot = SEND_SIGNAL(attachment, COMSIG_ATTACHMENT_GET_SLOT)
+ slot = attachment_slot_from_bflag(slot)
+ if(!(attachment.type in valid_types))
+ to_chat(user, span_notice("[attachment] is not a valid attachment for this [parent]!"))
+ return
+ if(!slot_room[slot])
+ to_chat(user, span_notice("[parent] does not contain room for [attachment]!"))
+ return
+ slot_room[slot]--
+ . = SEND_SIGNAL(attachment, COMSIG_ATTACHMENT_ATTACH, parent, user, bypass_checks)
+ if(.)
+ attachments += attachment
+ var/atom/parent = src.parent
+ parent.update_icon()
+
+/datum/component/attachment_holder/proc/do_detach(obj/item/attachment, mob/user)
+ var/slot = SEND_SIGNAL(attachment, COMSIG_ATTACHMENT_GET_SLOT)
+ slot = attachment_slot_from_bflag(slot)
+ if(slot in slot_room)
+ slot_room[slot]++
+ . = SEND_SIGNAL(attachment, COMSIG_ATTACHMENT_DETACH, parent, user)
+ if(.)
+ attachments -= attachment
+ var/atom/parent = src.parent
+ parent.update_icon()
+
+/datum/component/attachment_holder/proc/handle_detach(obj/item/parent, mob/user, obj/item/tool)
+ var/list/tool_list = list()
+ var/list/hand_list = list()
+ for(var/obj/item/attachment/attach as anything in attachments)
+ if(attach.attach_features_flags & ATTACH_REMOVABLE_TOOL)
+ tool_list[attach.name] = attach
+ if(attach.attach_features_flags & ATTACH_REMOVABLE_HAND)
+ hand_list[attach.name] = attach
+ if(tool)
+ if(!length(tool_list))
+ return
+ var/selected = tgui_input_list(user, "Select Attachment", "Detach", tool_list)
+ if(!parent.Adjacent(user) || !selected || !tool || !tool.use_tool(parent, user, 2 SECONDS * tool.toolspeed))
+ return
+ do_detach(tool_list[selected], user)
+ else
+ if(!length(hand_list))
+ return
+ var/selected = tgui_input_list(user, "Select Attachment", "Detach", hand_list)
+ if(do_after(user, 2 SECONDS, parent))
+ do_detach(hand_list[selected], user)
+
+
+/datum/component/attachment_holder/proc/handle_attack(obj/item/parent, obj/item/item, mob/user)
+ SIGNAL_HANDLER
+
+ if(!user.Adjacent(parent))
+ return
+
+ if(item.tool_behaviour == TOOL_CROWBAR && length(attachments))
+ INVOKE_ASYNC(src, PROC_REF(handle_detach), parent, user, item)
+ return TRUE
+
+ if(HAS_TRAIT(item, TRAIT_ATTACHABLE))
+ INVOKE_ASYNC(src, PROC_REF(do_attach), item, user)
+ return TRUE
+
+ for(var/obj/item/attach as anything in attachments)
+ if(SEND_SIGNAL(attach, COMSIG_ATTACHMENT_ATTACK, parent, item, user))
+ parent.update_icon()
+ return TRUE
+
+/datum/component/attachment_holder/proc/handle_item_pre_attack(obj/item/parent, atom/target_atom, mob/user, params)
+ SIGNAL_HANDLER
+
+ for(var/obj/item/attach as anything in attachments)
+ if(SEND_SIGNAL(attach, COMSIG_ATTACHMENT_PRE_ATTACK, parent, target_atom, user, params))
+ return TRUE
diff --git a/code/datums/components/bandage.dm b/code/datums/components/bandage.dm
index 16f6a2f0b05..05a31ec4ee3 100644
--- a/code/datums/components/bandage.dm
+++ b/code/datums/components/bandage.dm
@@ -41,7 +41,7 @@
SIGNAL_HANDLER
var/obj/item/bodypart/heal_target = parent
- lifespan -= 1 + heal_target.bleeding // particularly nasty bleeding can burn through dressing faster
+ lifespan--
heal_target.adjust_bleeding(-bleed_reduction)
if(lifespan <= 0 || !heal_target.bleeding) //remove treatment once it's no longer able to treat
drop_bandage(TRUE)
diff --git a/code/datums/components/bloodysoles.dm b/code/datums/components/bloodysoles.dm
index 03afc96182d..2619af5496f 100644
--- a/code/datums/components/bloodysoles.dm
+++ b/code/datums/components/bloodysoles.dm
@@ -213,16 +213,20 @@ Like its parent but can be applied to carbon mobs instead of clothing items
*/
/datum/component/bloodysoles/feet
- var/static/mutable_appearance/bloody_feet
+ var/mutable_appearance/bloody_feet
/datum/component/bloodysoles/feet/Initialize()
if(!iscarbon(parent))
return COMPONENT_INCOMPATIBLE
parent_atom = parent
wielder = parent
-
if(!bloody_feet)
- bloody_feet = mutable_appearance('icons/effects/blood.dmi', "shoeblood", SHOES_LAYER)
+ var/overlay_file = 'icons/effects/blood.dmi'
+ var/mob/living/carbon/parent_carbon = parent_atom
+ var/custom_overlay_icon = parent_carbon.dna.species.custom_overlay_icon
+ if(custom_overlay_icon)
+ overlay_file = custom_overlay_icon
+ bloody_feet = mutable_appearance(overlay_file, "shoeblood", SHOES_LAYER)
RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean))
RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
diff --git a/code/datums/components/cell_component.dm b/code/datums/components/cell_component.dm
new file mode 100644
index 00000000000..6855e667f43
--- /dev/null
+++ b/code/datums/components/cell_component.dm
@@ -0,0 +1,195 @@
+/*
+CELL COMPONENT
+
+What we aim to achieve with cell components is a universal framework for all items that would logically use batteries,
+Be it a flashlight, T-ray scanner or multitool. All of them would logically require batteries right? Well, welcome,
+to the cell component.
+
+General logic:
+Component attaches to parent(flashlight etc)
+Registers onhit signal to check if it's being slapped by a battery
+Component moves battery to equipment loc, keeps a record, and then communicates with
+the equipment and controls the behaviour of said equipment.
+
+If you are adding this to an item that is active for a period of time, register signal to COMSIG_CELL_START_USE when it would start using the cell
+and COMSIG_CELL_STOP_USE when it should stop. To handle the turning off of said item once the cell is depleted, add your code into the
+component_cell_out_of_charge/component_cell_removed proc using loc where necessary, processing is done in the component!
+
+The cells are removed from objects with the component through alt-click.
+*/
+
+/datum/component/cell
+ /// Our reference to the inserted cell, which will be stored in the parent.
+ var/obj/item/stock_parts/cell/inserted_cell
+ /// The item reference to parent.
+ var/obj/item/equipment
+ /// How much power do we use each process?
+ var/power_use_amount = POWER_CELL_USE_NORMAL
+ /// Callback interaction for when the cell is removed.
+ var/datum/callback/on_cell_removed = null
+ ///Can this cell be removed from the parent?
+ var/cell_can_be_removed = TRUE
+ ///Our reference to the cell overlay
+ var/mutable_appearance/cell_overlay = null
+ ///Do we have cell overlays to be applied?
+ var/has_cell_overlays
+
+/datum/component/cell/Initialize(cell_override, _on_cell_removed, _power_use_amount, start_with_cell = TRUE, _cell_can_be_removed, _has_cell_overlays = TRUE)
+ if(QDELETED(parent))
+ qdel(src)
+ return
+
+ if(!isitem(parent)) //Currently only compatable with items.
+ return COMPONENT_INCOMPATIBLE
+
+ equipment = parent //We'd like a simple reference to the atom this component is attached to instead of having to declare it every time we use it.
+
+ if(_on_cell_removed)
+ src.on_cell_removed = _on_cell_removed
+
+ has_cell_overlays = _has_cell_overlays
+
+ if(_power_use_amount)
+ power_use_amount = _power_use_amount
+ else
+ power_use_amount = equipment.power_use_amount
+
+ if(_cell_can_be_removed)
+ cell_can_be_removed = _cell_can_be_removed
+
+ if(start_with_cell)
+ var/obj/item/stock_parts/cell/new_cell
+ if(!cell_override)
+ new_cell = new /obj/item/stock_parts/cell/upgraded()
+ else
+ new_cell = new cell_override()
+ inserted_cell = new_cell
+ new_cell.forceMove(parent) //We use the parents location so things like EMP's can interact with the cell.
+
+ handle_cell_overlays()
+ return ..()
+
+/datum/component/cell/RegisterWithParent()
+ //Component to Parent signal registries
+ RegisterSignal(parent, COMSIG_ITEM_POWER_USE, PROC_REF(simple_power_use))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(insert_cell))
+ RegisterSignal(parent, COMSIG_CLICK_ALT , PROC_REF(remove_cell))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine_cell))
+
+/datum/component/cell/UnregisterFromParent()
+ UnregisterSignal(parent, COMSIG_ITEM_POWER_USE)
+ UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY)
+ UnregisterSignal(parent, COMSIG_CLICK_ALT)
+ UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
+
+/datum/component/cell/Destroy(force)
+
+ if(on_cell_removed)
+ on_cell_removed = null
+
+ if(inserted_cell)
+ QDEL_NULL(inserted_cell)
+ inserted_cell = null
+ return ..()
+
+/**
+ * The basic way of processing the cell, with included feedback.
+ *
+ * This proc is the basic way of processing the cell, with included feedback.
+ * It will return a bitflag if it failed to use the power, or COMPONENT_POWER_SUCCESS if it succeeds.
+ * Arguments:
+ * * use_amount - an override
+ * * check_only - will only return if it can use the cell and feedback relating to that including any relevant detail
+ */
+/datum/component/cell/proc/simple_power_use(datum/source, use_amount, mob/user, check_only)
+ SIGNAL_HANDLER
+
+ if(!use_amount)
+ use_amount = power_use_amount
+
+ if(!inserted_cell)
+ if(user)
+ to_chat(user, span_danger("There is no cell inside [equipment]"))
+ return COMPONENT_NO_CELL
+
+ if(check_only && inserted_cell.charge < use_amount)
+ if(user)
+ to_chat(user, span_danger("The cell inside [equipment] does not have enough charge to perform this action!"))
+ return COMPONENT_NO_CHARGE
+
+ if(!inserted_cell.use(use_amount))
+ inserted_cell.update_appearance() //Updates the attached cell sprite - Why does this not happen in cell.use?
+ if(user)
+ to_chat(user, span_danger("The cell inside [equipment] does not have enough charge to perform this action!"))
+ return COMPONENT_NO_CHARGE
+
+ inserted_cell.update_appearance()
+
+ return COMPONENT_POWER_SUCCESS
+
+/datum/component/cell/proc/examine_cell(atom/A, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ if(!inserted_cell)
+ examine_list += span_danger("It does not have a cell inserted!")
+ else
+ examine_list += span_notice("It has a [inserted_cell] inserted. \
+ The cell has [inserted_cell.percent()]% charge remaining. \
+ Alt-click to remove the cell.")
+
+/// Handling of cell removal.
+/datum/component/cell/proc/remove_cell(datum/source, mob/user)
+ SIGNAL_HANDLER
+ if(!equipment.can_interact(user))
+ return
+
+ if(!cell_can_be_removed)
+ return
+
+ if(!isliving(user))
+ return
+
+ if(inserted_cell)
+ to_chat(user, span_notice("You remove [inserted_cell] from [equipment]."))
+ playsound(equipment, 'sound/weapons/magout.ogg', 40, TRUE)
+ inserted_cell.forceMove(get_turf(equipment))
+ INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living, put_in_hands), inserted_cell)
+ inserted_cell = null
+ if(on_cell_removed)
+ on_cell_removed.Invoke()
+ handle_cell_overlays(TRUE)
+ else
+ to_chat(user, span_danger("There is no cell in [equipment]!"))
+
+/// Handling of cell insertion.
+/datum/component/cell/proc/insert_cell(datum/source, obj/item/inserting_item, mob/living/user, params)
+ SIGNAL_HANDLER
+ if(!equipment.can_interact(user))
+ return
+
+ if(!istype(inserting_item, /obj/item/stock_parts/cell))
+ return
+
+ if(inserted_cell) //No quickswap compatibility
+ to_chat(user, span_danger("There is already a cell in [equipment]!"))
+ return
+
+ to_chat(user, span_notice("You connect [inserting_item] onto [equipment]."))
+ playsound(equipment, 'sound/weapons/magin.ogg', 40, TRUE)
+ inserted_cell = inserting_item
+ inserting_item.forceMove(parent)
+ handle_cell_overlays(FALSE)
+
+/datum/component/cell/proc/handle_cell_overlays(update_overlays)
+ if(!has_cell_overlays)
+ return
+
+ if(inserted_cell)
+ cell_overlay = mutable_appearance(equipment.icon, "[initial(equipment.icon_state)]_cell")
+ equipment.add_overlay(cell_overlay)
+ else
+ QDEL_NULL(cell_overlay)
+ cell_overlay = null
+ if(update_overlays)
+ equipment.overlays.Cut()
+ equipment.update_overlays()
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index f18002a05bd..728a3bd44b8 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -18,8 +18,6 @@
/obj/effect/hotspot,
/obj/effect/landmark,
/obj/effect/temp_visual,
- /obj/effect/light_emitter/tendril,
- /obj/effect/collapse,
/obj/effect/particle_effect/ion_trails,
/obj/effect/dummy/phased_mob,
/obj/effect/mapping_helpers,
diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index df5ae1319c2..e7d0ebaace6 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -23,7 +23,6 @@
),
CAT_ROBOT = CAT_NONE,
CAT_MISC = CAT_NONE,
- CAT_PRIMAL = CAT_NONE,
CAT_FOOD = list(
CAT_BREAD,
CAT_BURGER,
diff --git a/code/datums/components/crafting/recipes/clothing.dm b/code/datums/components/crafting/recipes/clothing.dm
index 95b37502bca..1aa1570df41 100644
--- a/code/datums/components/crafting/recipes/clothing.dm
+++ b/code/datums/components/crafting/recipes/clothing.dm
@@ -181,12 +181,35 @@
result = /obj/item/clothing/gloves/tackler/offbrand
category = CAT_CLOTHING
-/datum/crafting_recipe/scrap_armor
- name = "Scrap Armor"
- result = /obj/item/clothing/suit/armor/vest/scrap_armor
- time = 60
- reqs = list(
- /obj/item/stack/sheet/metal = 10,
- /obj/item/stack/cable_coil = 20,
- )
+/datum/crafting_recipe/bonearmlet
+ name = "Bone Armlet"
+ result = /obj/item/clothing/accessory/bonearmlet
+ time = 20
+ reqs = list(/obj/item/stack/sheet/bone = 2,
+ /obj/item/stack/sheet/sinew = 1)
+ category = CAT_CLOTHING
+
+/datum/crafting_recipe/fangnecklace
+ name = "Wolf Fang Necklace"
+ result = /obj/item/clothing/neck/fangnecklace
+ time = 20
+ reqs = list(/obj/item/stack/sheet/sinew = 2,
+ /obj/item/mob_trophy/fang = 1)
+ category = CAT_CLOTHING
+
+/datum/crafting_recipe/goliathcloak
+ name = "Goliath Cloak"
+ result = /obj/item/clothing/suit/hooded/cloak/goliath
+ time = 50
+ reqs = list(/obj/item/stack/sheet/leather = 2,
+ /obj/item/stack/sheet/sinew = 2,
+ /obj/item/stack/sheet/animalhide/goliath_hide = 2) //it takes 4 goliaths to make 1 cloak if the plates are skinned
+ category = CAT_CLOTHING
+
+/datum/crafting_recipe/hunterbelt
+ name = "Hunters Belt"
+ result = /obj/item/storage/belt/mining/primitive
+ time = 20
+ reqs = list(/obj/item/stack/sheet/sinew = 2,
+ /obj/item/stack/sheet/animalhide/goliath_hide = 2)
category = CAT_CLOTHING
diff --git a/code/datums/components/crafting/recipes/misc.dm b/code/datums/components/crafting/recipes/misc.dm
index 0ed4acb5be7..fd89bd141ea 100644
--- a/code/datums/components/crafting/recipes/misc.dm
+++ b/code/datums/components/crafting/recipes/misc.dm
@@ -50,16 +50,6 @@
reqs = list(/obj/item/paper = 5)
category = CAT_MISC
-/datum/crafting_recipe/flashlight_eyes
- name = "Flashlight Eyes"
- result = /obj/item/organ/eyes/robotic/flashlight
- time = 10
- reqs = list(
- /obj/item/flashlight = 2,
- /obj/item/restraints/handcuffs/cable = 1
- )
- category = CAT_MISC
-
/datum/crafting_recipe/paperframes
name = "Paper Frames"
result = /obj/item/stack/sheet/paperframes/five
@@ -87,12 +77,6 @@
result = /obj/structure/curtain
category = CAT_MISC
-/datum/crafting_recipe/extendohand
- name = "Extendo-Hand"
- reqs = list(/obj/item/bodypart/r_arm/robot = 1, /obj/item/clothing/gloves/boxing = 1)
- result = /obj/item/extendohand
- category = CAT_MISC
-
/datum/crafting_recipe/pressureplate
name = "Pressure Plate"
result = /obj/item/pressure_plate
@@ -104,23 +88,13 @@
category = CAT_MISC
/datum/crafting_recipe/rcl
- name = "Makeshift Rapid Pipe Cleaner Layer"
+ name = "Makeshift Rapid Cable Layer"
result = /obj/item/rcl/ghetto
time = 40
tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH)
reqs = list(/obj/item/stack/sheet/metal = 15)
category = CAT_MISC
-/datum/crafting_recipe/guillotine
- name = "Guillotine"
- result = /obj/structure/guillotine
- time = 150 // Building a functioning guillotine takes time
- reqs = list(/obj/item/stack/sheet/plasteel = 3,
- /obj/item/stack/sheet/mineral/wood = 20,
- /obj/item/stack/cable_coil = 10)
- tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER)
- category = CAT_MISC
-
/datum/crafting_recipe/ghettojetpack
name = "Improvised Jetpack"
result = /obj/item/tank/jetpack/improvised
@@ -141,7 +115,7 @@
name = "Improvised Pickaxe"
reqs = list(
/obj/item/crowbar = 1,
- /obj/item/kitchen/knife = 1,
+ /obj/item/melee/knife/kitchen = 1,
/obj/item/stack/tape = 1)
result = /obj/item/pickaxe/improvised
category = CAT_MISC
@@ -204,17 +178,49 @@
/obj/item/aquarium_kit = 1)
category = CAT_MISC
-/datum/crafting_recipe/mothplush
- name = "Moth Plushie"
- result = /obj/item/toy/plush/moth
- reqs = list(/obj/item/stack/sheet/animalhide/mothroach = 1,
- /obj/item/organ/heart = 1,
- /obj/item/stack/sheet/cotton/cloth = 3)
- category = CAT_MISC
-
/datum/crafting_recipe/candorupgrade
name = "Candor Upgrade"
result = /obj/item/gun/ballistic/automatic/pistol/candor/phenex
reqs = list(/obj/item/stack/sheet/mineral/hidden = 4,
/obj/item/gun/ballistic/automatic/pistol/candor = 1)
category = CAT_MISC
+
+/datum/crafting_recipe/bonfire
+ name = "Bonfire"
+ time = 60
+ reqs = list(/obj/item/grown/log = 5)
+ parts = list(/obj/item/grown/log = 5)
+ blacklist = list(/obj/item/grown/log/steel)
+ result = /obj/structure/bonfire
+ category = CAT_MISC
+
+/datum/crafting_recipe/distiller
+ name = "Distiller"
+ result = /obj/structure/fermenting_barrel/distiller
+ reqs = list(/obj/item/stack/sheet/mineral/wood = 8, /obj/item/stack/sheet/metal = 5, /datum/reagent/srm_bacteria = 30)
+ time = 50
+ category = CAT_MISC
+
+/datum/crafting_recipe/charcoal_stylus
+ name = "Charcoal Stylus"
+ result = /obj/item/pen/charcoal
+ reqs = list(/obj/item/stack/sheet/mineral/wood = 1, /datum/reagent/ash = 30)
+ time = 30
+ category = CAT_MISC
+
+/datum/crafting_recipe/mushroom_bowl
+ name = "Mushroom Bowl"
+ result = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
+ reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings = 5)
+ time = 30
+ category = CAT_MISC
+
+/datum/crafting_recipe/chainsaw
+ name = "Chainsaw"
+ result = /obj/item/chainsaw
+ reqs = list(/obj/item/circular_saw = 1,
+ /obj/item/stack/cable_coil = 3,
+ /obj/item/stack/sheet/plasteel = 5)
+ tools = list(TOOL_WELDER)
+ time = 50
+ category = CAT_MISC
diff --git a/code/datums/components/crafting/recipes/robot.dm b/code/datums/components/crafting/recipes/robot.dm
index a5558682e86..cab33ef5f79 100644
--- a/code/datums/components/crafting/recipes/robot.dm
+++ b/code/datums/components/crafting/recipes/robot.dm
@@ -55,16 +55,6 @@
time = 40
category = CAT_ROBOT
-/datum/crafting_recipe/honkbot
- name = "Honkbot"
- result = /mob/living/simple_animal/bot/honkbot
- reqs = list(/obj/item/storage/box/clown = 1,
- /obj/item/bodypart/r_arm/robot = 1,
- /obj/item/assembly/prox_sensor = 1,
- /obj/item/bikehorn/ = 1)
- time = 40
- category = CAT_ROBOT
-
/datum/crafting_recipe/Firebot
name = "Firebot"
result = /mob/living/simple_animal/bot/firebot
diff --git a/code/datums/components/crafting/recipes/tribal.dm b/code/datums/components/crafting/recipes/tribal.dm
deleted file mode 100644
index c831b85d787..00000000000
--- a/code/datums/components/crafting/recipes/tribal.dm
+++ /dev/null
@@ -1,234 +0,0 @@
-/datum/crafting_recipe/bonearmlet
- name = "Bone Armlet"
- result = /obj/item/clothing/accessory/bonearmlet
- time = 20
- reqs = list(/obj/item/stack/sheet/bone = 2,
- /obj/item/stack/sheet/sinew = 1)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/fangnecklace
- name = "Wolf Fang Necklace"
- result = /obj/item/clothing/neck/fangnecklace
- time = 20
- reqs = list(/obj/item/stack/sheet/sinew = 2,
- /obj/item/mob_trophy/fang = 1)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/bonecodpiece
- name = "Skull Codpiece"
- result = /obj/item/clothing/accessory/skullcodpiece
- time = 20
- reqs = list(/obj/item/stack/sheet/bone = 2,
- /obj/item/mob_trophy/legion_skull = 1,
- /obj/item/stack/sheet/animalhide/goliath_hide = 1)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/skilt
- name = "Sinew Kilt"
- result = /obj/item/clothing/accessory/skilt
- time = 20
- reqs = list(/obj/item/stack/sheet/bone = 1,
- /obj/item/stack/sheet/sinew = 2)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/bracers
- name = "Bone Bracers"
- result = /obj/item/clothing/gloves/bracer
- time = 20
- reqs = list(/obj/item/stack/sheet/bone = 2,
- /obj/item/stack/sheet/sinew = 1)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/goliathcloak
- name = "Goliath Cloak"
- result = /obj/item/clothing/suit/hooded/cloak/goliath
- time = 50
- reqs = list(/obj/item/stack/sheet/leather = 2,
- /obj/item/stack/sheet/sinew = 2,
- /obj/item/stack/sheet/animalhide/goliath_hide = 2) //it takes 4 goliaths to make 1 cloak if the plates are skinned
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/drakecloak
- name = "Ash Drake Armour"
- result = /obj/item/clothing/suit/hooded/cloak/drake
- time = 60
- reqs = list(/obj/item/stack/sheet/bone = 10,
- /obj/item/stack/sheet/sinew = 2,
- /obj/item/stack/sheet/animalhide/ashdrake = 5)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/bonespear
- name = "Bone Spear"
- result = /obj/item/spear/bonespear
- time = 30
- reqs = list(/obj/item/stack/sheet/bone = 4,
- /obj/item/stack/sheet/sinew = 1)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/boneaxe
- name = "Bone Axe"
- result = /obj/item/fireaxe/boneaxe
- time = 50
- reqs = list(/obj/item/stack/sheet/bone = 6,
- /obj/item/stack/sheet/sinew = 3)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/bonfire
- name = "Bonfire"
- time = 60
- reqs = list(/obj/item/grown/log = 5)
- parts = list(/obj/item/grown/log = 5)
- blacklist = list(/obj/item/grown/log/steel)
- result = /obj/structure/bonfire
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/headpike
- name = "Spike Head (Glass Spear)"
- time = 65
- reqs = list(/obj/item/spear = 1,
- /obj/item/bodypart/head = 1)
- parts = list(/obj/item/bodypart/head = 1,
- /obj/item/spear = 1)
- blacklist = list(/obj/item/spear/explosive, /obj/item/spear/bonespear)
- result = /obj/structure/headpike
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/headpikebone
- name = "Spike Head (Bone Spear)"
- time = 65
- reqs = list(/obj/item/spear/bonespear = 1,
- /obj/item/bodypart/head = 1)
- parts = list(/obj/item/bodypart/head = 1,
- /obj/item/spear/bonespear = 1)
- result = /obj/structure/headpike/bone
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/lasso
- name = "Bone Lasso"
- reqs = list(
- /obj/item/stack/sheet/bone = 1,
- /obj/item/stack/sheet/sinew = 5)
- result = /obj/item/key/lasso
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/heavybonearmor
- name = "Heavy Bone Armor"
- result = /obj/item/clothing/suit/hooded/cloak/bone
- time = 60
- reqs = list(/obj/item/stack/sheet/bone = 8,
- /obj/item/stack/sheet/sinew = 3)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/watcherbola
- name = "Watcher Bola"
- result = /obj/item/restraints/legcuffs/bola/watcher
- time = 30
- reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 2,
- /obj/item/restraints/handcuffs/cable/sinew = 1)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/goliathshield
- name = "Goliath shield"
- result = /obj/item/shield/riot/goliath
- time = 60
- reqs = list(/obj/item/stack/sheet/bone = 4,
- /obj/item/stack/sheet/animalhide/goliath_hide = 3)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/bonesword
- name = "Bone Sword"
- result = /obj/item/claymore/bone
- time = 40
- reqs = list(/obj/item/stack/sheet/bone = 3,
- /obj/item/stack/sheet/sinew = 2)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/hunterbelt
- name = "Hunters Belt"
- result = /obj/item/storage/belt/mining/primitive
- time = 20
- reqs = list(/obj/item/stack/sheet/sinew = 2,
- /obj/item/stack/sheet/animalhide/goliath_hide = 2)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/quiver
- name = "Quiver"
- result = /obj/item/storage/bag/quiver/empty
- time = 80
- reqs = list(/obj/item/stack/sheet/leather = 3,
- /obj/item/stack/sheet/sinew = 4)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/bone_bow
- name = "Bone Bow"
- result = /obj/item/gun/ballistic/bow/ashen
- time = 200
- reqs = list(/obj/item/stack/sheet/bone = 8,
- /obj/item/stack/sheet/sinew = 4)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/polarbearcloak
- name = "Polar Cloak"
- result = /obj/item/clothing/suit/hooded/cloak/goliath/polar
- time = 50
- reqs = list(/obj/item/stack/sheet/leather = 2,
- /obj/item/stack/sheet/sinew = 2,
- /obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide = 2)
- blacklist = list(/obj/item/stack/sheet/animalhide/goliath_hide)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/distiller
- name = "Distiller"
- result = /obj/structure/fermenting_barrel/distiller
- reqs = list(/obj/item/stack/sheet/mineral/wood = 8, /obj/item/stack/sheet/metal = 5, /datum/reagent/srm_bacteria = 30)
- time = 50
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/crystalamulet
- name = "Crystal Amulet"
- result = /obj/item/clothing/neck/crystal_amulet
- time = 4 SECONDS
- reqs = list(/obj/item/strange_crystal = 3)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/crystalspear
- name = "Crystal Spear"
- result = /obj/item/spear/crystal
- time = 4 SECONDS
- reqs = list(/obj/item/strange_crystal = 2)
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/mushroom_bowl
- name = "Mushroom Bowl"
- result = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
- reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings = 5)
- time = 30
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/charcoal_stylus
- name = "Charcoal Stylus"
- result = /obj/item/pen/charcoal
- reqs = list(/obj/item/stack/sheet/mineral/wood = 1, /datum/reagent/ash = 30)
- time = 30
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/mushroom_mortar
- name = "Mushroom Mortar"
- result = /obj/item/reagent_containers/glass/mortar/mushroom
- reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings = 5)
- time = 30
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/oar
- name = "Goliath Bone Oar"
- result = /obj/item/oar
- reqs = list(/obj/item/stack/sheet/bone = 2)
- time = 15
- category = CAT_PRIMAL
-
-/datum/crafting_recipe/boat
- name = "Goliath Hide Boat"
- result = /obj/vehicle/ridden/lavaboat
- reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 3)
- time = 50
- category = CAT_PRIMAL
diff --git a/code/datums/components/crafting/recipes/weapon.dm b/code/datums/components/crafting/recipes/weapon.dm
index c1dde04b365..039ff4fa486 100644
--- a/code/datums/components/crafting/recipes/weapon.dm
+++ b/code/datums/components/crafting/recipes/weapon.dm
@@ -10,18 +10,6 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
-/datum/crafting_recipe/lance
- name = "Explosive Lance (Grenade)"
- result = /obj/item/spear/explosive
- reqs = list(/obj/item/spear = 1,
- /obj/item/grenade = 1)
- blacklist = list(/obj/item/spear/bonespear)
- parts = list(/obj/item/spear = 1,
- /obj/item/grenade = 1)
- time = 15
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
/datum/crafting_recipe/strobeshield
name = "Strobe Shield"
result = /obj/item/shield/riot/flash
@@ -38,7 +26,7 @@
/datum/crafting_recipe/molotov
name = "Molotov"
- result = /obj/item/reagent_containers/food/drinks/bottle/molotov
+ result = /obj/item/reagent_containers/food/drinks/molotov
reqs = list(/obj/item/reagent_containers/glass/rag = 1,
/obj/item/reagent_containers/food/drinks/bottle = 1)
parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)
@@ -56,17 +44,6 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
-/datum/crafting_recipe/teleprod
- name = "Teleprod"
- result = /obj/item/melee/baton/cattleprod/teleprod
- reqs = list(/obj/item/restraints/handcuffs/cable = 1,
- /obj/item/stack/rods = 1,
- /obj/item/assembly/igniter = 1,
- /obj/item/stack/ore/bluespace_crystal = 1)
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
/datum/crafting_recipe/bola
name = "Bola"
result = /obj/item/restraints/legcuffs/bola
@@ -76,16 +53,6 @@
category= CAT_WEAPONRY
subcategory = CAT_WEAPON
-/datum/crafting_recipe/gonbola
- name = "Gonbola"
- result = /obj/item/restraints/legcuffs/bola/gonbola
- reqs = list(/obj/item/restraints/handcuffs/cable = 1,
- /obj/item/stack/sheet/metal = 6,
- /obj/item/stack/sheet/animalhide/gondola = 1)
- time = 40
- category= CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
/datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but
name = "Pneumatic Cannon"
result = /obj/item/pneumatic_cannon/ghetto
@@ -97,19 +64,6 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
-/datum/crafting_recipe/flamethrower
- name = "Flamethrower"
- result = /obj/item/flamethrower
- reqs = list(/obj/item/weldingtool = 1,
- /obj/item/assembly/igniter = 1,
- /obj/item/stack/rods = 1)
- parts = list(/obj/item/assembly/igniter = 1,
- /obj/item/weldingtool = 1)
- tools = list(TOOL_SCREWDRIVER)
- time = 10
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
/datum/crafting_recipe/meteorslug
name = "Meteorslug Shell"
result = /obj/item/ammo_casing/shotgun/meteorslug
@@ -205,20 +159,9 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
-/datum/crafting_recipe/chainsaw
- name = "Chainsaw"
- result = /obj/item/chainsaw
- reqs = list(/obj/item/circular_saw = 1,
- /obj/item/stack/cable_coil = 3,
- /obj/item/stack/sheet/plasteel = 5)
- tools = list(TOOL_WELDER)
- time = 50
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
/datum/crafting_recipe/spear
name = "Spear"
- result = /obj/item/spear
+ result = /obj/item/melee/spear
reqs = list(/obj/item/restraints/handcuffs/cable = 1,
/obj/item/shard = 1,
/obj/item/stack/rods = 1)
@@ -253,7 +196,7 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
-/datum/crafting_recipe/pipebow
+/*/datum/crafting_recipe/pipebow
name = "Pipe Bow"
result = /obj/item/gun/ballistic/bow/pipe
reqs = list(/obj/item/pipe = 5,
@@ -300,7 +243,7 @@
/obj/item/stack/tile/bronze = 1,
/obj/item/stack/sheet/silk = 1)
category = CAT_WEAPONRY
- subcategory = CAT_AMMO
+ subcategory = CAT_AMMO */
/datum/crafting_recipe/zip_pistol
name = "Zip Pistol"
@@ -315,3 +258,30 @@
time = 100
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
+
+/datum/crafting_recipe/bonespear
+ name = "Bone Spear"
+ result = /obj/item/melee/spear/bone
+ time = 30
+ reqs = list(/obj/item/stack/sheet/bone = 4,
+ /obj/item/stack/sheet/sinew = 1)
+ category = CAT_WEAPONRY
+ subcategory = CAT_WEAPON
+
+/datum/crafting_recipe/boneaxe
+ name = "Bone Axe"
+ result = /obj/item/melee/axe/bone
+ time = 50
+ reqs = list(/obj/item/stack/sheet/bone = 6,
+ /obj/item/stack/sheet/sinew = 3)
+ category = CAT_WEAPONRY
+ subcategory = CAT_WEAPON
+
+/datum/crafting_recipe/bonesword
+ name = "Bone Sword"
+ result = /obj/item/melee/sword/bone
+ time = 40
+ reqs = list(/obj/item/stack/sheet/bone = 3,
+ /obj/item/stack/sheet/sinew = 2)
+ category = CAT_WEAPONRY
+ subcategory = CAT_WEAPON
diff --git a/code/datums/components/creamed.dm b/code/datums/components/creamed.dm
index 019bb7362bd..c2cf5d07a28 100644
--- a/code/datums/components/creamed.dm
+++ b/code/datums/components/creamed.dm
@@ -39,7 +39,7 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list(
var/atom/A = parent
A.add_overlay(creamface)
-/datum/component/creamed/Destroy(force, silent)
+/datum/component/creamed/Destroy(force)
var/atom/A = parent
A.cut_overlay(creamface)
qdel(creamface)
diff --git a/code/datums/components/deadchat_control.dm b/code/datums/components/deadchat_control.dm
index f34960db107..6030214bf8b 100644
--- a/code/datums/components/deadchat_control.dm
+++ b/code/datums/components/deadchat_control.dm
@@ -24,7 +24,7 @@
notify_ghosts("[parent] is now deadchat controllable!", source = parent, action = NOTIFY_ORBIT, header="Something Interesting!")
-/datum/component/deadchat_control/Destroy(force, silent)
+/datum/component/deadchat_control/Destroy(force)
inputs = null
orbiters = null
ckey_to_cooldown = null
diff --git a/code/datums/components/dejavu.dm b/code/datums/components/dejavu.dm
deleted file mode 100644
index b2a2cddf9c9..00000000000
--- a/code/datums/components/dejavu.dm
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * A component to reset the parent to its previous state after some time passes
- */
-/datum/component/dejavu
- /// The turf the parent was on when this components was applied, they get moved back here after the duration
- var/turf/starting_turf
- /// Determined by the type of the parent so different behaviours can happen per type
- var/rewind_type
- /// How many rewinds will happen before the effect ends
- var/rewinds_remaining
- /// How long to wait between each rewind
- var/rewind_interval
-
- /// The starting value of clone loss at the beginning of the effect
- var/clone_loss = 0
- /// The starting value of toxin loss at the beginning of the effect
- var/tox_loss = 0
- /// The starting value of oxygen loss at the beginning of the effect
- var/oxy_loss = 0
- /// The starting value of brain loss at the beginning of the effect
- var/brain_loss = 0
- /// The starting value of brute loss at the beginning of the effect
- /// This only applies to simple animals
- var/brute_loss
- /// The starting value of integrity at the beginning of the effect
- /// This only applies to objects
- var/integrity
- /// A list of body parts saved at the beginning of the effect
- var/list/datum/saved_bodypart/saved_bodyparts
-
-/datum/component/dejavu/Initialize(rewinds = 1, interval = 10 SECONDS)
- if(!isatom(parent))
- return COMPONENT_INCOMPATIBLE
-
- starting_turf = get_turf(parent)
- rewinds_remaining = rewinds
- rewind_interval = interval
-
- if(isliving(parent))
- var/mob/living/L = parent
- clone_loss = L.getCloneLoss()
- tox_loss = L.getToxLoss()
- oxy_loss = L.getOxyLoss()
- brain_loss = L.getOrganLoss(ORGAN_SLOT_BRAIN)
- rewind_type = PROC_REF(rewind_living)
-
- if(iscarbon(parent))
- var/mob/living/carbon/C = parent
- saved_bodyparts = C.save_bodyparts()
- rewind_type = PROC_REF(rewind_carbon)
-
- else if(isanimal(parent))
- var/mob/living/simple_animal/M = parent
- brute_loss = M.bruteloss
- rewind_type = PROC_REF(rewind_animal)
-
- else if(isobj(parent))
- var/obj/O = parent
- integrity = O.obj_integrity
- rewind_type = PROC_REF(rewind_obj)
-
- addtimer(CALLBACK(src, rewind_type), rewind_interval)
-
-/datum/component/dejavu/Destroy()
- starting_turf = null
- saved_bodyparts = null
- return ..()
-
-/datum/component/dejavu/proc/rewind()
- to_chat(parent, "You remember a time not so long ago...")
-
- //comes after healing so new limbs comically drop to the floor
- if(starting_turf)
- var/atom/movable/master = parent
- master.forceMove(starting_turf)
-
- rewinds_remaining --
- if(rewinds_remaining)
- addtimer(CALLBACK(src, rewind_type), rewind_interval)
- else
- to_chat(parent, "But the memory falls out of your reach.")
- qdel(src)
-
-/datum/component/dejavu/proc/rewind_living()
- var/mob/living/master = parent
- master.setCloneLoss(clone_loss)
- master.setToxLoss(tox_loss)
- master.setOxyLoss(oxy_loss)
- master.setOrganLoss(ORGAN_SLOT_BRAIN, brain_loss)
- rewind()
-
-/datum/component/dejavu/proc/rewind_carbon()
- if(saved_bodyparts)
- var/mob/living/carbon/master = parent
- master.apply_saved_bodyparts(saved_bodyparts)
- rewind_living()
-
-/datum/component/dejavu/proc/rewind_animal()
- var/mob/living/simple_animal/master = parent
- master.bruteloss = brute_loss
- master.updatehealth()
- rewind_living()
-
-/datum/component/dejavu/proc/rewind_obj()
- var/obj/master = parent
- master.obj_integrity = integrity
- rewind()
diff --git a/code/datums/components/edible.dm b/code/datums/components/edible.dm
deleted file mode 100644
index b65a2d8b7e3..00000000000
--- a/code/datums/components/edible.dm
+++ /dev/null
@@ -1,259 +0,0 @@
-/*!
-
-This component makes it possible to make things edible. What this means is that you can take a bite or force someone to take a bite (in the case of items).
-These items take a specific time to eat, and can do most of the things our original food items could.
-
-Behavior that's still missing from this component that original food items had that should either be put into seperate components or somewhere else:
- Components:
- Drying component (jerky etc)
- Customizable component (custom pizzas etc)
- Processable component (Slicing and cooking behavior essentialy, making it go from item A to B when conditions are met.)
- Dunkable component (Dunking things into reagent containers to absorb a specific amount of reagents)
-
- Misc:
- Something for cakes (You can store things inside)
-
-*/
-/datum/component/edible
- ///Amount of reagents taken per bite
- var/bite_consumption = 2
- ///Amount of bites taken so far
- var/bitecount = 0
- ///Flags for food
- var/food_flags = NONE
- ///Bitfield of the types of this food
- var/foodtypes = NONE
- ///Amount of seconds it takes to eat this food
- var/eat_time = 30
- ///Defines how much it lowers someones satiety (Need to eat, essentialy)
- var/junkiness = 0
- ///Message to send when eating
- var/list/eatverbs
- ///Callback to be ran for when you take a bite of something
- var/datum/callback/after_eat
- ///Last time we checked for food likes
- var/last_check_time
- ///Color we use when stuffed in things
- var/filling_color = "#FFFFFF"
-
-/datum/component/edible/Initialize(list/initial_reagents, food_flags = NONE, foodtypes = NONE, volume = 50, eat_time = 30, list/tastes, list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"), bite_consumption = 2, filling_color = "#FFFFFF", datum/callback/after_eat)
- if(!isatom(parent))
- return COMPONENT_INCOMPATIBLE
-
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, PROC_REF(UseByAnimal))
- if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(UseFromHand))
- else if(isturf(parent))
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(TryToEatTurf))
-
- src.bite_consumption = bite_consumption
- src.food_flags = food_flags
- src.foodtypes = foodtypes
- src.eat_time = eat_time
- src.eatverbs = eatverbs
- src.junkiness = junkiness
- src.after_eat = after_eat
- src.filling_color = filling_color
-
- var/atom/owner = parent
-
- owner.create_reagents(volume, INJECTABLE)
-
- if(initial_reagents)
- for(var/rid in initial_reagents)
- var/amount = initial_reagents[rid]
- if(tastes && tastes.len && (rid == /datum/reagent/consumable/nutriment || rid == /datum/reagent/consumable/nutriment/vitamin))
- owner.reagents.add_reagent(rid, amount, tastes.Copy())
- else
- owner.reagents.add_reagent(rid, amount)
-
-/datum/component/edible/proc/examine(datum/source, mob/user, list/examine_list)
- SIGNAL_HANDLER
-
- if(!(food_flags & FOOD_IN_CONTAINER))
- switch (bitecount)
- if (0)
- return
- if(1)
- examine_list += "[parent] was bitten by someone!"
- if(2,3)
- examine_list += "[parent] was bitten [bitecount] times!"
- else
- examine_list += "[parent] was bitten multiple times!"
-
-/datum/component/edible/proc/UseFromHand(obj/item/source, mob/living/M, mob/living/user)
- SIGNAL_HANDLER
-
- return TryToEat(M, user)
-
-/datum/component/edible/proc/TryToEatTurf(datum/source, mob/user)
- SIGNAL_HANDLER
-
- return TryToEat(user, user)
-
-///All the checks for the act of eating itself and
-/datum/component/edible/proc/TryToEat(mob/living/eater, mob/living/feeder)
-
- set waitfor = FALSE
-
- var/atom/owner = parent
-
- if(feeder.a_intent == INTENT_HARM)
- return
- if(!owner.reagents.total_volume)//Shouldn't be needed but it checks to see if it has anything left in it.
- to_chat(feeder, "None of [owner] left, oh no!")
- if(isturf(parent))
- var/turf/T = parent
- T.ScrapeAway(1, CHANGETURF_INHERIT_AIR)
- else
- qdel(parent)
- return
- if(!CanConsume(eater, feeder))
- return
- var/fullness = eater.nutrition + 10 //The theoretical fullness of the person eating if they were to eat this
- for(var/datum/reagent/consumable/C in eater.reagents.reagent_list) //we add the nutrition value of what we're currently digesting
- fullness += C.nutriment_factor * C.volume / C.metabolization_rate
-
- . = COMPONENT_ITEM_NO_ATTACK //Point of no return I suppose
-
- if(eater == feeder)//If you're eating it yourself.
- if(!do_after(feeder, eat_time, eater)) //Gotta pass the minimal eat time
- return
- var/eatverb = pick(eatverbs)
- if(junkiness && eater.satiety < -150 && eater.nutrition > NUTRITION_LEVEL_STARVING + 50 && !HAS_TRAIT(eater, TRAIT_VORACIOUS))
- to_chat(eater, "You don't feel like eating any more junk food at the moment!")
- return
- else if(fullness <= 50)
- eater.visible_message("[eater] hungrily [eatverb]s \the [parent], gobbling it down!", "You hungrily [eatverb] \the [parent], gobbling it down!")
- else if(fullness > 50 && fullness < 150)
- eater.visible_message("[eater] hungrily [eatverb]s \the [parent].", "You hungrily [eatverb] \the [parent].")
- else if(fullness > 150 && fullness < 500)
- eater.visible_message("[eater] [eatverb]s \the [parent].", "You [eatverb] \the [parent].")
- else if(fullness > 500 && fullness < 600)
- eater.visible_message("[eater] unwillingly [eatverb]s a bit of \the [parent].", "You unwillingly [eatverb] a bit of \the [parent].")
- else if(fullness > (600 * (1 + eater.overeatduration / 2000))) // The more you eat - the more you can eat
- eater.visible_message("[eater] cannot force any more of \the [parent] to go down [eater.p_their()] throat!", "You cannot force any more of \the [parent] to go down your throat!")
- return
- else //If you're feeding it to someone else.
- if(isbrain(eater))
- to_chat(feeder, "[eater] doesn't seem to have a mouth!")
- return
- if(fullness <= (600 * (1 + eater.overeatduration / 1000)))
- eater.visible_message("[feeder] attempts to feed [eater] [parent].", \
- "[feeder] attempts to feed you [parent].")
- else
- eater.visible_message("[feeder] cannot force any more of [parent] down [eater]'s throat!", \
- "[feeder] cannot force any more of [parent] down your throat!")
- return
- if(!do_after(feeder, target = eater)) //Wait 3 seconds before you can feed
- return
-
- log_combat(feeder, eater, "fed", owner.reagents.log_list())
- eater.visible_message("[feeder] forces [eater] to eat [parent]!", \
- "[feeder] forces you to eat [parent]!")
-
- TakeBite(eater, feeder)
-
-///This function lets the eater take a bite and transfers the reagents to the eater.
-/datum/component/edible/proc/TakeBite(mob/living/eater, mob/living/feeder)
-
- var/atom/owner = parent
-
- if(!owner?.reagents)
- return FALSE
- if(eater.satiety > -200)
- eater.satiety -= junkiness
- playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE)
- if(owner.reagents.total_volume)
- SEND_SIGNAL(parent, COMSIG_FOOD_EATEN, eater, feeder)
- var/fraction = min(bite_consumption / owner.reagents.total_volume, 1)
- owner.reagents.trans_to(eater, bite_consumption, transfered_by = feeder, method = INGEST)
- bitecount++
- On_Consume(eater)
- checkLiked(fraction, eater)
-
- //Invoke our after eat callback if it is valid
- if(after_eat)
- after_eat.Invoke(eater, feeder)
-
- return TRUE
-
-///Checks whether or not the eater can actually consume the food
-/datum/component/edible/proc/CanConsume(mob/living/eater, mob/living/feeder)
- if(!iscarbon(eater))
- return FALSE
- var/mob/living/carbon/C = eater
- var/covered = ""
- if(C.is_mouth_covered(head_only = 1))
- covered = "headgear"
- else if(C.is_mouth_covered(mask_only = 1))
- covered = "mask"
- if(covered)
- var/who = (isnull(feeder) || eater == feeder) ? "your" : "[eater.p_their()]"
- to_chat(feeder, "You have to remove [who] [covered] first!")
- return FALSE
- return TRUE
-
-///Check foodtypes to see if we should send a moodlet
-/datum/component/edible/proc/checkLiked(fraction, mob/M)
- if(last_check_time + 50 > world.time)
- return FALSE
- if(!ishuman(M))
- return FALSE
- var/mob/living/carbon/human/H = M
- if(HAS_TRAIT(H, TRAIT_AGEUSIA) && foodtypes & H.dna.species.toxic_food)
- to_chat(H, "You don't feel so good...")
- H.adjust_disgust(25 + 30 * fraction)
- else
- if(foodtypes & H.dna.species.toxic_food)
- to_chat(H,"What the hell was that thing?!")
- H.adjust_disgust(25 + 30 * fraction)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food)
- else if(foodtypes & H.dna.species.disliked_food)
- to_chat(H,"That didn't taste very good...")
- H.adjust_disgust(11 + 15 * fraction)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
- else if(foodtypes & H.dna.species.liked_food)
- to_chat(H,"I love this taste!")
- H.adjust_disgust(-5 + -2.5 * fraction)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food)
- if((foodtypes & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
- last_check_time = world.time
-
-///Delete the item when it is fully eaten
-/datum/component/edible/proc/On_Consume(mob/living/eater)
-
- var/atom/owner = parent
-
- if(!eater)
- return
- if(!owner.reagents.total_volume)
- if(isturf(parent))
- var/turf/T = parent
- T.ScrapeAway(1, CHANGETURF_INHERIT_AIR)
- else
- qdel(parent)
-
-///Ability to feed food to puppers
-/datum/component/edible/proc/UseByAnimal(datum/source, mob/user)
-
- SIGNAL_HANDLER
-
-
- var/atom/owner = parent
-
- if(!isdog(user))
- return
- var/mob/living/L = user
- if(bitecount == 0 || prob(50))
- L.manual_emote("nibbles away at \the [parent]")
- bitecount++
- . = COMPONENT_ITEM_NO_ATTACK
- L.taste(owner.reagents) // why should carbons get all the fun?
- if(bitecount >= 5)
- var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where \the [parent] was")
- if(sattisfaction_text)
- L.manual_emote(sattisfaction_text)
- qdel(parent)
diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm
index ee789d3f982..13c21c2c8f2 100644
--- a/code/datums/components/embedded.dm
+++ b/code/datums/components/embedded.dm
@@ -164,7 +164,10 @@
if(harmful && prob(chance))
var/damage = weapon.w_class * jostle_pain_mult
limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage)
- to_chat(victim, "[weapon] embedded in your [limb.name] jostles and stings!")
+ if(HAS_TRAIT(victim, TRAIT_ANALGESIA))
+ to_chat(victim, span_notice("[weapon] embedded in your [limb.name] shifts around."))
+ return
+ to_chat(victim, span_userdanger("[weapon] embedded in your [limb.name] jostles and stings!"))
/// Called when then item randomly falls out of a carbon. This handles the damage and descriptors, then calls safe_remove()
@@ -205,7 +208,7 @@
if(harmful)
var/damage = weapon.w_class * remove_pain_mult
limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage) //It hurts to rip it out, get surgery you dingus.
- victim.emote("scream")
+ victim.force_scream()
victim.visible_message("[victim] successfully rips [weapon] out of [victim.p_their()] [limb.name]!", "You successfully remove [weapon] from your [limb.name].")
else
victim.visible_message("[victim] successfully rips [weapon] off of [victim.p_their()] [limb.name]!", "You successfully remove [weapon] from your [limb.name].")
diff --git a/code/datums/components/fantasy/_fantasy.dm b/code/datums/components/fantasy/_fantasy.dm
index 92bd0868a74..6941f6c169b 100644
--- a/code/datums/components/fantasy/_fantasy.dm
+++ b/code/datums/components/fantasy/_fantasy.dm
@@ -75,7 +75,7 @@
var/usedSlots = NONE
for(var/i in 1 to max(1, abs(quality))) // We want at least 1 affix applied
- var/datum/fantasy_affix/affix = pickweight(affixListing)
+ var/datum/fantasy_affix/affix = pick_weight(affixListing)
if(affix.placement & usedSlots)
continue
if(!(affix.alignment & alignment))
diff --git a/code/datums/components/fantasy/suffixes.dm b/code/datums/components/fantasy/suffixes.dm
index 8cabee42d21..89a26ca60f7 100644
--- a/code/datums/components/fantasy/suffixes.dm
+++ b/code/datums/components/fantasy/suffixes.dm
@@ -128,17 +128,15 @@
/obj/projectile/meteor = 1,
/obj/projectile/energy/nuclear_particle = 1,
/obj/projectile/beam/pulse = 1,
- /obj/projectile/bullet/honker = 15,
/obj/projectile/temp = 15,
/obj/projectile/ion = 15,
/obj/projectile/beam/emitter = 15,
/obj/projectile/energy/net = 15,
- /obj/projectile/bullet/incendiary/c9mm = 15,
/obj/projectile/temp/hot = 15,
/obj/projectile/beam/disabler = 15
)
- var/obj/projectile/picked_projectiletype = pickweight(weighted_projectile_types)
+ var/obj/projectile/picked_projectiletype = pick_weight(weighted_projectile_types)
var/obj/item/master = comp.parent
comp.appliedComponents += master.AddComponent(/datum/component/mirv, picked_projectiletype)
diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm
new file mode 100644
index 00000000000..f5129fb761b
--- /dev/null
+++ b/code/datums/components/food/edible.dm
@@ -0,0 +1,494 @@
+/*!
+
+This component makes it possible to make things edible. What this means is that you can take a bite or force someone to take a bite (in the case of items).
+These items take a specific time to eat, and can do most of the things our original food items could.
+
+Behavior that's still missing from this component that original food items had that should either be put into seperate components or somewhere else:
+ Components:
+ Drying component (jerky etc)
+ Customizable component (custom pizzas etc)
+ Processable component (Slicing and cooking behavior essentialy, making it go from item A to B when conditions are met.)
+ Microwavability component
+ Frying component
+
+ Misc:
+ Something for cakes (You can store things inside)
+
+*/
+/datum/component/edible
+ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+ ///Amount of reagents taken per bite
+ var/bite_consumption = 2
+ ///Amount of bites taken so far
+ var/bitecount = 0
+ ///Flags for food
+ var/food_flags = NONE
+ ///Bitfield of the types of this food
+ var/foodtypes = NONE
+ ///Amount of seconds it takes to eat this food
+ var/eat_time = 30
+ ///Defines how much it lowers someones satiety (Need to eat, essentialy)
+ var/junkiness = 0
+ ///Message to send when eating
+ var/list/eatverbs
+ ///Callback to be ran before you eat something, so you can check if someone *can* eat it.
+ var/datum/callback/pre_eat
+ ///Callback to be ran before composting something, in case you don't want a piece of food to be compostable for some reason.
+ var/datum/callback/on_compost
+ ///Callback to be ran for when you take a bite of something
+ var/datum/callback/after_eat
+ ///Callback to be ran for when you finish eating something
+ var/datum/callback/on_consume
+ ///Last time we checked for food likes
+ var/last_check_time
+ ///The initial reagents of this food when it is made
+ var/list/initial_reagents
+ ///The initial volume of the foods reagents
+ var/volume
+ ///The flavortext for taste
+ var/list/tastes
+ ///The type of atom this creates when the object is microwaved.
+ var/microwaved_type
+
+ //TEMP VAR, filling is nonfunctional because newfood isnt customizable yet
+ var/filling_color
+
+/datum/component/edible/Initialize(list/initial_reagents,
+ food_flags = NONE,
+ foodtypes = NONE,
+ volume = 50,
+ eat_time = 10,
+ list/tastes,
+ list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"),
+ bite_consumption = 2,
+ microwaved_type,
+ junkiness,
+ filling_color = null, //Temp var
+ datum/callback/pre_eat,
+ datum/callback/on_compost,
+ datum/callback/after_eat,
+ datum/callback/on_consume
+)
+ if(!isatom(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, PROC_REF(use_by_animal))
+ RegisterSignal(parent, COMSIG_ATOM_CHECKPARTS, PROC_REF(on_craft))
+ RegisterSignal(parent, COMSIG_ATOM_CREATEDBY_PROCESSING, PROC_REF(on_processed))
+ RegisterSignal(parent, COMSIG_ITEM_MICROWAVE_COOKED, PROC_REF(on_microwave_cooked))
+ RegisterSignal(parent, COMSIG_EDIBLE_ON_COMPOST, PROC_REF(compost))
+
+ if(isitem(parent))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(use_from_hand))
+ RegisterSignal(parent, COMSIG_ITEM_FRIED, PROC_REF(on_fried))
+ RegisterSignal(parent, COMSIG_ITEM_MICROWAVE_ACT, PROC_REF(on_microwaved))
+
+ var/obj/item/item = parent
+ if (!item.grind_results)
+ item.grind_results = list() //If this doesn't already exist, add it as an empty list. This is needed for the grinder to accept it.
+
+ src.bite_consumption = bite_consumption
+ src.food_flags = food_flags
+ src.foodtypes = foodtypes
+ src.eat_time = eat_time
+ src.eatverbs = string_list(eatverbs)
+ src.junkiness = junkiness
+ src.pre_eat = pre_eat
+ src.on_compost = on_compost
+ src.after_eat = after_eat
+ src.on_consume = on_consume
+ src.initial_reagents = string_assoc_list(initial_reagents)
+ src.tastes = string_assoc_list(tastes)
+ src.microwaved_type = microwaved_type
+
+ var/atom/owner = parent
+
+ owner.create_reagents(volume, INJECTABLE)
+
+ for(var/rid in initial_reagents)
+ var/amount = initial_reagents[rid]
+ if(length(tastes) && (rid == /datum/reagent/consumable/nutriment || rid == /datum/reagent/consumable/nutriment/vitamin))
+ owner.reagents.add_reagent(rid, amount, tastes.Copy())
+ else
+ owner.reagents.add_reagent(rid, amount)
+
+/datum/component/edible/InheritComponent(datum/component/C,
+ i_am_original,
+ list/initial_reagents,
+ food_flags = NONE,
+ foodtypes = NONE,
+ volume = 50,
+ eat_time = 30,
+ list/tastes,
+ list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"),
+ bite_consumption = 2,
+ filling_color = null, //Temp var
+ datum/callback/pre_eat,
+ datum/callback/on_compost,
+ datum/callback/after_eat,
+ datum/callback/on_consume
+ )
+
+ . = ..()
+ src.bite_consumption = bite_consumption
+ src.food_flags = food_flags
+ src.foodtypes = foodtypes
+ src.eat_time = eat_time
+ src.eatverbs = eatverbs
+ src.junkiness = junkiness
+ src.pre_eat = pre_eat
+ src.on_compost = on_compost
+ src.after_eat = after_eat
+ src.on_consume = on_consume
+
+/datum/component/edible/Destroy(force)
+ QDEL_NULL(pre_eat)
+ QDEL_NULL(on_compost)
+ QDEL_NULL(after_eat)
+ QDEL_NULL(on_consume)
+ return ..()
+
+/datum/component/edible/proc/examine(datum/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ if(!(food_flags & FOOD_IN_CONTAINER))
+ switch(bitecount)
+ if(0)
+ EMPTY_BLOCK_GUARD
+ if(1)
+ examine_list += "[parent] was bitten by someone!"
+ if(2,3)
+ examine_list += "[parent] was bitten [bitecount] times!"
+ else
+ examine_list += "[parent] was bitten multiple times!"
+
+/datum/component/edible/proc/use_from_hand(obj/item/source, mob/living/M, mob/living/user)
+ SIGNAL_HANDLER
+
+ return TryToEat(M, user)
+
+/datum/component/edible/proc/on_fried(fry_object)
+ SIGNAL_HANDLER
+ var/atom/our_atom = parent
+ our_atom.reagents.trans_to(fry_object, our_atom.reagents.total_volume)
+ qdel(our_atom)
+ return COMSIG_FRYING_HANDLED
+
+///Called when food is created through processing (Usually this means it was sliced). We use this to pass the OG items reagents.
+/datum/component/edible/proc/on_processed(datum/source, atom/original_atom, list/chosen_processing_option)
+ SIGNAL_HANDLER
+
+ if(!original_atom.reagents)
+ return
+
+ var/atom/this_food = parent
+ var/reagents_for_slice = chosen_processing_option[TOOL_PROCESSING_AMOUNT]
+
+ this_food.create_reagents(volume) //Make sure we have a reagent container
+
+ original_atom.reagents.trans_to(this_food, reagents_for_slice)
+
+ if(original_atom.name != initial(original_atom.name))
+ this_food.name = "slice of [original_atom.name]"
+ if(original_atom.desc != initial(original_atom.desc))
+ this_food.desc = "[original_atom.desc]"
+
+///Called when food is crafted through a crafting recipe datum.
+/datum/component/edible/proc/on_craft(datum/source, list/parts_list, datum/crafting_recipe/food/recipe)
+ SIGNAL_HANDLER
+
+ var/atom/this_food = parent
+
+ this_food.reagents.clear_reagents()
+
+ for(var/obj/item/crafted_part in this_food.contents)
+ crafted_part.reagents?.trans_to(this_food.reagents, crafted_part.reagents.maximum_volume, CRAFTED_FOOD_INGREDIENT_REAGENT_MODIFIER)
+
+ var/list/objects_to_delete = list()
+
+ // Remove all non recipe objects from the contents
+ for(var/content_object in this_food.contents)
+ for(var/recipe_object in recipe.real_parts)
+ if(istype(content_object, recipe_object))
+ continue
+ objects_to_delete += content_object
+
+ QDEL_LIST(objects_to_delete)
+
+ for(var/r_id in initial_reagents)
+ var/amount = initial_reagents[r_id] * CRAFTED_FOOD_BASE_REAGENT_MODIFIER
+ if(r_id == /datum/reagent/consumable/nutriment || r_id == /datum/reagent/consumable/nutriment/vitamin)
+ this_food.reagents.add_reagent(r_id, amount, tastes)
+ else
+ this_food.reagents.add_reagent(r_id, amount)
+
+ SSblackbox.record_feedback("tally", "food_made", 1, type)
+
+/datum/component/edible/proc/on_microwaved(datum/source, obj/machinery/microwave/used_microwave)
+ SIGNAL_HANDLER
+
+ var/turf/parent_turf = get_turf(parent)
+
+ if(!microwaved_type)
+ new /obj/item/reagent_containers/food/snacks/badrecipe(parent_turf)
+ qdel(parent)
+ return
+
+ var/obj/item/result
+
+ result = new microwaved_type(parent_turf)
+
+ var/efficiency = istype(used_microwave) ? used_microwave.efficiency : 1
+
+ SEND_SIGNAL(result, COMSIG_ITEM_MICROWAVE_COOKED, parent, efficiency)
+
+ SSblackbox.record_feedback("tally", "food_made", 1, result.type)
+ qdel(parent)
+ return COMPONENT_SUCCESFUL_MICROWAVE
+
+///Corrects the reagents on the newly cooked food
+/datum/component/edible/proc/on_microwave_cooked(datum/source, obj/item/source_item, cooking_efficiency = 1)
+ SIGNAL_HANDLER
+
+ var/atom/this_food = parent
+
+ this_food.reagents.clear_reagents()
+
+ source_item.reagents?.trans_to(this_food, source_item.reagents.total_volume)
+
+ for(var/r_id in initial_reagents)
+ var/amount = initial_reagents[r_id] * cooking_efficiency * CRAFTED_FOOD_BASE_REAGENT_MODIFIER
+ if(r_id == /datum/reagent/consumable/nutriment || r_id == /datum/reagent/consumable/nutriment/vitamin)
+ this_food.reagents.add_reagent(r_id, amount, tastes)
+ else
+ this_food.reagents.add_reagent(r_id, amount)
+
+///Makes sure the thing hasn't been destroyed or fully eaten to prevent eating phantom edibles
+/datum/component/edible/proc/IsFoodGone(atom/owner, mob/living/feeder)
+ if(QDELETED(owner)|| !(IS_EDIBLE(owner)))
+ return TRUE
+ if(owner.reagents.total_volume)
+ return FALSE
+ return TRUE
+
+/// Normal time to forcefeed someone something
+#define EAT_TIME_FORCE_FEED (3 SECONDS)
+
+///All the checks for the act of eating itself and
+/datum/component/edible/proc/TryToEat(mob/living/eater, mob/living/feeder)
+
+ set waitfor = FALSE // We might end up sleeping here, so we don't want to hold up anything
+
+ var/atom/owner = parent
+
+ if(feeder.a_intent == INTENT_HARM)
+ return
+
+ . = COMPONENT_CANCEL_ATTACK_CHAIN //Point of no return I suppose
+
+ if(IsFoodGone(owner, feeder))
+ return
+
+ if(!CanConsume(eater, feeder))
+ return
+ var/fullness = eater.nutrition + 10 //The theoretical fullness of the person eating if they were to eat this
+
+ var/time_to_eat = (eater = feeder) ? eat_time : EAT_TIME_FORCE_FEED
+
+ if(eater == feeder)//If you're eating it yourself.
+ if(eat_time && !do_after(feeder, time_to_eat, eater, timed_action_flags = food_flags & FOOD_FINGER_FOOD ? IGNORE_USER_LOC_CHANGE | IGNORE_TARGET_LOC_CHANGE : NONE)) //Gotta pass the minimal eat time
+ return
+ if(IsFoodGone(owner, feeder))
+ return
+ var/eatverb = pick(eatverbs)
+
+ if(junkiness && eater.satiety < -150 && eater.nutrition > NUTRITION_LEVEL_STARVING + 50 && !HAS_TRAIT(eater, TRAIT_VORACIOUS))
+ to_chat(eater, "You don't feel like eating any more junk food at the moment!")
+ return
+ else if(fullness <= 50)
+ eater.visible_message("[eater] hungrily [eatverb]s \the [parent], gobbling it down!", "You hungrily [eatverb] \the [parent], gobbling it down!")
+ else if(fullness > 50 && fullness < 150)
+ eater.visible_message("[eater] hungrily [eatverb]s \the [parent].", "You hungrily [eatverb] \the [parent].")
+ else if(fullness > 150 && fullness < 500)
+ eater.visible_message("[eater] [eatverb]s \the [parent].", "You [eatverb] \the [parent].")
+ else if(fullness > 500 && fullness < 600)
+ eater.visible_message("[eater] unwillingly [eatverb]s a bit of \the [parent].", "You unwillingly [eatverb] a bit of \the [parent].")
+ else if(fullness > (600 * (1 + eater.overeatduration / 2000))) // The more you eat - the more you can eat
+ eater.visible_message("[eater] cannot force any more of \the [parent] to go down [eater.p_their()] throat!", "You cannot force any more of \the [parent] to go down your throat!")
+ return
+
+
+
+
+
+ else //If you're feeding it to someone else.
+ if(isbrain(eater))
+ to_chat(feeder, "[eater] doesn't seem to have a mouth!")
+ return
+ if(fullness <= (600 * (1 + eater.overeatduration / 1000)))
+ eater.visible_message(
+ "[feeder] attempts to feed [eater] [parent].", \
+ "[feeder] attempts to feed you [parent]."
+ )
+ if(eater.is_blind())
+ to_chat(eater, "You feel someone trying to feed you something!")
+ else
+ eater.visible_message(
+ "[feeder] cannot force any more of [parent] down [eater]'s throat!", \
+ "[feeder] cannot force any more of [parent] down your throat!"
+ )
+ if(eater.is_blind())
+ to_chat(eater, "You're too full to eat what's being fed to you!")
+ return
+ if(!do_after(feeder, delay = time_to_eat, target = eater)) //Wait 3 seconds before you can feed
+ return
+ if(IsFoodGone(owner, feeder))
+ return
+ log_combat(feeder, eater, "fed", owner.reagents.log_list())
+ eater.visible_message(
+ "[feeder] forces [eater] to eat [parent]!", \
+ "[feeder] forces you to eat [parent]!"
+ )
+ if(eater.is_blind())
+ to_chat(eater, "You're forced to eat something!")
+
+ TakeBite(eater, feeder)
+
+ //If we're not force-feeding, try take another bite
+ if(eater == feeder && eat_time)
+ INVOKE_ASYNC(src, PROC_REF(TryToEat), eater, feeder)
+
+#undef EAT_TIME_FORCE_FEED
+
+///This function lets the eater take a bite and transfers the reagents to the eater.
+/datum/component/edible/proc/TakeBite(mob/living/eater, mob/living/feeder)
+
+ var/atom/owner = parent
+
+ if(!owner?.reagents)
+ return FALSE
+ if(eater.satiety > -200)
+ eater.satiety -= junkiness
+ playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE)
+ if(!owner.reagents.total_volume)
+ return
+ SEND_SIGNAL(parent, COMSIG_FOOD_EATEN, eater, feeder, bitecount, bite_consumption)
+ var/fraction = min(bite_consumption / owner.reagents.total_volume, 1)
+ owner.reagents.trans_to(eater, bite_consumption, transfered_by = feeder, method = INGEST)
+ bitecount++
+ check_liked(fraction, eater)
+ if(!owner.reagents.total_volume)
+ on_consume(eater, feeder)
+
+ //Invoke our after eat callback if it is valid
+ if(after_eat)
+ after_eat.Invoke(eater, feeder, bitecount)
+
+ return TRUE
+
+///Checks if we can compost something, and handles it
+/datum/component/edible/proc/compost(mob/living/user)
+ SIGNAL_HANDLER
+ if(on_compost && !on_compost.Invoke(user))
+ return COMPONENT_EDIBLE_BLOCK_COMPOST
+
+///Checks whether or not the eater can actually consume the food
+/datum/component/edible/proc/CanConsume(mob/living/eater, mob/living/feeder)
+ if(!iscarbon(eater))
+ return FALSE
+ if(pre_eat && !pre_eat.Invoke(eater, feeder))
+ return FALSE
+ var/mob/living/carbon/C = eater
+ var/covered = ""
+ if(C.is_mouth_covered(head_only = 1))
+ covered = "headgear"
+ else if(C.is_mouth_covered(mask_only = 1))
+ covered = "mask"
+ if(covered)
+ var/who = (isnull(feeder) || eater == feeder) ? "your" : "[eater.p_their()]"
+ to_chat(feeder, "You have to remove [who] [covered] first!")
+ return FALSE
+ return TRUE
+
+///Check foodtypes to see if we should send a moodlet
+/datum/component/edible/proc/check_liked(fraction, mob/eater)
+ if(last_check_time + 50 > world.time)
+ return FALSE
+ if(!ishuman(eater))
+ return FALSE
+ var/mob/living/carbon/human/human_eater = eater
+ if((foodtypes & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
+ if(HAS_TRAIT(human_eater, TRAIT_AGEUSIA))
+ if(foodtypes & human_eater.dna.species.toxic_food)
+ to_chat(human_eater, "You don't feel so good...")
+ human_eater.adjust_disgust(25 + 30 * fraction)
+ else
+ if(foodtypes & human_eater.dna.species.toxic_food)
+ to_chat(human_eater,"What the hell was that thing?!")
+ human_eater.adjust_disgust(25 + 30 * fraction)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food)
+ else if(foodtypes & human_eater.dna.species.disliked_food)
+ to_chat(human_eater,"That didn't taste very good...")
+ human_eater.adjust_disgust(11 + 15 * fraction)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
+ else if(foodtypes & human_eater.dna.species.liked_food)
+ to_chat(human_eater,"I love this taste!")
+ human_eater.adjust_disgust(-5 + -2.5 * fraction)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food)
+ last_check_time = world.time
+
+ /* Should shiptest ever want to move taste to tongues as Beestation & later TGstation did, rather than on species
+ var/obj/item/organ/tongue/tongue = human_eater.getorganslot(ORGAN_SLOT_TONGUE)
+ if((foodtypes & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
+ if(HAS_TRAIT(human_eater, TRAIT_AGEUSIA))
+ if(foodtypes & tongue.toxic_food)
+ to_chat(human_eater, "You don't feel so good...")
+ human_eater.adjust_disgust(25 + 30 * fraction)
+ else
+ if(foodtypes & tongue.toxic_food)
+ to_chat(human_eater,"What the hell was that thing?!")
+ human_eater.adjust_disgust(25 + 30 * fraction)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food)
+ else if(foodtypes & tongue.disliked_food)
+ to_chat(human_eater,"That didn't taste very good...")
+ human_eater.adjust_disgust(11 + 15 * fraction)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
+ else if(foodtypes & tongue.liked_food)
+ to_chat(human_eater,"I love this taste!")
+ human_eater.adjust_disgust(-5 + -2.5 * fraction)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food)
+ last_check_time = world.time
+ */
+
+///Delete the item when it is fully eaten
+/datum/component/edible/proc/on_consume(mob/living/eater, mob/living/feeder)
+ SEND_SIGNAL(parent, COMSIG_FOOD_CONSUMED, eater, feeder)
+
+ on_consume?.Invoke(eater, feeder)
+
+ if(isturf(parent))
+ var/turf/T = parent
+ T.ScrapeAway(1, CHANGETURF_INHERIT_AIR)
+ else
+ qdel(parent)
+
+///Ability to feed food to puppers
+/datum/component/edible/proc/use_by_animal(datum/source, mob/user)
+ SIGNAL_HANDLER
+ var/atom/owner = parent
+
+ if(!isdog(user))
+ return
+ var/mob/living/L = user
+ if(bitecount == 0 || prob(50))
+ L.manual_emote("nibbles away at \the [parent].")
+ bitecount++
+ . = COMPONENT_CANCEL_ATTACK_CHAIN
+ L.taste(owner.reagents) // why should carbons get all the fun?
+ if(bitecount >= 5)
+ var/satisfaction_text = pick("burps from enjoyment.", "yaps for more!", "woofs twice.", "looks at the area where \the [parent] was.")
+ L.manual_emote(satisfaction_text)
+ qdel(parent)
diff --git a/code/datums/components/food/food_storage.dm b/code/datums/components/food/food_storage.dm
new file mode 100644
index 00000000000..6bc3641711b
--- /dev/null
+++ b/code/datums/components/food/food_storage.dm
@@ -0,0 +1,204 @@
+/// --Food storage component--
+/// This component lets you slide one item into large foods, such as bread, cheese wheels, or cakes.
+/// Consuming food storages with an item inside can cause unique interactions, such as eating glass shards.
+
+/datum/component/food_storage
+ /// Reference to what we have in our food.
+ var/obj/item/stored_item
+ /// The amount of volume the food has on creation - Used for probabilities
+ var/initial_volume = 10
+ /// Minimum size items that can be inserted
+ var/minimum_weight_class = WEIGHT_CLASS_SMALL
+ /// What are the odds we bite into the stored item?
+ var/bad_chance_of_discovery = 0
+ /// What are the odds we see the stored item before we bite it?
+ var/good_chance_of_discovery = 100
+ /// The stored item was found out somehow.
+ var/discovered = FALSE
+
+/datum/component/food_storage/Initialize(_minimum_weight_class = WEIGHT_CLASS_SMALL, _bad_chance = 0, _good_chance = 100)
+
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(try_inserting_item))
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(try_removing_item))
+ RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(consume_food_storage))
+
+ var/atom/food = parent
+ initial_volume = food.reagents.total_volume
+
+ minimum_weight_class = _minimum_weight_class
+ bad_chance_of_discovery = _bad_chance
+ good_chance_of_discovery = _good_chance
+
+/datum/component/food_storage/Destroy(force)
+ if(stored_item)
+ stored_item.forceMove(stored_item.drop_location())
+ stored_item.dropped()
+ stored_item = null
+ . = ..()
+
+/** Begins the process of inserted an item.
+ *
+ * Clicking on the food storage with an item will begin a do_after, which if successful inserts the item.
+ *
+ * Arguments
+ * inserted_item - the item being placed into the food
+ * user - the person inserting the item
+ */
+/datum/component/food_storage/proc/try_inserting_item(datum/source, obj/item/inserted_item, mob/user, params)
+ SIGNAL_HANDLER
+
+ // No matryoshka-ing food storage
+ if(istype(inserted_item, /obj/item/storage) || IS_EDIBLE(inserted_item))
+ return
+
+ //Harm intent will bypass inserting for injecting food with syringes and such
+ if(user.a_intent == INTENT_HARM)
+ return
+
+ if(inserted_item.w_class > minimum_weight_class)
+ to_chat(user, "\The [inserted_item.name] won't fit in \the [parent].")
+ return
+
+ if(!QDELETED(stored_item))
+ to_chat(user, "There's something in \the [parent].")
+ return
+
+ if(HAS_TRAIT(inserted_item, TRAIT_NODROP))
+ to_chat(user, "\the [inserted_item] is stuck to your hand, you can't put into \the [parent]!")
+ return
+
+ user.visible_message("[user.name] begins inserting [inserted_item.name] into \the [parent].", \
+ "You start to insert the [inserted_item.name] into \the [parent].")
+
+ INVOKE_ASYNC(src, PROC_REF(insert_item), inserted_item, user)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/** Begins the process of attempting to remove the stored item.
+ *
+ * Clicking on food storage on grab intent will begin a do_after, which if successful removes the stored_item.
+ *
+ * Arguments
+ * user - the person removing the item.
+ */
+/datum/component/food_storage/proc/try_removing_item(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ var/atom/food = parent
+
+ if(user.a_intent != INTENT_GRAB)
+ return
+
+ if(QDELETED(stored_item))
+ return
+
+ if(!food.can_interact(user))
+ return
+
+ user.visible_message("[user.name] begins tearing at \the [parent].", \
+ "You start to rip into \the [parent].")
+
+ INVOKE_ASYNC(src, PROC_REF(begin_remove_item), user)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/** Inserts the item into the food, after a do_after.
+ *
+ * Arguments
+ * inserted_item - The item being inserted.
+ * user - the person inserting the item.
+ */
+/datum/component/food_storage/proc/insert_item(obj/item/inserted_item, mob/user)
+ if(do_after(user, 1.5 SECONDS, target = parent))
+ var/atom/food = parent
+ to_chat(user, "You slip [inserted_item.name] inside \the [parent].")
+ inserted_item.forceMove(food)
+ user.log_message("[key_name(user)] inserted [inserted_item] into [parent] at [AREACOORD(user)]", LOG_ATTACK)
+ food.add_fingerprint(user)
+ inserted_item.add_fingerprint(user)
+
+ stored_item = inserted_item
+
+/** Removes the item from the food, after a do_after.
+ *
+ * Arguments
+ * user - person removing the item.
+ */
+/datum/component/food_storage/proc/begin_remove_item(mob/user)
+ if(do_after(user, 10 SECONDS, target = parent))
+ remove_item(user)
+
+/**
+ * Removes the stored item, putting it in user's hands or on the ground, then updates the reference.
+ */
+/datum/component/food_storage/proc/remove_item(mob/user)
+ if(user.put_in_hands(stored_item))
+ user.visible_message("[user.name] slowly pulls [stored_item.name] out of \the [parent].", \
+ "You slowly pull [stored_item.name] out of \the [parent].")
+ else
+ stored_item.dropped()
+ stored_item.visible_message("[stored_item.name] falls out of \the [parent].")
+
+ update_stored_item()
+
+/** Checks for stored items when the food is eaten.
+ *
+ * If the food is eaten while an item is stored in it, calculates the odds that the item will be found.
+ * Then, if the item is found before being bitten, the item is removed.
+ * If the item is found by biting into it, calls on_accidental_consumption on the stored item.
+ * Afterwards, removes the item from the food if it was discovered.
+ *
+ * Arguments
+ * target - person doing the eating (can be the same as user)
+ * user - person causing the eating to happen
+ * bitecount - how many times the current food has been bitten
+ * bitesize - how large bties are for this food
+ */
+/datum/component/food_storage/proc/consume_food_storage(datum/source, mob/living/target, mob/living/user, bitecount, bitesize)
+ SIGNAL_HANDLER
+
+ if(QDELETED(stored_item)) //if the stored item was deleted/null...
+ if(!update_stored_item()) //check if there's a replacement item
+ return
+
+ /// Chance of biting the held item = amount of bites / (intitial reagents / reagents per bite) * 100
+ bad_chance_of_discovery = (bitecount / (initial_volume / bitesize))*100
+ /// Chance of finding the held item = bad chance - 50
+ good_chance_of_discovery = bad_chance_of_discovery - 50
+
+ if(prob(good_chance_of_discovery)) //finding the item, without biting it
+ discovered = TRUE
+ to_chat(target, "It feels like there's something in \the [parent]...!")
+
+ else if(prob(bad_chance_of_discovery)) //finding the item, BY biting it
+ user.log_message("[key_name(user)] just fed [key_name(target)] a/an [stored_item] which was hidden in [parent] at [AREACOORD(target)]", LOG_ATTACK)
+ discovered = stored_item.on_accidental_consumption(target, user, parent)
+ update_stored_item() //make sure if the item was changed, the reference changes as well
+
+ if(!QDELETED(stored_item) && discovered)
+ INVOKE_ASYNC(src, PROC_REF(remove_item), user)
+
+/** Updates the reference of the stored item.
+ *
+ * Checks the food's contents for if an alternate item was placed into the food.
+ * If there is an alternate item, updates the reference to the new item.
+ * If there isn't, updates the reference to null.
+ *
+ * Returns FALSE if the ref is nulled, or TRUE is another item replaced it.
+ */
+/datum/component/food_storage/proc/update_stored_item()
+ var/atom/food = parent
+ if(!food?.contents.len) //if there's no items in the food or food is deleted somehow
+ stored_item = null
+ return FALSE
+
+ for(var/obj/item/i in food.contents) //search the food's contents for a replacement item
+ if(IS_EDIBLE(i))
+ continue
+ if(QDELETED(i))
+ continue
+
+ stored_item = i //we found something to replace it
+ return TRUE
+
+ //if there's nothing else in the food, or we found nothing valid
+ stored_item = null
+ return FALSE
diff --git a/code/datums/components/forensics.dm b/code/datums/components/forensics.dm
index 6f2a34e50ea..4ef12e5bf93 100644
--- a/code/datums/components/forensics.dm
+++ b/code/datums/components/forensics.dm
@@ -190,6 +190,9 @@
return
if(!length(blood_DNA))
return
- if(isitem(parent))
- var/obj/item/I = parent
- I.AddElement(/datum/element/decal/blood, I.icon, I.icon_state, _color = get_blood_dna_color(blood_DNA))
+ var/obj/item/parent_item = parent
+ var/icon_state_adj = parent_item.icon_state
+ if(isbodypart(parent))//betterlimbs moment
+ var/obj/item/bodypart/parent_part = parent
+ icon_state_adj = parent_part.stored_icon_state
+ parent_item.AddElement(/datum/element/decal/blood, parent_item.icon, icon_state_adj, _color = get_blood_dna_color(blood_DNA))
diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm
index 85701e9c762..ab7b1e64141 100644
--- a/code/datums/components/gunpoint.dm
+++ b/code/datums/components/gunpoint.dm
@@ -46,7 +46,7 @@
addtimer(CALLBACK(src, PROC_REF(update_stage), 2), GUNPOINT_DELAY_STAGE_2)
-/datum/component/gunpoint/Destroy(force, silent)
+/datum/component/gunpoint/Destroy(force)
var/mob/living/shooter = parent
shooter.remove_status_effect(STATUS_EFFECT_HOLDUP)
target.remove_status_effect(STATUS_EFFECT_HELDUP)
diff --git a/code/datums/components/jetpack.dm b/code/datums/components/jetpack.dm
new file mode 100644
index 00000000000..3451a75538a
--- /dev/null
+++ b/code/datums/components/jetpack.dm
@@ -0,0 +1,149 @@
+// Welcome to the jetpack component
+// Apply this to something when you want it to be "like a jetpack"
+// So propulsion through space on move, that sort of thing
+/datum/component/jetpack
+ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+ var/datum/callback/check_on_move
+ var/datum/callback/get_mover
+ /// If we should stabilize ourselves when not drifting
+ var/stabilize = FALSE
+ /// The signal we listen for as an activation
+ var/activation_signal
+ /// The signal we listen for as a de-activation
+ var/deactivation_signal
+ /// The return flag our parent expects for a failed activation
+ var/return_flag
+ var/datum/effect_system/trail_follow/trail
+ /// The typepath to instansiate our trail as, when we need it
+ var/effect_type
+
+/**
+ * Arguments:
+ * * stabilize - If we should drift when we finish moving, or sit stable in space]
+ * * activation_signal - Signal we activate on
+ * * deactivation_signal - Signal we deactivate on
+ * * return_flag - Flag to return if activation fails
+ * * get_mover - Callback we use to get the "moving" thing, for trail purposes, alongside signal registration
+ * * check_on_move - Callback we call each time we attempt a move, we expect it to retun true if the move is ok, false otherwise. It expects an arg, TRUE if fuel should be consumed, FALSE othewise
+ * * effect_type - Type of trail_follow to spawn
+ */
+/datum/component/jetpack/Initialize(stabilize, activation_signal, deactivation_signal, return_flag, datum/callback/get_mover, datum/callback/check_on_move, datum/effect_system/trail_follow/effect_type)
+ . = ..()
+ if(!isatom(parent))
+ return COMPONENT_INCOMPATIBLE
+ if(!activation_signal) // Can't activate? go away
+ return COMPONENT_INCOMPATIBLE
+
+ RegisterSignal(parent, activation_signal, PROC_REF(activate))
+ if(deactivation_signal)
+ RegisterSignal(parent, deactivation_signal, PROC_REF(deactivate))
+
+ src.check_on_move = check_on_move
+ src.get_mover = get_mover
+ src.stabilize = stabilize
+ src.return_flag = return_flag
+ src.activation_signal = activation_signal
+ src.deactivation_signal = deactivation_signal
+ src.effect_type = effect_type
+
+/datum/component/jetpack/InheritComponent(datum/component/component, original, stabilize, activation_signal, deactivation_signal, return_flag, datum/callback/get_mover, datum/callback/check_on_move, datum/effect_system/trail_follow/effect_type)
+ UnregisterSignal(parent, src.activation_signal)
+ if(src.deactivation_signal)
+ UnregisterSignal(parent, src.deactivation_signal)
+ RegisterSignal(parent, activation_signal, PROC_REF(activate))
+ if(deactivation_signal)
+ RegisterSignal(parent, deactivation_signal, PROC_REF(deactivate))
+
+ src.check_on_move = check_on_move
+ src.get_mover = get_mover
+ src.stabilize = stabilize
+ src.activation_signal = activation_signal
+ src.deactivation_signal = deactivation_signal
+ src.effect_type = effect_type
+
+ if(trail && effect_type != trail.type)
+ QDEL_NULL(trail)
+ setup_trail()
+
+/datum/component/jetpack/Destroy()
+ QDEL_NULL(trail)
+ QDEL_NULL(check_on_move)
+ return ..()
+
+/datum/component/jetpack/proc/setup_trail()
+ var/mob/moving = get_mover.Invoke()
+ if(!moving || trail)
+ return
+ trail = new effect_type
+ trail.auto_process = FALSE
+ trail.set_up(moving)
+
+/datum/component/jetpack/proc/activate(datum/source)
+ SIGNAL_HANDLER
+ var/mob/moving = get_mover.Invoke()
+ if(!thrust(moving))
+ return return_flag
+ trail.start()
+ RegisterSignal(moving, COMSIG_MOVABLE_MOVED, PROC_REF(move_react))
+ RegisterSignal(moving, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(pre_move_react))
+ RegisterSignal(moving, COMSIG_MOVABLE_SPACEMOVE, PROC_REF(spacemove_react))
+ RegisterSignal(moving, COMSIG_MOVABLE_DRIFT_VISUAL_ATTEMPT, PROC_REF(block_starting_visuals))
+ RegisterSignal(moving, COMSIG_MOVABLE_DRIFT_BLOCK_INPUT, PROC_REF(ignore_ending_block))
+
+/datum/component/jetpack/proc/deactivate(datum/source)
+ SIGNAL_HANDLER
+ QDEL_NULL(trail)
+ var/mob/moving = get_mover.Invoke()
+ if(moving)
+ UnregisterSignal(moving, COMSIG_MOVABLE_MOVED)
+ UnregisterSignal(moving, COMSIG_MOVABLE_PRE_MOVE)
+ UnregisterSignal(moving, COMSIG_MOVABLE_SPACEMOVE)
+ UnregisterSignal(moving, COMSIG_MOVABLE_DRIFT_VISUAL_ATTEMPT)
+ UnregisterSignal(moving, COMSIG_MOVABLE_DRIFT_BLOCK_INPUT)
+
+/datum/component/jetpack/proc/move_react(mob/user)
+ SIGNAL_HANDLER
+ if(!user || !user.client)//Don't allow jet self using
+ return
+ if(!isturf(user.loc))//You can't use jet in nowhere or from mecha/closet
+ return
+ if(!(user.movement_type & FLOATING) || user.buckled)//You don't want use jet in gravity or while buckled.
+ return
+ if(user.pulledby)//You don't must use jet if someone pull you
+ return
+ if(user.throwing)//You don't must use jet if you thrown
+ return
+ if(length(user.client.keys_held & user.client.movement_keys))//You use jet when press keys. yes.
+ thrust()
+
+/datum/component/jetpack/proc/pre_move_react(mob/user)
+ SIGNAL_HANDLER
+ trail.oldposition = get_turf(user)
+
+/datum/component/jetpack/proc/spacemove_react(mob/user, movement_dir, continuous_move)
+ SIGNAL_HANDLER
+ if(!continuous_move && movement_dir)
+ return COMSIG_MOVABLE_STOP_SPACEMOVE
+ // Check if we have the fuel to stop this. Do NOT cosume any fuel, just check
+ // This is done because things other then us can use our fuel
+ if(stabilize && check_on_move.Invoke(FALSE))
+ return COMSIG_MOVABLE_STOP_SPACEMOVE
+
+/// Returns true if the thrust went well, false otherwise
+/datum/component/jetpack/proc/thrust()
+ if(!check_on_move.Invoke(TRUE))
+ return FALSE
+ if(!trail)
+ setup_trail()
+ trail.generate_effect()
+ return TRUE
+
+/// Basically, tell the drift component not to do its starting visuals, because they look dumb for us
+/datum/component/jetpack/proc/block_starting_visuals(datum/source)
+ SIGNAL_HANDLER
+ return DRIFT_VISUAL_FAILED
+
+/// If we're on, don't let the drift component block movements at the end since we can speed
+/datum/component/jetpack/proc/ignore_ending_block(datum/source)
+ SIGNAL_HANDLER
+ return DRIFT_ALLOW_INPUT
diff --git a/code/datums/components/manual_blinking.dm b/code/datums/components/manual_blinking.dm
index d97e88ca8fe..e33d5f558d8 100644
--- a/code/datums/components/manual_blinking.dm
+++ b/code/datums/components/manual_blinking.dm
@@ -22,7 +22,7 @@
last_blink = world.time
to_chat(C, "You suddenly realize you're blinking manually.")
-/datum/component/manual_blinking/Destroy(force, silent)
+/datum/component/manual_blinking/Destroy(force)
E = null
STOP_PROCESSING(SSdcs, src)
to_chat(parent, "You revert back to automatic blinking.")
diff --git a/code/datums/components/manual_breathing.dm b/code/datums/components/manual_breathing.dm
index bcae15536ca..882887f0ccc 100644
--- a/code/datums/components/manual_breathing.dm
+++ b/code/datums/components/manual_breathing.dm
@@ -22,7 +22,7 @@
last_breath = world.time
to_chat(C, "You suddenly realize you're breathing manually.")
-/datum/component/manual_breathing/Destroy(force, silent)
+/datum/component/manual_breathing/Destroy(force)
L = null
STOP_PROCESSING(SSdcs, src)
to_chat(parent, "You revert back to automatic breathing.")
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index a1cc816fc5f..58fe88b13bb 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -80,6 +80,9 @@
if(!has_space(material_amount))
to_chat(user, "[parent] is full. Please remove materials from [parent] in order to insert more.")
return
+ if(I.contents.len && !istype(I, /obj/item/stack) && !istype(I, /obj/item/ammo_box/magazine/ammo_stack))
+ to_chat(user, span_warning("[I] has items inside of it. Please remove them before inserting it."))
+ return
user_insert(I, user)
/// Proc used for when player inserts materials
diff --git a/code/datums/components/melee/charged.dm b/code/datums/components/melee/charged.dm
new file mode 100644
index 00000000000..2319977a4a0
--- /dev/null
+++ b/code/datums/components/melee/charged.dm
@@ -0,0 +1,127 @@
+/*
+ * Charged weapon component. For weapons that swap between states but require a cell for function.
+ * For example: Stun batons.
+ *
+ * Used to easily make an item that can be attack_self'd to gain force or change mode.
+ *
+ * Only values passed on initialize will update when the item is activated (except the icon_state).
+ * The icon_state of the item will swap between "[icon_state]" and "[icon_state]_on".
+ */
+/datum/component/transforming/charged
+ var/obj/item/stock_parts/cell/cell
+ var/allowed_cells
+ var/preload_cell_type
+ var/cell_hit_cost
+ var/can_remove_cell
+ var/no_cell_icon
+
+/datum/component/transforming/charged/Initialize(
+ start_transformed = FALSE,
+ transform_cooldown_time = 0 SECONDS,
+ force_on = 0,
+ throwforce_on = 0,
+ throw_speed_on = 2,
+ sharpness_on = NONE,
+ hitsound_on = 'sound/weapons/blade1.ogg',
+ w_class_on = WEIGHT_CLASS_BULKY,
+ list/attack_verb_on,
+ inhand_icon_change = TRUE,
+ _allowed_cells = list(),
+ _preload_cell_type = /obj/item/stock_parts/cell,
+ _cell_hit_cost = 1000,
+ _can_remove_cell = FALSE,
+ _no_cell_icon = FALSE
+)
+ . = ..()
+
+ allowed_cells = _allowed_cells
+ preload_cell_type = _preload_cell_type
+ cell_hit_cost = _cell_hit_cost
+ can_remove_cell = _can_remove_cell
+ no_cell_icon = _no_cell_icon
+
+ if(preload_cell_type in allowed_cells)
+ cell = new preload_cell_type(parent)
+
+/datum/component/transforming/charged/RegisterWithParent()
+ . = ..()
+ RegisterSignal(parent, COMSIG_ATOM_SCREWDRIVER_ACT, PROC_REF(on_screwdriver_act))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(parent, COMSIG_ITEM_USE_CELL, PROC_REF(deduct_charge))
+
+/datum/component/transforming/charged/Destroy(force, silent)
+ if(cell)
+ QDEL_NULL(cell)
+ . = ..()
+
+/datum/component/transforming/charged/on_attack_self(obj/item/source, mob/user)
+ if(cell && cell.charge > cell_hit_cost)
+ return ..()
+ else
+ set_inactive(source)
+ if(!cell)
+ to_chat(user, span_warning("[source] does not have a power source!"))
+ else
+ to_chat(user, span_warning("[source] is out of charge."))
+
+/datum/component/transforming/charged/proc/on_screwdriver_act(obj/item/source, mob/user, obj/item/screwdriver)
+ if(cell && can_remove_cell)
+ cell.update_appearance()
+ cell.forceMove(get_turf(parent))
+ cell = null
+ to_chat(user, span_notice("You remove the cell from [parent]."))
+ set_inactive(source)
+ source.update_appearance()
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/datum/component/transforming/charged/proc/on_attackby(obj/item/source, obj/item/attacking_item, mob/user, params)
+ SIGNAL_HANDLER
+
+ if(attacking_item.type in allowed_cells)
+ var/obj/item/stock_parts/cell/attacking_cell = attacking_item
+ if(cell)
+ to_chat(user, span_notice("[parent] already has a cell!"))
+ else
+ if(attacking_cell.maxcharge < cell_hit_cost)
+ to_chat(user, span_notice("[parent] requires a higher capacity cell."))
+ return
+ if(!user.transferItemToLoc(attacking_item, parent))
+ return
+ cell = attacking_item
+ to_chat(user, span_notice("You install a cell in [parent]."))
+ source.update_appearance()
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/datum/component/transforming/charged/proc/on_examine(obj/item/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ if(cell)
+ examine_list += span_notice("\The [source] is [round(cell.percent())]% charged.")
+ else
+ examine_list += span_warning("\The [source] does not have a power source installed.")
+
+/datum/component/transforming/charged/proc/deduct_charge(obj/item/source)
+ SIGNAL_HANDLER
+ if(cell)
+ . = cell.use(cell_hit_cost)
+ if(active && cell.charge < cell_hit_cost)
+ playsound(src, SFX_SPARKS, 75, TRUE, -1)
+ set_inactive(source)
+
+/datum/component/transforming/charged/proc/set_active_state(active_state = -1)
+ switch(active_state)
+ //We didnt pass a specific state to set it to so just toggle it
+ if(-1)
+ toggle_active(parent)
+ if(FALSE)
+ set_inactive(parent)
+ if(TRUE)
+ set_active(parent)
+
+/datum/component/transforming/charged/set_inactive(obj/item/source)
+ . = ..()
+ if(!cell)
+ source.icon_state = "[initial(source.icon_state)]_nocell"
+ source.item_state = "[initial(source.icon_state)]_nocell"
+ source.update_appearance()
diff --git a/code/datums/components/melee/transforming.dm b/code/datums/components/melee/transforming.dm
new file mode 100644
index 00000000000..744d75de34b
--- /dev/null
+++ b/code/datums/components/melee/transforming.dm
@@ -0,0 +1,236 @@
+/*
+ * Transforming weapon component. For weapons that swap between states.
+ * For example: Energy swords, cleaving saws, switch blades.
+ *
+ * Used to easily make an item that can be attack_self'd to gain force or change mode.
+ *
+ * Only values passed on initialize will update when the item is activated (except the icon_state).
+ * The icon_state of the item will swap between "[icon_state]" and "[icon_state]_on".
+ */
+/datum/component/transforming
+ /// Whether the weapon is transformed
+ var/active = FALSE
+ /// Cooldown on transforming this item back and forth
+ var/transform_cooldown_time
+ /// Force of the weapon when active
+ var/force_on
+ /// Throwforce of the weapon when active
+ var/throwforce_on
+ /// Throw speed of the weapon when active
+ var/throw_speed_on
+ /// Weight class of the weapon when active
+ var/w_class_on
+ /// The sharpness of the weapon when active
+ var/sharpness_on
+ /// Hitsound played when active
+ var/hitsound_on
+ /// List of the original attack verbs the item has.
+ var/list/attack_verb_off
+ /// List of attack verbs used when the weapon is enabled
+ var/list/attack_verb_on
+ /// If we get sharpened with a whetstone, save the bonus here for later use if we un/redeploy
+ var/sharpened_bonus = 0
+ /// Dictate whether we change inhands or not
+ var/inhand_icon_change = TRUE
+ /// Cooldown in between transforms
+ COOLDOWN_DECLARE(transform_cooldown)
+
+/datum/component/transforming/Initialize(
+ start_transformed = FALSE,
+ transform_cooldown_time = 0 SECONDS,
+ force_on = 0,
+ throwforce_on = 0,
+ throw_speed_on = 2,
+ sharpness_on = NONE,
+ hitsound_on = 'sound/weapons/blade1.ogg',
+ w_class_on = WEIGHT_CLASS_BULKY,
+ list/attack_verb_on,
+ inhand_icon_change = TRUE,
+)
+
+ if(!isitem(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ var/obj/item/item_parent = parent
+
+ src.transform_cooldown_time = transform_cooldown_time
+ src.force_on = force_on
+ src.throwforce_on = throwforce_on
+ src.throw_speed_on = throw_speed_on
+ src.sharpness_on = sharpness_on
+ src.hitsound_on = hitsound_on
+ src.w_class_on = w_class_on
+ src.inhand_icon_change = inhand_icon_change
+
+ if(attack_verb_on)
+ src.attack_verb_on = attack_verb_on
+ attack_verb_off = item_parent.attack_verb
+
+ if(start_transformed)
+ toggle_active(parent)
+
+/datum/component/transforming/RegisterWithParent()
+ var/obj/item/item_parent = parent
+
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self))
+ RegisterSignal(parent, COMSIG_ITEM_FORCE_TRANSFORM, PROC_REF(force_transform))
+ if(item_parent.sharpness || sharpness_on)
+ RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, PROC_REF(on_sharpen))
+
+
+/datum/component/transforming/UnregisterFromParent()
+ UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_ITEM_SHARPEN_ACT))
+
+/*
+ * Called on [COMSIG_ITEM_ATTACK_SELF].
+ *
+ * Check if we can transform our weapon, and if so, call [do_transform].
+ * Sends signal [COMSIG_TRANSFORMING_PRE_TRANSFORM], and stops the transform action if it returns [COMPONENT_BLOCK_TRANSFORM].
+ *
+ * source - source of the signal, the item being transformed / parent
+ * user - the mob transforming the weapon
+ */
+/datum/component/transforming/proc/on_attack_self(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ if(!COOLDOWN_FINISHED(src, transform_cooldown))
+ to_chat(user, span_warning("Wait a bit before trying to use [source] again!"))
+ return
+
+ if(SEND_SIGNAL(source, COMSIG_TRANSFORMING_PRE_TRANSFORM, user, active) & COMPONENT_BLOCK_TRANSFORM)
+ return
+
+ if(do_transform(source, user))
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/*
+ * Transform the weapon into its alternate form, calling [toggle_active].
+ *
+ * Sends signal [COMSIG_TRANSFORMING_ON_TRANSFORM], and calls [default_transform_message] if it does not return [COMPONENT_NO_DEFAULT_MESSAGE].
+ * Also starts the [transform_cooldown] if we have a set [transform_cooldown_time].
+ *
+ * source - the item being transformed / parent
+ * user - the mob transforming the item
+ *
+ * returns TRUE.
+ */
+/datum/component/transforming/proc/do_transform(obj/item/source, mob/user)
+ toggle_active(source)
+ if(!(SEND_SIGNAL(source, COMSIG_TRANSFORMING_ON_TRANSFORM, user, active) & COMPONENT_NO_DEFAULT_MESSAGE))
+ default_transform_message(source, user)
+
+ if(isnum(transform_cooldown_time))
+ COOLDOWN_START(src, transform_cooldown, transform_cooldown_time)
+ if(user)
+ source.add_fingerprint(user)
+ return TRUE
+
+/*
+ * The default feedback message and sound effect for an item transforming.
+ *
+ * source - the item being transformed / parent
+ * user - the mob transforming the item
+ */
+/datum/component/transforming/proc/default_transform_message(obj/item/source, mob/user)
+ if(user)
+ source.balloon_alert(user, "[active ? "enabled" : "disabled"] [source]")
+ playsound(source, 'sound/weapons/batonextend.ogg', 50, TRUE)
+
+/*
+ * Toggle active between true and false, and call
+ * either set_active or set_inactive depending on whichever state is toggled.
+ *
+ * source - the item being transformed / parent
+ */
+/datum/component/transforming/proc/toggle_active(obj/item/source)
+ active = !active
+ if(active)
+ set_active(source)
+ else
+ set_inactive(source)
+
+/*
+ * Set our transformed item into its active state.
+ * Updates all the values that were passed from init and the icon_state.
+ *
+ * source - the item being transformed / parent
+ */
+/datum/component/transforming/proc/set_active(obj/item/source)
+ ADD_TRAIT(source, TRAIT_TRANSFORM_ACTIVE, REF(src))
+ if(sharpness_on)
+ source.sharpness = sharpness_on
+ if(force_on)
+ source.force = force_on + (source.sharpness ? sharpened_bonus : 0)
+ if(throwforce_on)
+ source.throwforce = throwforce_on + (source.sharpness ? sharpened_bonus : 0)
+ if(throw_speed_on)
+ source.throw_speed = throw_speed_on
+
+ if(LAZYLEN(attack_verb_on))
+ source.attack_verb = attack_verb_on
+
+ source.hitsound = hitsound_on
+ source.update_weight_class(w_class_on)
+ source.icon_state = "[source.icon_state]_on"
+ if(inhand_icon_change && source.item_state)
+ source.item_state = "[source.item_state]_on"
+
+ source.update_appearance()
+ if(ismob(source.loc))
+ var/mob/loc_mob = source.loc
+ loc_mob.update_inv_hands()
+
+/*
+ * Set our transformed item into its inactive state.
+ * Updates all the values back to the item's initial values.
+ *
+ * source - the item being un-transformed / parent
+ */
+/datum/component/transforming/proc/set_inactive(obj/item/source)
+ REMOVE_TRAIT(source, TRAIT_TRANSFORM_ACTIVE, REF(src))
+ if(sharpness_on)
+ source.sharpness = initial(source.sharpness)
+ if(force_on)
+ source.force = initial(source.force) + (source.sharpness ? sharpened_bonus : 0)
+ if(throwforce_on)
+ source.throwforce = initial(source.throwforce) + (source.sharpness ? sharpened_bonus : 0)
+ if(throw_speed_on)
+ source.throw_speed = initial(source.throw_speed)
+
+ if(LAZYLEN(attack_verb_off))
+ source.attack_verb = attack_verb_off
+
+ source.hitsound = initial(source.hitsound)
+ source.update_weight_class(initial(source.w_class))
+ source.icon_state = initial(source.icon_state)
+ source.item_state = initial(source.item_state)
+
+ source.update_appearance()
+ if(ismob(source.loc))
+ var/mob/loc_mob = source.loc
+ loc_mob.update_inv_hands()
+
+/*
+ * Called on [COMSIG_ITEM_SHARPEN_ACT].
+ * We need to track our sharpened bonus here, so we correctly apply and unapply it
+ * if our item's sharpness state changes from transforming.
+ *
+ * source - the item being sharpened / parent
+ * increment - the amount of force added
+ * max - the maximum force that the item can be adjusted to.
+ *
+ * Does not return naturally [COMPONENT_BLOCK_SHARPEN_APPLIED] as this is only to track our sharpened bonus between transformation.
+ */
+/datum/component/transforming/proc/on_sharpen(obj/item/source, increment, max)
+ SIGNAL_HANDLER
+
+ if(sharpened_bonus)
+ return COMPONENT_BLOCK_SHARPEN_ALREADY
+ if(force_on + increment > max)
+ return COMPONENT_BLOCK_SHARPEN_MAXED
+ sharpened_bonus = increment
+
+/datum/component/transforming/proc/force_transform(obj/item/source)
+ if(isnum(transform_cooldown_time))
+ COOLDOWN_START(src, transform_cooldown, transform_cooldown_time)
+ set_inactive(source)
diff --git a/code/datums/components/twohanded.dm b/code/datums/components/melee/twohanded.dm
similarity index 96%
rename from code/datums/components/twohanded.dm
rename to code/datums/components/melee/twohanded.dm
index 51c9268d13a..c459b49a628 100644
--- a/code/datums/components/twohanded.dm
+++ b/code/datums/components/melee/twohanded.dm
@@ -4,12 +4,13 @@
* When applied to an item it will make it two handed
*
*/
+
/datum/component/two_handed
dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS // Only one of the component can exist on an item
var/wielded = FALSE /// Are we holding the two handed item properly
var/force_multiplier = 0 /// The multiplier applied to force when wielded, does not work with force_wielded, and force_unwielded
- var/force_wielded = 0 /// The force of the item when weilded
- var/force_unwielded = 0 /// The force of the item when unweilded
+ var/force_wielded = null /// The force of the item when wielded
+ var/force_unwielded = null /// The force of the item when unwielded
var/wieldsound = FALSE /// Play sound when wielded
var/unwieldsound = FALSE /// Play sound when unwielded
var/attacksound = FALSE /// Play sound on attack when wielded
@@ -32,7 +33,7 @@
* * icon_wielded (optional) The icon to be used when wielded
*/
/datum/component/two_handed/Initialize(require_twohands=FALSE, wieldsound=FALSE, unwieldsound=FALSE, attacksound=FALSE, \
- force_multiplier=0, force_wielded=0, force_unwielded=0, icon_wielded=FALSE)
+ force_multiplier=0, force_wielded=null, force_unwielded=null, icon_wielded=FALSE)
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
@@ -145,13 +146,14 @@
if(SEND_SIGNAL(parent, COMSIG_TWOHANDED_WIELD, user) & COMPONENT_TWOHANDED_BLOCK_WIELD)
return // blocked wield from item
wielded = TRUE
+ ADD_TRAIT(parent, TRAIT_WIELDED, REF(src))
RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, PROC_REF(on_swap_hands))
// update item stats and name
var/obj/item/parent_item = parent
if(force_multiplier)
parent_item.force *= force_multiplier
- else if(force_wielded)
+ else if(!isnull(force_wielded))
parent_item.force = force_wielded
if(sharpened_increase)
parent_item.force += sharpened_increase
@@ -188,6 +190,7 @@
// wield update status
wielded = FALSE
+ REMOVE_TRAIT(parent, TRAIT_WIELDED, REF(src))
UnregisterSignal(user, COMSIG_MOB_SWAP_HANDS)
SEND_SIGNAL(parent, COMSIG_TWOHANDED_UNWIELD, user)
@@ -197,7 +200,7 @@
parent_item.force -= sharpened_increase
if(force_multiplier)
parent_item.force /= force_multiplier
- else if(force_unwielded)
+ else if(!isnull(force_unwielded))
parent_item.force = force_unwielded
// update the items name to remove the wielded status
@@ -303,7 +306,7 @@
sharpened_increase = min(amount, (max_amount - wielded_val))
return COMPONENT_BLOCK_SHARPEN_APPLIED
-/**
+/*
* The offhand dummy item for two handed items
*
*/
diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index 3434c741dba..a37fd00c3b5 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -89,7 +89,7 @@
if(mood_events.len)
for(var/i in mood_events)
var/datum/mood_event/event = mood_events[i]
- msg += event.description
+ msg += "[event.description]\n" // now we dont have to put \n in every moodlet description
else
msg += "I don't have much of a reaction to anything right now.\n"
to_chat(user, examine_block(msg))
diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm
index 19b1e209499..d18bdc7d8cb 100644
--- a/code/datums/components/pellet_cloud.dm
+++ b/code/datums/components/pellet_cloud.dm
@@ -60,7 +60,7 @@
else if(isgrenade(parent) || islandmine(parent) || issupplypod(parent))
radius = magnitude
-/datum/component/pellet_cloud/Destroy(force, silent)
+/datum/component/pellet_cloud/Destroy(force)
purple_hearts = null
pellets = null
targets_hit = null
@@ -90,7 +90,10 @@
/datum/component/pellet_cloud/proc/create_casing_pellets(obj/item/ammo_casing/shell, atom/target, mob/living/user, fired_from, randomspread, spread, zone_override, params, distro)
- shooter = user
+ if(user)
+ shooter = user
+ else
+ shooter = fired_from
var/targloc = get_turf(target)
if(!zone_override)
zone_override = shooter.zone_selected
@@ -106,8 +109,12 @@
RegisterSignal(shell.BB, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit))
RegisterSignal(shell.BB, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range))
pellets += shell.BB
- if(!shell.throw_proj(target, targloc, shooter, params, spread))
- return
+ if(user)
+ if(!shell.throw_proj(target, targloc, shooter, params, spread))
+ return
+ else
+ if(!shell.throw_proj(target, targloc, null, params, spread, shooter))
+ return
if(i != num_pellets)
shell.newshot()
diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm
index a6c67af2d3c..26d98b99e80 100644
--- a/code/datums/components/radioactive.dm
+++ b/code/datums/components/radioactive.dm
@@ -30,7 +30,7 @@
//Let's make er glow
//This relies on parent not being a turf or something. IF YOU CHANGE THAT, CHANGE THIS
var/atom/movable/master = parent
- master.add_filter("rad_glow", 2, list("type" = "outline", "color" = "#39ff1430", "size" = 2))
+ master.add_filter("rad_glow", 2, list("type" = "outline", "color" = RAD_GLOW_COLOR, "size" = 2))
addtimer(CALLBACK(src, PROC_REF(glow_loop), master), rand(1,19))//Things should look uneven
START_PROCESSING(SSradiation, src)
@@ -55,7 +55,6 @@
var/filter = master.get_filter("rad_glow")
if(filter)
animate(filter, alpha = 110, time = 15, loop = -1)
- animate(alpha = 40, time = 25)
/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original, _strength, _source, _half_life, _can_contaminate)
if(!i_am_original)
diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm
index 2f3aa79749b..8de76721ff2 100644
--- a/code/datums/components/remote_materials.dm
+++ b/code/datums/components/remote_materials.dm
@@ -23,6 +23,7 @@ handles linking back and forth.
src.category = category
src.allow_standalone = allow_standalone
+ RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(OnDeconstruct))
RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy))
RegisterSignal(parent, COMSIG_ATOM_MULTITOOL_ACT, PROC_REF(OnMultitool))
@@ -35,11 +36,15 @@ handles linking back and forth.
silo.updateUsrDialog()
silo = null
mat_container = null
- else if (mat_container)
+ mat_container = null
+ return ..()
+
+/datum/component/remote_materials/proc/OnDeconstruct(disassembled)
+ SIGNAL_HANDLER
+ if(!silo && mat_container)
// specify explicitly in case the other component is deleted first
var/atom/P = parent
mat_container.retrieve_all(P.drop_location())
- return ..()
/datum/component/remote_materials/proc/_MakeLocal()
silo = null
@@ -77,9 +82,11 @@ handles linking back and forth.
/datum/component/remote_materials/proc/OnAttackBy(datum/source, obj/item/I, mob/user)
SIGNAL_HANDLER
- if (silo && istype(I, /obj/item/stack))
- if (silo.remote_attackby(parent, user, I))
- return COMPONENT_NO_AFTERATTACK
+ if (!silo || !istype(I, /obj/item/stack))
+ return
+
+ if (silo.remote_attackby(parent, user, I))
+ return COMPONENT_NO_AFTERATTACK
/datum/component/remote_materials/proc/OnMultitool(datum/source, mob/user, obj/item/I)
SIGNAL_HANDLER
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 7d3bf028d79..f4ff07423c5 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -369,7 +369,7 @@
/obj/item/riding_offhand
name = "offhand"
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "offhand"
w_class = WEIGHT_CLASS_HUGE
item_flags = ABSTRACT | DROPDEL | NOBLUDGEON
diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm
new file mode 100644
index 00000000000..7c2c3473e2d
--- /dev/null
+++ b/code/datums/components/shielded.dm
@@ -0,0 +1,186 @@
+/**
+ * The shielded component causes the parent item to nullify a certain number of attacks against the wearer, see: shielded vests.
+ */
+
+/datum/component/shielded
+ /// The person currently wearing us
+ var/mob/living/wearer
+ /// How many charges we can have max, and how many we start with
+ var/max_charges
+ /// How many charges we currently have
+ var/current_charges
+ /// How long we have to avoid being hit to replenish charges. If set to 0, we never recharge lost charges
+ var/recharge_start_delay = 20 SECONDS
+ /// Once we go unhit long enough to recharge, we replenish charges this often. The floor is effectively 1 second, AKA how often SSdcs processes
+ var/charge_increment_delay = 1 SECONDS
+ /// How many charges we recover on each charge increment
+ var/charge_recovery = 1
+ /// What .dmi we're pulling the shield icon from
+ var/shield_icon_file = 'icons/effects/effects.dmi'
+ /// What icon is used when someone has a functional shield up
+ var/shield_icon = "shield-old"
+ /// Do we still shield if we're being held in-hand? If FALSE, it needs to be equipped to a slot to work
+ var/shield_inhand = FALSE
+ /// Should the shield lose charges equal to the damage dealt by a hit?
+ var/lose_multiple_charges = FALSE
+ /// The cooldown tracking when we were last hit
+ COOLDOWN_DECLARE(recently_hit_cd)
+ /// The cooldown tracking when we last replenished a charge
+ COOLDOWN_DECLARE(charge_add_cd)
+ /// A callback for the sparks/message that play when a charge is used, see [/datum/component/shielded/proc/default_run_hit_callback]
+ var/datum/callback/on_hit_effects
+
+/datum/component/shielded/Initialize(max_charges = 3, recharge_start_delay = 20 SECONDS, charge_increment_delay = 1 SECONDS, charge_recovery = 1, lose_multiple_charges = FALSE, starting_charges = null, shield_icon_file = 'icons/effects/effects.dmi', shield_icon = "shield-old", shield_inhand = FALSE, run_hit_callback)
+ if(!isitem(parent) || max_charges <= 0)
+ return COMPONENT_INCOMPATIBLE
+
+ src.max_charges = max_charges
+ src.recharge_start_delay = recharge_start_delay
+ src.charge_increment_delay = charge_increment_delay
+ src.charge_recovery = charge_recovery
+ src.lose_multiple_charges = lose_multiple_charges
+ src.shield_icon_file = shield_icon_file
+ src.shield_icon = shield_icon
+ src.shield_inhand = shield_inhand
+ src.on_hit_effects = run_hit_callback || CALLBACK(src, PROC_REF(default_run_hit_callback))
+ if(isnull(starting_charges))
+ current_charges = max_charges
+ else
+ current_charges = starting_charges
+ if(recharge_start_delay)
+ START_PROCESSING(SSdcs, src)
+
+/datum/component/shielded/Destroy(force)
+ if(wearer)
+ shield_icon = "broken"
+ UnregisterSignal(wearer, COMSIG_ATOM_UPDATE_OVERLAYS)
+ wearer.update_appearance(UPDATE_ICON)
+ wearer = null
+ QDEL_NULL(on_hit_effects)
+ return ..()
+
+/datum/component/shielded/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(lost_wearer))
+ RegisterSignal(parent, COMSIG_ITEM_HIT_REACT, PROC_REF(on_hit_react))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(check_recharge_rune))
+ var/atom/shield = parent
+ if(ismob(shield.loc))
+ var/mob/holder = shield.loc
+ if(holder.is_holding(parent) && !shield_inhand)
+ return
+ set_wearer(holder)
+
+/datum/component/shielded/UnregisterFromParent()
+ UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_ITEM_HIT_REACT, COMSIG_PARENT_ATTACKBY))
+ var/atom/shield = parent
+ if(shield.loc == wearer)
+ lost_wearer(src, wearer)
+
+// Handle recharging, if we want to
+/datum/component/shielded/process(delta_time)
+ if(current_charges >= max_charges)
+ STOP_PROCESSING(SSdcs, src)
+ return
+
+ if(!COOLDOWN_FINISHED(src, recently_hit_cd))
+ return
+ if(!COOLDOWN_FINISHED(src, charge_add_cd))
+ return
+
+ var/obj/item/item_parent = parent
+ COOLDOWN_START(src, charge_add_cd, charge_increment_delay)
+ adjust_charge(charge_recovery) // set the number of charges to current + recovery per increment, clamped from zero to max_charges
+ playsound(item_parent, 'sound/magic/charge.ogg', 50, TRUE)
+ if(current_charges == max_charges)
+ playsound(item_parent, 'sound/machines/ding.ogg', 50, TRUE)
+
+/datum/component/shielded/proc/adjust_charge(change)
+ current_charges = clamp(current_charges + change, 0, max_charges)
+ if(wearer)
+ wearer.update_appearance(UPDATE_ICON)
+
+/// Check if we've been equipped to a valid slot to shield
+/datum/component/shielded/proc/on_equipped(datum/source, mob/user, slot)
+ SIGNAL_HANDLER
+
+ if(slot == ITEM_SLOT_HANDS && !shield_inhand)
+ lost_wearer(source, user)
+ return
+ set_wearer(source, user)
+
+/// Either we've been dropped or our wearer has been QDEL'd. Either way, they're no longer our problem
+/datum/component/shielded/proc/lost_wearer(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ if(wearer)
+ UnregisterSignal(wearer, list(COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_PARENT_QDELETING))
+ wearer.update_appearance(UPDATE_ICON)
+ wearer = null
+
+/datum/component/shielded/proc/set_wearer(mob/user)
+ wearer = user
+ RegisterSignal(wearer, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays))
+ RegisterSignal(wearer, COMSIG_PARENT_QDELETING, PROC_REF(lost_wearer))
+ if(current_charges)
+ wearer.update_appearance(UPDATE_ICON)
+
+/// Used to draw the shield overlay on the wearer
+/datum/component/shielded/proc/on_update_overlays(atom/parent_atom, list/overlays)
+ SIGNAL_HANDLER
+
+ overlays += mutable_appearance(shield_icon_file, (current_charges > 0 ? shield_icon : "broken"), ABOVE_MOB_LAYER)
+
+/**
+ * This proc fires when we're hit, and is responsible for checking if we're charged, then deducting one + returning that we're blocking if so.
+ * It then runs the callback in [/datum/component/shielded/var/on_hit_effects] which handles the messages/sparks (so the visuals)
+ */
+/datum/component/shielded/proc/on_hit_react(datum/source, mob/living/carbon/human/owner, atom/movable/hitby, attack_text, final_block_chance, damage, attack_type)
+ SIGNAL_HANDLER
+
+ COOLDOWN_START(src, recently_hit_cd, recharge_start_delay)
+
+ if(current_charges <= 0)
+ return
+ . = COMPONENT_HIT_REACTION_BLOCK
+
+ var/charge_loss = 1 // how many charges do we lose
+
+ if(lose_multiple_charges) // if the shield has health like damage we'll lose charges equal to the damage of the hit
+ charge_loss = damage
+
+ adjust_charge(-charge_loss)
+
+ INVOKE_ASYNC(src, PROC_REF(actually_run_hit_callback), owner, attack_text, current_charges)
+
+ if(!recharge_start_delay) // if recharge_start_delay is 0, we don't recharge
+ if(!current_charges) // obviously if someone ever adds a manual way to replenish charges, change this
+ qdel(src)
+ return
+
+ START_PROCESSING(SSdcs, src) // if we DO recharge, start processing so we can do that
+
+/// The wrapper to invoke the on_hit callback, so we don't have to worry about blocking in the signal handler
+/datum/component/shielded/proc/actually_run_hit_callback(mob/living/owner, attack_text, current_charges)
+ on_hit_effects.Invoke(owner, attack_text, current_charges)
+
+/// Default on_hit proc, since cult robes are stupid and have different descriptions/sparks
+/datum/component/shielded/proc/default_run_hit_callback(mob/living/owner, attack_text, current_charges)
+ do_sparks(2, TRUE, owner)
+ owner.visible_message(span_danger("Щит [owner] отражает [attack_text]!"))
+ if(current_charges <= 0)
+ owner.visible_message(span_warning("Щит [owner] перегружается!"))
+
+/datum/component/shielded/proc/check_recharge_rune(datum/source, obj/item/wizard_armour_charge/recharge_rune, mob/living/user)
+ /*SIGNAL_HANDLER
+
+ if(!istype(recharge_rune))
+ return
+ . = COMPONENT_NO_AFTERATTACK
+ if(!istype(parent, /obj/item/clothing/suit/space/hardsuit/shielded/wizard))
+ to_chat(user, span_warning("Руна может быть использована только на броне боевого мага!"))
+ return
+
+ current_charges += recharge_rune.restored_charges
+ to_chat(user, span_notice("Заряжаю [parent]. Теперь она сможет поглотить [current_charges] ударов."))
+ qdel(recharge_rune)*/
diff --git a/code/datums/components/sizzle.dm b/code/datums/components/sizzle.dm
index 88fadb377ce..ecb45e448d8 100644
--- a/code/datums/components/sizzle.dm
+++ b/code/datums/components/sizzle.dm
@@ -3,9 +3,11 @@
var/sizzlealpha = 0
dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
-/datum/component/sizzle/Initialize()
+/datum/component/sizzle/Initialize(_alpha)
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
+ if(_alpha)
+ sizzlealpha = _alpha
setup_sizzle()
/datum/component/sizzle/InheritComponent(datum/component/C, i_am_original)
diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm
index 5c2c88ccfee..c31ba2bd50e 100644
--- a/code/datums/components/slippery.dm
+++ b/code/datums/components/slippery.dm
@@ -93,14 +93,3 @@
/datum/component/slippery/proc/Slip_on_wearer(datum/source, atom/movable/arrived)
SIGNAL_HANDLER
-
-/// Used for making the clown PDA only slip if the clown is wearing his shoes and the elusive banana-skin belt
-/datum/component/slippery/clowning
-
-/datum/component/slippery/clowning/Slip_on_wearer(datum/source, atom/movable/AM)
- var/obj/item/I = holder.get_item_by_slot(ITEM_SLOT_FEET)
- if(holder.body_position == LYING_DOWN && !holder.buckled)
- if(istype(I, /obj/item/clothing/shoes/clown_shoes))
- Slip(source, AM)
- else
- to_chat(AM,"[parent] failed to slip anyone. Perhaps I shouldn't have abandoned my legacy...")
diff --git a/code/datums/components/soulstoned.dm b/code/datums/components/soulstoned.dm
deleted file mode 100644
index 04e51406287..00000000000
--- a/code/datums/components/soulstoned.dm
+++ /dev/null
@@ -1,33 +0,0 @@
-//adds godmode while in the container, prevents moving, and clears these effects up after leaving the stone
-/datum/component/soulstoned
- var/atom/movable/container
-
-/datum/component/soulstoned/Initialize(atom/movable/container)
- if(!isanimal(parent))
- return COMPONENT_INCOMPATIBLE
- var/mob/living/simple_animal/S = parent
-
- src.container = container
-
- S.forceMove(container)
-
- S.status_flags |= GODMODE
- ADD_TRAIT(S, TRAIT_IMMOBILIZED, SOULSTONE_TRAIT)
- ADD_TRAIT(S, TRAIT_HANDS_BLOCKED, SOULSTONE_TRAIT)
- S.health = S.maxHealth
- S.bruteloss = 0
-
- RegisterSignal(S, COMSIG_MOVABLE_MOVED, PROC_REF(free_prisoner))
-
-/datum/component/soulstoned/proc/free_prisoner()
- SIGNAL_HANDLER
-
- var/mob/living/simple_animal/S = parent
- if(S.loc != container)
- qdel(src)
-
-/datum/component/soulstoned/UnregisterFromParent()
- var/mob/living/simple_animal/S = parent
- S.status_flags &= ~GODMODE
- REMOVE_TRAIT(S, TRAIT_IMMOBILIZED, SOULSTONE_TRAIT)
- REMOVE_TRAIT(S, TRAIT_HANDS_BLOCKED, SOULSTONE_TRAIT)
diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm
index 368b70b64c0..7f4b8b50229 100644
--- a/code/datums/components/squeak.dm
+++ b/code/datums/components/squeak.dm
@@ -28,7 +28,7 @@
/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override, extrarange, falloff_exponent, fallof_distance)
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), PROC_REF(play_squeak))
+ RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), PROC_REF(play_squeak))
if(ismovable(parent))
RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT), PROC_REF(play_squeak))
AddComponent(/datum/component/connect_loc_behalf, parent, item_connections)
@@ -67,9 +67,9 @@
if(prob(squeak_chance))
if(!override_squeak_sounds)
- playsound(parent, pickweight(default_squeak_sounds), volume, TRUE, sound_extra_range, sound_falloff_exponent, falloff_distance = sound_falloff_distance)
+ playsound(parent, pick_weight(default_squeak_sounds), volume, TRUE, sound_extra_range, sound_falloff_exponent, falloff_distance = sound_falloff_distance)
else
- playsound(parent, pickweight(override_squeak_sounds), volume, TRUE, sound_extra_range, sound_falloff_exponent, falloff_distance = sound_falloff_distance)
+ playsound(parent, pick_weight(override_squeak_sounds), volume, TRUE, sound_extra_range, sound_falloff_exponent, falloff_distance = sound_falloff_distance)
/datum/component/squeak/proc/step_squeak()
SIGNAL_HANDLER
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 32a74c843b0..98d5f5ac53d 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -35,8 +35,8 @@
/datum/component/storage/concrete/pockets/small/fedora/Initialize()
. = ..()
var/static/list/exception_cache = typecacheof(list(
- /obj/item/katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana,
- /obj/item/energy_katana, /obj/item/gun/ballistic/automatic/smg/firestorm/pan
+ /obj/item/toy/katana, /obj/item/melee/sword/katana,
+ /obj/item/melee/sword/energy_katana, /obj/item/gun/ballistic/automatic/smg/firestorm/pan
))
exception_hold = exception_cache
@@ -91,6 +91,7 @@
/obj/item/clothing/glasses/hud/health/night,
/obj/item/clothing/glasses/hud/security/night,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+ /obj/item/clothing/glasses/sunglasses/ballistic,
/obj/item/ammo_casing,
/obj/item/ammo_box/magazine/illestren_a850r,
))
@@ -106,7 +107,14 @@
can_hold = typecacheof(list(
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/gun/ballistic/revolver,
- /obj/item/ammo_box))
+ /obj/item/gun/energy/laser,
+ /obj/item/gun/energy/e_gun,
+ /obj/item/gun/energy/kalix/pistol,
+ /obj/item/stock_parts/cell/gun,
+ /obj/item/ammo_box)) // this doesnt let you put hades into holsters trust me
+ can_hold_max_of_items = typecacheof(list(
+ /obj/item/gun = 1,
+ ))
/datum/component/storage/concrete/pockets/holster/real_location()
// if the component is reparented to a jumpsuit, the items still go in the protector
@@ -135,17 +143,3 @@
/obj/item/gun/energy/dueling,
/obj/item/gun/ballistic/shotgun,
/obj/item/gun/ballistic/rocketlauncher))
-
-/datum/component/storage/concrete/pockets/holster/chameleon
- max_items = 1
-
-/datum/component/storage/concrete/pockets/holster/chameleon/Initialize()
- original_parent = parent
- . = ..()
- can_hold = typecacheof(list(
- /obj/item/gun/ballistic/automatic/pistol/syndicate,
- /obj/item/gun/ballistic/revolver,
- /obj/item/gun/energy/e_gun/mini,
- /obj/item/gun/energy/disabler,
- /obj/item/gun/energy/pulse/carbine,
- /obj/item/gun/energy/dueling))
diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm
index 89831dafab7..fab8ffdf3a2 100644
--- a/code/datums/components/storage/storage.dm
+++ b/code/datums/components/storage/storage.dm
@@ -18,6 +18,7 @@
var/list/cant_hold //if this is set, items, and their children, won't fit
var/list/exception_hold //if set, these items will be the exception to the max size of object that can fit.
var/list/can_hold_trait /// If set can only contain stuff with this single trait present.
+ var/list/can_hold_max_of_items // if set, storage can only hold up to the set amount of said item.
var/can_hold_description
@@ -424,7 +425,7 @@
/datum/component/storage/proc/dump_content_at(atom/dest_object, mob/M)
var/atom/A = parent
var/atom/dump_destination = dest_object.get_dumping_location()
- if(A.Adjacent(M) && dump_destination && M.Adjacent(dump_destination))
+ if(M.CanReach(A) && dump_destination && M.CanReach(dump_destination))
if(locked)
to_chat(M, "[parent] seems to be [locked_flavor]!")
return FALSE
@@ -433,6 +434,12 @@
return TRUE
return FALSE
+/datum/component/storage/proc/get_dumping_location(atom/dest_object)
+ var/datum/component/storage/storage = dest_object.GetComponent(/datum/component/storage)
+ if(storage)
+ return storage.real_location()
+ return dest_object.get_dumping_location()
+
//This proc is called when you want to place an item into the storage item.
/datum/component/storage/proc/attackby(datum/source, obj/item/I, mob/M, params)
SIGNAL_HANDLER
@@ -560,6 +567,16 @@
if(!stop_messages)
to_chat(M, "[host] cannot hold [I]!")
return FALSE
+ if(length(can_hold_max_of_items))
+ if(is_type_in_typecache(I,can_hold_max_of_items))
+ var/amount = 0
+ for(var/_item in contents())
+ if(is_type_in_typecache(_item,can_hold_max_of_items))
+ amount++
+ if(amount >= can_hold_max_of_items[I.type])
+ if(!stop_messages)
+ to_chat(M, "[host] cannot hold another [I]!")
+ return FALSE
if(is_type_in_typecache(I, cant_hold) || HAS_TRAIT(I, TRAIT_NO_STORAGE_INSERT) || (can_hold_trait && !HAS_TRAIT(I, can_hold_trait))) //Items which this container can't hold.
if(!stop_messages)
to_chat(M, "[host] cannot hold [I]!")
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index 68c74921b8b..4d3d07576cc 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -270,11 +270,10 @@
if(ishuman(target))
var/mob/living/carbon/human/T = target
- var/suit_slot = T.get_item_by_slot(ITEM_SLOT_OCLOTHING)
if(isnull(T.wear_suit) && isnull(T.w_uniform)) // who honestly puts all of their effort into tackling a naked guy?
defense_mod += 2
- if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/space/hardsuit)))
+ if(T.mob_negates_gravity())
defense_mod += 1
if(T.is_shove_knockdown_blocked()) // riot armor and such
defense_mod += 5
@@ -377,7 +376,7 @@
user.apply_damage(30, BRUTE, BODY_ZONE_HEAD)
playsound(user, 'sound/effects/blobattack.ogg', 60, TRUE)
playsound(user, 'sound/effects/splat.ogg', 70, TRUE)
- user.emote("scream")
+ user.force_scream()
user.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) // oopsie indeed!
shake_camera(user, 7, 7)
user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
diff --git a/code/datums/components/weatherannouncer.dm b/code/datums/components/weatherannouncer.dm
index a5e622d8669..6cf4b566b84 100644
--- a/code/datums/components/weatherannouncer.dm
+++ b/code/datums/components/weatherannouncer.dm
@@ -38,7 +38,7 @@
speaker.update_appearance(UPDATE_ICON)
update_light_color()
-/datum/component/weather_announcer/Destroy(force, silent)
+/datum/component/weather_announcer/Destroy(force)
STOP_PROCESSING(SSprocessing, src)
return ..()
@@ -93,7 +93,8 @@
light.set_light_color(LIGHT_COLOR_YELLOW)
if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
light.set_light_color(LIGHT_COLOR_INTENSE_RED)
- light.update_light()
+ if(light.light_system == STATIC_LIGHT)
+ light.update_light()
/// Returns a string we should display to communicate what you should be doing
/datum/component/weather_announcer/proc/get_warning_message()
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index e2f478ba783..fc7189738b3 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -44,8 +44,12 @@
var/datum/weakref/weak_reference
#ifdef REFERENCE_TRACKING
- var/running_find_references
+ /// When was this datum last touched by a reftracker?
+ /// If this value doesn't match with the start of the search
+ /// We know this datum has never been seen before, and we should check it
var/last_find_references = 0
+ /// How many references we're trying to find when searching
+ var/references_to_clear = 0
#ifdef REFERENCE_TRACKING_DEBUG
///Stores info about where refs are found, used for sanity checks and testing
var/list/found_refs
@@ -81,7 +85,7 @@
*
* Returns [QDEL_HINT_QUEUE]
*/
-/datum/proc/Destroy(force=FALSE, ...)
+/datum/proc/Destroy(force)
SHOULD_CALL_PARENT(TRUE)
tag = null
datum_flags &= ~DF_USE_TAG //In case something tries to REF us
@@ -107,10 +111,10 @@
var/all_components = dc[/datum/component]
if(length(all_components))
for(var/datum/component/component as anything in all_components)
- qdel(component, FALSE, TRUE)
+ qdel(component, FALSE)
else
var/datum/component/C = all_components
- qdel(C, FALSE, TRUE)
+ qdel(C, FALSE)
dc.Cut()
clear_signal_refs()
@@ -226,3 +230,19 @@
qdel(D)
else
return returned
+
+/// Return text from this proc to provide extra context to hard deletes that happen to it
+/// Optional, you should use this for cases where replication is difficult and extra context is required
+/// Can be called more then once per object, use harddel_deets_dumped to avoid duplicate calls (I am so sorry)
+/datum/proc/dump_harddel_info()
+ return
+
+/image
+ var/harddel_deets_dumped = FALSE
+
+///images are pretty generic, this should help a bit with tracking harddels related to them
+/image/dump_harddel_info()
+ if(harddel_deets_dumped)
+ return
+ harddel_deets_dumped = TRUE
+ return "Image icon: [icon] - icon_state: [icon_state] [loc ? "loc: [loc] ([loc.x],[loc.y],[loc.z])" : ""]"
diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm
index ea607f2a31f..df39c5f0659 100644
--- a/code/datums/diseases/advance/symptoms/deafness.dm
+++ b/code/datums/diseases/advance/symptoms/deafness.dm
@@ -55,7 +55,7 @@ Bonus
if(istype(ears) && ears.damage < ears.maxHealth)
to_chat(M, "Your ears pop painfully and start bleeding!")
ears.damage = max(ears.damage, ears.maxHealth)
- M.emote("scream")
+ M.force_scream()
else
to_chat(M, "Your ears pop and begin ringing loudly!")
M.minimumDeafTicks(20)
diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm
index aeb9933debb..98391edbdf1 100644
--- a/code/datums/diseases/advance/symptoms/fire.dm
+++ b/code/datums/diseases/advance/symptoms/fire.dm
@@ -60,12 +60,12 @@ Bonus
Firestacks_stage_4(M, A)
M.IgniteMob()
to_chat(M, "Your skin bursts into flames!")
- M.emote("scream")
+ M.force_scream()
if(5)
Firestacks_stage_5(M, A)
M.IgniteMob()
to_chat(M, "Your skin erupts into an inferno!")
- M.emote("scream")
+ M.force_scream()
/datum/symptom/fire/proc/Firestacks_stage_4(mob/living/M, datum/disease/advance/A)
M.adjust_fire_stacks(1 * power)
@@ -147,7 +147,7 @@ Bonus
Alkali_fire_stage_4(M, A)
M.IgniteMob()
to_chat(M, "Your sweat bursts into flames!")
- M.emote("scream")
+ M.force_scream()
if(5)
if(M.fire_stacks < 0)
M.visible_message("[M]'s sweat sizzles and pops on contact with water!")
@@ -155,7 +155,7 @@ Bonus
Alkali_fire_stage_5(M, A)
M.IgniteMob()
to_chat(M, "Your skin erupts into an inferno!")
- M.emote("scream")
+ M.force_scream()
/datum/symptom/alkali/proc/Alkali_fire_stage_4(mob/living/M, datum/disease/advance/A)
var/get_stacks = 6 * power
diff --git a/code/datums/diseases/gastrolisis.dm b/code/datums/diseases/gastrolisis.dm
index 119ccc0c60e..ed4c5267d14 100644
--- a/code/datums/diseases/gastrolisis.dm
+++ b/code/datums/diseases/gastrolisis.dm
@@ -36,25 +36,15 @@
new_eyes.Insert(affected_mob, drop_if_replaced = TRUE)
affected_mob.visible_message("[affected_mob]'s eyes fall out, with snail eyes taking its place!", \
"You scream in pain as your eyes are pushed out by your new snail eyes!")
- affected_mob.emote("scream")
+ affected_mob.force_scream()
return
- var/obj/item/shell = affected_mob.get_item_by_slot(ITEM_SLOT_BACK)
- if(!istype(shell, /obj/item/storage/backpack/snail))
- shell = null
- if(!shell && prob(5))
- if(affected_mob.dropItemToGround(affected_mob.get_item_by_slot(ITEM_SLOT_BACK)))
- affected_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(affected_mob), ITEM_SLOT_BACK)
- affected_mob.visible_message("[affected_mob] grows a grotesque shell on their back!", \
- "You scream in pain as a shell pushes itself out from under your skin!")
- affected_mob.emote("scream")
- return
var/obj/item/organ/tongue/tongue = locate(/obj/item/organ/tongue/snail) in affected_mob.internal_organs
if(!tongue && prob(5))
var/obj/item/organ/tongue/snail/new_tongue = new()
new_tongue.Insert(affected_mob)
to_chat(affected_mob, "You feel your speech slow down...")
return
- if(shell && eyes && tongue && prob(5))
+ if(eyes && tongue && prob(5))
affected_mob.set_species(/datum/species/snail)
affected_mob.client?.give_award(/datum/award/achievement/misc/snail, affected_mob)
affected_mob.visible_message("[affected_mob] turns into a snail!", \
@@ -79,8 +69,3 @@
if(eyes)
var/obj/item/organ/eyes/new_eyes = new H.dna.species.mutanteyes ()
new_eyes.Insert(H)
- var/obj/item/storage/backpack/bag = H.get_item_by_slot(ITEM_SLOT_BACK)
- if(istype(bag, /obj/item/storage/backpack/snail))
- bag.emptyStorage()
- H.temporarilyRemoveItemFromInventory(bag, TRUE)
- qdel(bag)
diff --git a/code/datums/diseases/legionvirus.dm b/code/datums/diseases/legionvirus.dm
index 22144a7b2a1..9de7fa6667c 100644
--- a/code/datums/diseases/legionvirus.dm
+++ b/code/datums/diseases/legionvirus.dm
@@ -1,28 +1,50 @@
-/datum/disease/transformation/legionvirus
- name = "Soulus Saturation"
+/datum/disease/transformation/legionvirus //Diseases are a quick way to exposit a bunch of information onto players, most of the effects here are handled by the legion skull organ from /mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+ name = "Legion Infection"
max_stages = 5
spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS
- cure_text = "System Cleaner"
- cures = list(/datum/reagent/medicine/system_cleaner)
- agent = "Soulus Dust"
+ cure_text = "Surgically removing the skull from the patient's chest; applications of spaceacillin or synaptizine can delay onset of the infection."
+ agent = "Legion skull"
viable_mobtypes = list(/mob/living/carbon/human)
visibility_flags = 0
- stage_prob = 5
- cure_chance = 20
- desc = "If left untreated, this disease will cause the infected to transform into a legion."
+ stage_prob = 0 // WOOOOOO SNOWFLAKE!!!!!!! WOOOOOO!!!!
+ desc = "If left untreated, the skull will slowly overtake its host's body, eventually growing into a legion."
severity = DISEASE_SEVERITY_HARMFUL
- disease_flags = CURABLE
+ disease_flags = NONE
+ visibility_flags = HIDDEN_PANDEMIC
bypasses_immunity = TRUE
- stage1 = list("Your joints itch.")
- stage2 = list("Your head begins to ache.")
- stage3 = list("Ash begins to flake off your skin.")
- stage4 = list("You feel like your head is splitting in two!")
- stage5 = list("You feel something growing inside your chest!")
+ stage1 = list(span_notice("You feel a dull pain in your chest."))
+ stage2 = list(span_notice("Your head begins to ache."))
+ stage3 = list(span_notice("Something moves underneath your skin."))
+ stage4 = list(span_warning("You feel something pressing against your skin!"))
+ stage5 = list(span_warning("Your skin begins to tear apart-!"))
new_form = /mob/living/simple_animal/hostile/asteroid/hivelord/legion
+ COOLDOWN_DECLARE(warning_timer)
+ var/cooldown_time = 1 MINUTES
+
+/datum/disease/transformation/legionvirus/infect(mob/living/infectee, make_copy = TRUE)
+ . = ..()
+ COOLDOWN_START(src, warning_timer, cooldown_time) //theos why don't you make this NOT A DISEASE if you don't plan on using ANY disease stuff??? good question:
+
+/datum/disease/transformation/legionvirus/stage_act()
+ ..()
+ if(!COOLDOWN_FINISHED(src, warning_timer))
+ return
+ COOLDOWN_START(src, warning_timer, cooldown_time)
+ switch(stage)
+ if(1)
+ to_chat(affected_mob, pick(stage1))
+ if(2)
+ to_chat(affected_mob, pick(stage2))
+ if(3)
+ to_chat(affected_mob, pick(stage3))
+ if(4)
+ to_chat(affected_mob, pick(stage4))
/datum/disease/transformation/legionvirus/do_disease_transformation(mob/living/H)
- H.visible_message("[H] transforms into a legion!")
+ if(stage5)
+ to_chat(affected_mob, pick(stage5))
+ H.visible_message(span_warning("[H] suddenly collapses, a pallid grey mass bursting from their body!"))
var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
if(HAS_TRAIT(H, TRAIT_DWARF)) //dwarf legions aren't just fluff!
L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc)
@@ -32,4 +54,3 @@
H.adjustBruteLoss(1000)
L.stored_mob = H
H.forceMove(L)
- qdel(src)
diff --git a/code/datums/diseases/parasitic_infection.dm b/code/datums/diseases/parasitic_infection.dm
deleted file mode 100644
index 055425d9cc6..00000000000
--- a/code/datums/diseases/parasitic_infection.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-/datum/disease/parasite
- form = "Parasite"
- name = "Parasitic Infection"
- max_stages = 4
- cure_text = "Surgical removal of the liver."
- agent = "Consuming Live Parasites"
- spread_text = "Non-Biological"
- viable_mobtypes = list(/mob/living/carbon/human)
- permeability_mod = 1
- desc = "If left untreated the subject will passively lose nutrients, and eventually lose their liver."
- severity = DISEASE_SEVERITY_HARMFUL
- disease_flags = CAN_CARRY|CAN_RESIST
- spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS
- required_organs = list(/obj/item/organ/liver)
- bypasses_immunity = TRUE
-
-/datum/disease/parasite/stage_act()
- . = ..()
- var/mob/living/carbon/C = affected_mob
- var/obj/item/organ/liver/L = C.getorgan(/obj/item/organ/liver)
- if(!L)
- src.cure()
- C.visible_message("[C]'s liver is covered in tiny larva! They quickly shrivel and die after being exposed to the open air.")
- switch(stage)
- if(1)
- if(prob(5))
- affected_mob.emote("cough")
- if(2)
- if(prob(10))
- if(prob(50))
- to_chat(affected_mob, "You feel the weight loss already!")
- affected_mob.adjust_nutrition(-3)
- if(3)
- if(prob(20))
- if(prob(20))
- to_chat(affected_mob, "You're... REALLY starting to feel the weight loss.")
- affected_mob.adjust_nutrition(-6)
- if(4)
- if(prob(30))
- if(affected_mob.nutrition >= 100)
- if(prob(10))
- to_chat(affected_mob, "You feel like your body's shedding weight rapidly!")
- affected_mob.adjust_nutrition(-12)
- else
- var/turf/T = get_turf(C)
- to_chat(affected_mob, "You feel much, MUCH lighter!")
- affected_mob.vomit(20, TRUE)
- L.Remove(C)
- L.forceMove(T)
- src.cure()
diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index abd20fd2921..ccf91af252a 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -358,7 +358,7 @@
if(icon_update)
update_hair()
update_mutations_overlay()// no lizard with human hulk overlay please.
-
+ AddComponent(/datum/component/bloodysoles/feet)
/mob/proc/has_dna()
return
diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm
index e9779644c21..5d57ac443ad 100644
--- a/code/datums/elements/_element.dm
+++ b/code/datums/elements/_element.dm
@@ -60,7 +60,7 @@
var/datum/element/ele = SSdcs.GetElement(arguments)
arguments[1] = src
if(ele.Attach(arglist(arguments)) == ELEMENT_INCOMPATIBLE)
- CRASH("Incompatible [arguments[1]] assigned to a [type]! args: [json_encode(args)]")
+ CRASH("Incompatible [ele] assigned to a [type]! args: [json_encode(args)]")
/**
* Finds the singleton for the element type given and detaches it from src
diff --git a/code/datums/elements/bed_tucking.dm b/code/datums/elements/bed_tucking.dm
index c094e5a5b10..e505e6efdb5 100644
--- a/code/datums/elements/bed_tucking.dm
+++ b/code/datums/elements/bed_tucking.dm
@@ -8,8 +8,13 @@
var/y_offset = 0
/// our rotation degree - how much the item turns when in bed (+degrees turns it more parallel)
var/rotation_degree = 0
+ /// Whether the item changes its dir to match the desired lying direction of the bed that it's tucked into.
+ var/change_dir = FALSE
+ /// Whether the item changes its layer to the layer suggested by the bed for tucked-in item.
+ /// When the item is untucked, it is returned to its initial() layer.
+ var/change_layer = FALSE
-/datum/element/bed_tuckable/Attach(obj/target, x = 0, y = 0, rotation = 0)
+/datum/element/bed_tuckable/Attach(obj/target, x = 0, y = 0, rotation = 0, _change_dir = FALSE, _change_layer = FALSE)
. = ..()
if(!isitem(target))
return ELEMENT_INCOMPATIBLE
@@ -17,6 +22,8 @@
x_offset = x
y_offset = y
rotation_degree = rotation
+ change_dir = _change_dir
+ change_layer = _change_layer
RegisterSignal(target, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(tuck_into_bed))
/datum/element/bed_tuckable/Detach(obj/target)
@@ -40,11 +47,20 @@
return
to_chat(tucker, "You lay [tucked] out on [target_bed].")
- tucked.pixel_x = x_offset
- tucked.pixel_y = y_offset
+ tucked.pixel_x = x_offset + target_bed.tucked_x_shift
+ tucked.pixel_y = y_offset + target_bed.tucked_y_shift
if(rotation_degree)
tucked.transform = turn(tucked.transform, rotation_degree)
RegisterSignal(tucked, COMSIG_ITEM_PICKUP, PROC_REF(untuck))
+ // the buckle_lying value on the bed controls the direction that mobs lay down in when they're buckled into bed.
+ // some items (bedsheets) have different states to reflect those directions.
+ if(change_dir)
+ if(target_bed.buckle_lying == 270)
+ tucked.setDir(NORTH)
+ else
+ tucked.setDir(SOUTH)
+ if(target_bed.suggested_tuck_layer != null)
+ tucked.layer = target_bed.suggested_tuck_layer
return COMPONENT_NO_AFTERATTACK
@@ -57,4 +73,5 @@
SIGNAL_HANDLER
tucked.transform = turn(tucked.transform, -rotation_degree)
+ tucked.layer = initial(tucked.layer)
UnregisterSignal(tucked, COMSIG_ITEM_PICKUP)
diff --git a/code/datums/elements/decals/blood.dm b/code/datums/elements/decals/blood.dm
index 0a3ca8ce59a..66406d5f2c3 100644
--- a/code/datums/elements/decals/blood.dm
+++ b/code/datums/elements/decals/blood.dm
@@ -39,4 +39,8 @@
var/atom/bloodsource = source
Detach(source)
- bloodsource.AddElement(/datum/element/decal/blood, bloodsource.icon, bloodsource.icon_state, _color = get_blood_dna_color(bloodsource.return_blood_DNA()))
+ var/icon_state_adj = bloodsource.icon_state
+ if(isbodypart(source))//bettericons :D
+ var/obj/item/bodypart/parent_part = source
+ icon_state_adj = parent_part.stored_icon_state
+ bloodsource.AddElement(/datum/element/decal/blood, bloodsource.icon, icon_state_adj, _color = get_blood_dna_color(bloodsource.return_blood_DNA()))
diff --git a/code/datums/elements/empprotection.dm b/code/datums/elements/empprotection.dm
new file mode 100644
index 00000000000..8d5d798c3cb
--- /dev/null
+++ b/code/datums/elements/empprotection.dm
@@ -0,0 +1,20 @@
+/datum/element/empprotection
+ element_flags = ELEMENT_DETACH | ELEMENT_BESPOKE
+ id_arg_index = 2
+ var/flags = NONE
+
+/datum/element/empprotection/Attach(datum/target, _flags)
+ . = ..()
+ if(. == ELEMENT_INCOMPATIBLE || !isatom(target))
+ return ELEMENT_INCOMPATIBLE
+ flags = _flags
+ RegisterSignal(target, COMSIG_ATOM_EMP_ACT, PROC_REF(getEmpFlags))
+
+/datum/element/empprotection/Detach(atom/target)
+ UnregisterSignal(target, COMSIG_ATOM_EMP_ACT)
+ return ..()
+
+/datum/element/empprotection/proc/getEmpFlags(datum/source, severity)
+ SIGNAL_HANDLER
+
+ return flags
diff --git a/code/datums/elements/dunkable.dm b/code/datums/elements/food/dunkable.dm
similarity index 99%
rename from code/datums/elements/dunkable.dm
rename to code/datums/elements/food/dunkable.dm
index 1eaee1d8cbb..80661d5c4ac 100644
--- a/code/datums/elements/dunkable.dm
+++ b/code/datums/elements/food/dunkable.dm
@@ -17,8 +17,6 @@
UnregisterSignal(target, COMSIG_ITEM_AFTERATTACK)
/datum/element/dunkable/proc/get_dunked(datum/source, atom/target, mob/user, proximity_flag)
- SIGNAL_HANDLER
-
if(!proximity_flag) // if the user is not adjacent to the container
return
var/obj/item/reagent_containers/container = target // the container we're trying to dunk into
diff --git a/code/datums/elements/food/edible.dm b/code/datums/elements/food/edible.dm
new file mode 100644
index 00000000000..615422198d8
--- /dev/null
+++ b/code/datums/elements/food/edible.dm
@@ -0,0 +1,471 @@
+/*!
+
+This component makes it possible to make things edible. What this means is that you can take a bite or force someone to take a bite (in the case of items).
+These items take a specific time to eat, and can do most of the things our original food items could.
+
+Behavior that's still missing from this component that original food items had that should either be put into seperate components or somewhere else:
+ Components:
+ Drying component (jerky etc)
+ Customizable component (custom pizzas etc)
+ Processable component (Slicing and cooking behavior essentialy, making it go from item A to B when conditions are met.)
+ Microwavability component
+ Frying component
+
+ Misc:
+ Something for cakes (You can store things inside)
+
+*/
+/datum/component/edible
+ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+ ///Amount of reagents taken per bite
+ var/bite_consumption = 2
+ ///Amount of bites taken so far
+ var/bitecount = 0
+ ///Flags for food
+ var/food_flags = NONE
+ ///Bitfield of the types of this food
+ var/foodtypes = NONE
+ ///Amount of seconds it takes to eat this food
+ var/eat_time = 30
+ ///Defines how much it lowers someones satiety (Need to eat, essentialy)
+ var/junkiness = 0
+ ///Message to send when eating
+ var/list/eatverbs
+ ///Callback to be ran before you eat something, so you can check if someone *can* eat it.
+ var/datum/callback/pre_eat
+ ///Callback to be ran before composting something, in case you don't want a piece of food to be compostable for some reason.
+ var/datum/callback/on_compost
+ ///Callback to be ran for when you take a bite of something
+ var/datum/callback/after_eat
+ ///Callback to be ran for when you finish eating something
+ var/datum/callback/on_consume
+ ///Last time we checked for food likes
+ var/last_check_time
+ ///The initial reagents of this food when it is made
+ var/list/initial_reagents
+ ///The initial volume of the foods reagents
+ var/volume
+ ///The flavortext for taste
+ var/list/tastes
+ ///The type of atom this creates when the object is microwaved.
+ var/microwaved_type
+
+ //TEMP VAR. To be phased out
+ var/filling_color = null
+
+
+/datum/component/edible/Initialize(list/initial_reagents,
+ food_flags = NONE,
+ foodtypes = NONE,
+ volume = 50,
+ eat_time = 10,
+ list/tastes,
+ list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"),
+ bite_consumption = 2,
+ microwaved_type,
+ junkiness,
+ datum/callback/pre_eat,
+ datum/callback/on_compost,
+ datum/callback/after_eat,
+ datum/callback/on_consume
+)
+ if(!isatom(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, PROC_REF(use_by_animal))
+ RegisterSignal(parent, COMSIG_ATOM_CHECKPARTS, PROC_REF(on_craft))
+ RegisterSignal(parent, COMSIG_ATOM_CREATEDBY_PROCESSING, PROC_REF(on_processed))
+ RegisterSignal(parent, COMSIG_ITEM_MICROWAVE_COOKED, PROC_REF(on_microwave_cooked))
+ RegisterSignal(parent, COMSIG_EDIBLE_ON_COMPOST, PROC_REF(compost))
+
+ if(isitem(parent))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(use_from_hand))
+ RegisterSignal(parent, COMSIG_ITEM_FRIED, PROC_REF(on_fried))
+ RegisterSignal(parent, COMSIG_ITEM_MICROWAVE_ACT, PROC_REF(on_microwaved))
+
+ var/obj/item/item = parent
+ if (!item.grind_results)
+ item.grind_results = list() //If this doesn't already exist, add it as an empty list. This is needed for the grinder to accept it.
+
+ src.bite_consumption = bite_consumption
+ src.food_flags = food_flags
+ src.foodtypes = foodtypes
+ src.initial_reagents = initial_reagents
+ src.tastes = tastes
+ src.eat_time = eat_time
+ src.eatverbs = string_list(eatverbs)
+ src.junkiness = junkiness
+ src.pre_eat = pre_eat
+ src.on_compost = on_compost
+ src.after_eat = after_eat
+ src.on_consume = on_consume
+ src.initial_reagents = string_assoc_list(initial_reagents)
+ src.tastes = string_assoc_list(tastes)
+ src.microwaved_type = microwaved_type
+
+ var/atom/owner = parent
+
+ owner.create_reagents(volume, INJECTABLE)
+
+ for(var/rid in initial_reagents)
+ var/amount = initial_reagents[rid]
+ if(length(tastes) && (rid == /datum/reagent/consumable/nutriment || rid == /datum/reagent/consumable/nutriment/vitamin))
+ owner.reagents.add_reagent(rid, amount, tastes.Copy())
+ else
+ owner.reagents.add_reagent(rid, amount)
+
+/datum/component/edible/InheritComponent(datum/component/C,
+ i_am_original,
+ list/initial_reagents,
+ food_flags = NONE,
+ foodtypes = NONE,
+ volume = 50,
+ eat_time = 30,
+ list/tastes,
+ list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"),
+ bite_consumption = 2,
+ datum/callback/pre_eat,
+ datum/callback/on_compost,
+ datum/callback/after_eat,
+ datum/callback/on_consume
+ )
+
+ . = ..()
+ src.bite_consumption = bite_consumption
+ src.food_flags = food_flags
+ src.foodtypes = foodtypes
+ src.eat_time = eat_time
+ src.eatverbs = eatverbs
+ src.junkiness = junkiness
+ src.pre_eat = pre_eat
+ src.on_compost = on_compost
+ src.after_eat = after_eat
+ src.on_consume = on_consume
+
+/datum/component/edible/Destroy(force)
+ QDEL_NULL(pre_eat)
+ QDEL_NULL(on_compost)
+ QDEL_NULL(after_eat)
+ QDEL_NULL(on_consume)
+ return ..()
+
+/datum/component/edible/proc/examine(datum/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ if(!(food_flags & FOOD_IN_CONTAINER))
+ switch (bitecount)
+ if (0)
+ return
+ if(1)
+ examine_list += "[parent] was bitten by someone!"
+ if(2,3)
+ examine_list += "[parent] was bitten [bitecount] times!"
+ else
+ examine_list += "[parent] was bitten multiple times!"
+
+/datum/component/edible/proc/use_from_hand(obj/item/source, mob/living/M, mob/living/user)
+ SIGNAL_HANDLER
+
+ return TryToEat(M, user)
+
+/datum/component/edible/proc/on_fried(fry_object)
+ SIGNAL_HANDLER
+ var/atom/our_atom = parent
+ our_atom.reagents.trans_to(fry_object, our_atom.reagents.total_volume)
+ qdel(our_atom)
+ return COMSIG_FRYING_HANDLED
+
+///Called when food is created through processing (Usually this means it was sliced). We use this to pass the OG items reagents.
+/datum/component/edible/proc/on_processed(datum/source, atom/original_atom, list/chosen_processing_option)
+ SIGNAL_HANDLER
+
+ if(!original_atom.reagents)
+ return
+
+ var/atom/this_food = parent
+ var/reagents_for_slice = chosen_processing_option[TOOL_PROCESSING_AMOUNT]
+
+ this_food.create_reagents(volume) //Make sure we have a reagent container
+
+ original_atom.reagents.trans_to(this_food, reagents_for_slice)
+
+ if(original_atom.name != initial(original_atom.name))
+ this_food.name = "slice of [original_atom.name]"
+ if(original_atom.desc != initial(original_atom.desc))
+ this_food.desc = "[original_atom.desc]"
+
+///Called when food is crafted through a crafting recipe datum.
+/datum/component/edible/proc/on_craft(datum/source, list/parts_list, datum/crafting_recipe/food/recipe)
+ SIGNAL_HANDLER
+
+ var/atom/this_food = parent
+
+ this_food.reagents.clear_reagents()
+
+ for(var/obj/item/crafted_part in this_food.contents)
+ crafted_part.reagents?.trans_to(this_food.reagents, crafted_part.reagents.maximum_volume, CRAFTED_FOOD_INGREDIENT_REAGENT_MODIFIER)
+
+ var/list/objects_to_delete = list()
+
+ // Remove all non recipe objects from the contents
+ for(var/content_object in this_food.contents)
+ for(var/recipe_object in recipe.real_parts)
+ if(istype(content_object, recipe_object))
+ continue
+ objects_to_delete += content_object
+
+ QDEL_LIST(objects_to_delete)
+
+ for(var/r_id in initial_reagents)
+ var/amount = initial_reagents[r_id] * CRAFTED_FOOD_BASE_REAGENT_MODIFIER
+ if(r_id == /datum/reagent/consumable/nutriment || r_id == /datum/reagent/consumable/nutriment/vitamin)
+ this_food.reagents.add_reagent(r_id, amount, tastes)
+ else
+ this_food.reagents.add_reagent(r_id, amount)
+
+ SSblackbox.record_feedback("tally", "food_made", 1, type)
+
+/datum/component/edible/proc/on_microwaved(datum/source, obj/machinery/microwave/used_microwave)
+ SIGNAL_HANDLER
+
+ var/turf/parent_turf = get_turf(parent)
+
+ if(!microwaved_type)
+ new /obj/item/reagent_containers/food/snacks/badrecipe(parent_turf)
+ qdel(src)
+ return
+
+
+ var/obj/item/result
+
+ result = new microwaved_type(parent_turf)
+
+ var/efficiency = istype(used_microwave) ? used_microwave.efficiency : 1
+
+ SEND_SIGNAL(result, COMSIG_ITEM_MICROWAVE_COOKED, parent, efficiency)
+
+ SSblackbox.record_feedback("tally", "food_made", 1, result.type)
+
+///Corrects the reagents on the newly cooked food
+/datum/component/edible/proc/on_microwave_cooked(datum/source, obj/item/source_item, cooking_efficiency = 1)
+ SIGNAL_HANDLER
+
+ var/atom/this_food = parent
+
+ this_food.reagents.clear_reagents()
+
+ source_item.reagents?.trans_to(this_food, source_item.reagents.total_volume)
+
+ for(var/r_id in initial_reagents)
+ var/amount = initial_reagents[r_id] * cooking_efficiency * CRAFTED_FOOD_BASE_REAGENT_MODIFIER
+ if(r_id == /datum/reagent/consumable/nutriment || r_id == /datum/reagent/consumable/nutriment/vitamin)
+ this_food.reagents.add_reagent(r_id, amount, tastes)
+ else
+ this_food.reagents.add_reagent(r_id, amount)
+
+///Makes sure the thing hasn't been destroyed or fully eaten to prevent eating phantom edibles
+/datum/component/edible/proc/IsFoodGone(atom/owner, mob/living/feeder)
+ if(QDELETED(owner)|| !(IS_EDIBLE(owner)))
+ return TRUE
+ if(owner.reagents.total_volume)
+ return FALSE
+ return TRUE
+
+/// Normal time to forcefeed someone something
+#define EAT_TIME_FORCE_FEED (3 SECONDS)
+
+///All the checks for the act of eating itself and
+/datum/component/edible/proc/TryToEat(mob/living/eater, mob/living/feeder)
+
+ set waitfor = FALSE // We might end up sleeping here, so we don't want to hold up anything
+
+ var/atom/owner = parent
+
+ if(feeder.a_intent == INTENT_HARM)
+ return
+
+ . = COMPONENT_CANCEL_ATTACK_CHAIN //Point of no return I suppose
+
+ if(IsFoodGone(owner, feeder))
+ return
+
+ if(!CanConsume(eater, feeder))
+ return
+ var/fullness = eater.nutrition + 10 //The theoretical fullness of the person eating if they were to eat this
+
+ var/time_to_eat = (eater = feeder) ? eat_time : EAT_TIME_FORCE_FEED
+
+ if(eater == feeder)//If you're eating it yourself.
+ if(eat_time && !do_after(feeder, time_to_eat, eater, timed_action_flags = food_flags & FOOD_FINGER_FOOD ? IGNORE_USER_LOC_CHANGE | IGNORE_TARGET_LOC_CHANGE : NONE)) //Gotta pass the minimal eat time
+ return
+ if(IsFoodGone(owner, feeder))
+ return
+ var/eatverb = pick(eatverbs)
+
+ if(junkiness && eater.satiety < -150 && eater.nutrition > NUTRITION_LEVEL_STARVING + 50 && !HAS_TRAIT(eater, TRAIT_VORACIOUS))
+ to_chat(eater, "You don't feel like eating any more junk food at the moment!")
+ return
+ else if(fullness <= 50)
+ eater.visible_message("[eater] hungrily [eatverb]s \the [parent], gobbling it down!", "You hungrily [eatverb] \the [parent], gobbling it down!")
+ else if(fullness > 50 && fullness < 150)
+ eater.visible_message("[eater] hungrily [eatverb]s \the [parent].", "You hungrily [eatverb] \the [parent].")
+ else if(fullness > 150 && fullness < 500)
+ eater.visible_message("[eater] [eatverb]s \the [parent].", "You [eatverb] \the [parent].")
+ else if(fullness > 500 && fullness < 600)
+ eater.visible_message("[eater] unwillingly [eatverb]s a bit of \the [parent].", "You unwillingly [eatverb] a bit of \the [parent].")
+ else if(fullness > (600 * (1 + eater.overeatduration / 2000))) // The more you eat - the more you can eat
+ eater.visible_message("[eater] cannot force any more of \the [parent] to go down [eater.p_their()] throat!", "You cannot force any more of \the [parent] to go down your throat!")
+ return
+
+
+
+
+
+ else //If you're feeding it to someone else.
+ if(isbrain(eater))
+ to_chat(feeder, "[eater] doesn't seem to have a mouth!")
+ return
+ if(fullness <= (600 * (1 + eater.overeatduration / 1000)))
+ eater.visible_message(
+ "[feeder] attempts to feed [eater] [parent].", \
+ "[feeder] attempts to feed you [parent]."
+ )
+ if(eater.is_blind())
+ to_chat(eater, "You feel someone trying to feed you something!")
+ else
+ eater.visible_message(
+ "[feeder] cannot force any more of [parent] down [eater]'s throat!", \
+ "[feeder] cannot force any more of [parent] down your throat!"
+ )
+ if(eater.is_blind())
+ to_chat(eater, "You're too full to eat what's being fed to you!")
+ return
+ if(!do_after(feeder, delay = time_to_eat, target = eater)) //Wait 3 seconds before you can feed
+ return
+ if(IsFoodGone(owner, feeder))
+ return
+ log_combat(feeder, eater, "fed", owner.reagents.log_list())
+ eater.visible_message(
+ "[feeder] forces [eater] to eat [parent]!", \
+ "[feeder] forces you to eat [parent]!"
+ )
+ if(eater.is_blind())
+ to_chat(eater, "You're forced to eat something!")
+
+ TakeBite(eater, feeder)
+
+ //If we're not force-feeding, try take another bite
+ if(eater == feeder && eat_time)
+ INVOKE_ASYNC(src, PROC_REF(TryToEat), eater, feeder)
+
+#undef EAT_TIME_FORCE_FEED
+
+///This function lets the eater take a bite and transfers the reagents to the eater.
+/datum/component/edible/proc/TakeBite(mob/living/eater, mob/living/feeder)
+
+ var/atom/owner = parent
+
+ if(!owner?.reagents)
+ return FALSE
+ if(eater.satiety > -200)
+ eater.satiety -= junkiness
+ playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE)
+ if(!owner.reagents.total_volume)
+ return
+ SEND_SIGNAL(parent, COMSIG_FOOD_EATEN, eater, feeder, bitecount, bite_consumption)
+ var/fraction = min(bite_consumption / owner.reagents.total_volume, 1)
+ owner.reagents.trans_to(eater, bite_consumption, transfered_by = feeder, method = INGEST)
+ bitecount++
+ check_liked(fraction, eater)
+ if(!owner.reagents.total_volume)
+ on_consume(eater, feeder)
+
+ //Invoke our after eat callback if it is valid
+ if(after_eat)
+ after_eat.Invoke(eater, feeder, bitecount)
+
+ return TRUE
+
+///Checks if we can compost something, and handles it
+/datum/component/edible/proc/compost(mob/living/user)
+ SIGNAL_HANDLER
+ if(on_compost && !on_compost.Invoke(user))
+ return COMPONENT_EDIBLE_BLOCK_COMPOST
+
+///Checks whether or not the eater can actually consume the food
+/datum/component/edible/proc/CanConsume(mob/living/eater, mob/living/feeder)
+ if(!iscarbon(eater))
+ return FALSE
+ if(pre_eat && !pre_eat.Invoke(eater, feeder))
+ return FALSE
+ var/mob/living/carbon/C = eater
+ var/covered = ""
+ if(C.is_mouth_covered(head_only = 1))
+ covered = "headgear"
+ else if(C.is_mouth_covered(mask_only = 1))
+ covered = "mask"
+ if(covered)
+ var/who = (isnull(feeder) || eater == feeder) ? "your" : "[eater.p_their()]"
+ to_chat(feeder, "You have to remove [who] [covered] first!")
+ return FALSE
+ return TRUE
+
+///Check foodtypes to see if we should send a moodlet
+/datum/component/edible/proc/check_liked(fraction, mob/eater)
+ if(last_check_time + 50 > world.time)
+ return FALSE
+ if(!ishuman(eater))
+ return FALSE
+ var/mob/living/carbon/human/human_eater = eater
+ var/obj/item/organ/tongue/tongue = human_eater.getorganslot(ORGAN_SLOT_TONGUE)
+ if((foodtypes & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
+ if(HAS_TRAIT(human_eater, TRAIT_AGEUSIA))
+ if(foodtypes & tongue.toxic_food)
+ to_chat(human_eater, "You don't feel so good...")
+ human_eater.adjust_disgust(25 + 30 * fraction)
+ else
+ if(foodtypes & tongue.toxic_food)
+ to_chat(human_eater,"What the hell was that thing?!")
+ human_eater.adjust_disgust(25 + 30 * fraction)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food)
+ else if(foodtypes & tongue.disliked_food)
+ to_chat(human_eater,"That didn't taste very good...")
+ human_eater.adjust_disgust(11 + 15 * fraction)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
+ else if(foodtypes & tongue.liked_food)
+ to_chat(human_eater,"I love this taste!")
+ human_eater.adjust_disgust(-5 + -2.5 * fraction)
+ SEND_SIGNAL(human_eater, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food)
+ last_check_time = world.time
+
+///Delete the item when it is fully eaten
+/datum/component/edible/proc/on_consume(mob/living/eater, mob/living/feeder)
+ SEND_SIGNAL(parent, COMSIG_FOOD_CONSUMED, eater, feeder)
+
+ on_consume?.Invoke(eater, feeder)
+
+ if(isturf(parent))
+ var/turf/T = parent
+ T.ScrapeAway(1, CHANGETURF_INHERIT_AIR)
+ else
+ qdel(parent)
+
+///Ability to feed food to puppers
+/datum/component/edible/proc/use_by_animal(datum/source, mob/user)
+ SIGNAL_HANDLER
+ var/atom/owner = parent
+
+ if(!isdog(user))
+ return
+ var/mob/living/L = user
+ if(bitecount == 0 || prob(50))
+ L.manual_emote("nibbles away at \the [parent].")
+ bitecount++
+ . = COMPONENT_CANCEL_ATTACK_CHAIN
+ L.taste(owner.reagents) // why should carbons get all the fun?
+ if(bitecount >= 5)
+ var/satisfaction_text = pick("burps from enjoyment.", "yaps for more!", "woofs twice.", "looks at the area where \the [parent] was.")
+ L.manual_emote(satisfaction_text)
+ qdel(parent)
diff --git a/code/datums/elements/food/food_trash.dm b/code/datums/elements/food/food_trash.dm
new file mode 100644
index 00000000000..6c484c414a0
--- /dev/null
+++ b/code/datums/elements/food/food_trash.dm
@@ -0,0 +1,40 @@
+// If an item has the food_trash element it will drop an item when it is consumed.
+/datum/element/food_trash
+ element_flags = ELEMENT_BESPOKE
+ id_arg_index = 2
+ /// The type of trash that is spawned by this element
+ var/trash
+ ///Flags of the trash element that change its behavior UNUSED UNTIL PART 2
+ //var/flags
+ ///Generate trash proc path
+ var/generate_trash_procpath
+
+/datum/element/food_trash/Attach(datum/target, atom/trash, flags, generate_trash_proc)
+ . = ..()
+ if(!isatom(target))
+ return ELEMENT_INCOMPATIBLE
+ src.trash = trash
+ //src.flags = flags
+ RegisterSignal(target, COMSIG_FOOD_CONSUMED, PROC_REF(generate_trash))
+ if(!generate_trash_procpath && generate_trash_proc)
+ generate_trash_procpath = generate_trash_proc
+
+/datum/element/food_trash/Detach(datum/target)
+ . = ..()
+ UnregisterSignal(target, COMSIG_FOOD_CONSUMED)
+
+/datum/element/food_trash/proc/generate_trash(datum/source, mob/living/eater, mob/living/feeder)
+ SIGNAL_HANDLER
+
+ ///cringy signal_handler shouldnt be needed if you dont want to return but oh well
+ INVOKE_ASYNC(src, PROC_REF(async_generate_trash), source)
+
+/datum/element/food_trash/proc/async_generate_trash(datum/source)
+ var/atom/edible_object = source
+
+ var/obj/item/trash_item = generate_trash_procpath ? call(source, generate_trash_procpath)() : new trash(edible_object.drop_location())
+
+ if(isliving(edible_object.loc))
+ var/mob/living/food_holding_mob = edible_object.loc
+ food_holding_mob.dropItemToGround(edible_object)
+ food_holding_mob.put_in_hands(trash_item)
diff --git a/code/datums/elements/food/processable.dm b/code/datums/elements/food/processable.dm
new file mode 100644
index 00000000000..503e5169c87
--- /dev/null
+++ b/code/datums/elements/food/processable.dm
@@ -0,0 +1,47 @@
+// If an item has the processable item, it can be processed into another item with a specific tool. This adds generic behavior for those actions to make it easier to set-up generically.
+/datum/element/processable
+ element_flags = ELEMENT_BESPOKE
+ id_arg_index = 2
+ ///The type of atom this creates when the processing recipe is used.
+ var/result_atom_type
+ ///The tool behaviour for this processing recipe
+ var/tool_behaviour
+ ///Time to process the atom
+ var/time_to_process
+ ///Amount of the resulting actor this will create
+ var/amount_created
+ ///Whether or not the atom being processed has to be on a table or tray to process it
+ var/table_required
+
+/datum/element/processable/Attach(datum/target, tool_behaviour, result_atom_type, amount_created = 3, time_to_process = 20, table_required = FALSE)
+ . = ..()
+ if(!isatom(target))
+ return ELEMENT_INCOMPATIBLE
+
+ src.tool_behaviour = tool_behaviour
+ src.amount_created = amount_created
+ src.time_to_process = time_to_process
+ src.result_atom_type = result_atom_type
+ src.table_required = table_required
+
+ RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(tool_behaviour), PROC_REF(try_process))
+
+/datum/element/processable/Detach(datum/target)
+ . = ..()
+ UnregisterSignal(target, COMSIG_ATOM_TOOL_ACT(tool_behaviour))
+
+/datum/element/processable/proc/try_process(datum/source, mob/living/user, obj/item/I, list/mutable_recipes)
+ SIGNAL_HANDLER
+
+ if(table_required)
+ var/obj/item/found_item = source
+ var/found_location = found_item.loc
+ var/found_turf = isturf(found_location)
+ var/found_table = locate(/obj/structure/table) in found_location
+ var/found_tray = locate(/obj/item/storage/bag/tray) in found_location
+ if(!found_turf && !istype(found_location, /obj/item/storage/bag/tray) || found_turf && !(found_table || found_tray))
+ to_chat(user, "You cannot make that here! You need a table or at least a tray.")
+ return
+
+ mutable_recipes += list(list(TOOL_PROCESSING_RESULT = result_atom_type, TOOL_PROCESSING_AMOUNT = amount_created, TOOL_PROCESSING_TIME = time_to_process))
+ return COMPONENT_NO_AFTERATTACK
diff --git a/code/datums/elements/plant_backfire.dm b/code/datums/elements/plant_backfire.dm
new file mode 100644
index 00000000000..47cd1de51fe
--- /dev/null
+++ b/code/datums/elements/plant_backfire.dm
@@ -0,0 +1,125 @@
+/// -- Plant backfire element --
+/// Certain high-danger plants, like death-nettles, will backfire and harm the holder if they're not properly protected.
+/// If a user is protected with something like leather gloves, they can handle them normally.
+/// If they're not protected properly, we invoke a callback on the user, harming or inconveniencing them.
+/datum/element/plant_backfire
+ element_flags = ELEMENT_BESPOKE
+ id_arg_index = 2
+ /// Whether we stop the current action if backfire is triggered (EX: returning CANCEL_ATTACK_CHAIN)
+ var/cancel_action = FALSE
+ /// Any extra traits we want to check in addition to TRAIT_PLANT_SAFE. Mobs with a trait in this list will be considered safe. List of traits.
+ var/extra_traits
+ /// Any plant genes we want to check that are required for our plant to be dangerous. Plants without a gene in this list will be considered safe. List of typepaths.
+ var/extra_genes
+
+/datum/element/plant_backfire/Attach(datum/target, cancel_action = FALSE, extra_traits, extra_genes)
+ . = ..()
+ if(!isitem(target))
+ return ELEMENT_INCOMPATIBLE
+
+ src.cancel_action = cancel_action
+ src.extra_traits = extra_traits
+ src.extra_genes = extra_genes
+
+ RegisterSignal(target, COMSIG_ITEM_PRE_ATTACK, PROC_REF(attack_safety_check))
+ RegisterSignal(target, COMSIG_ITEM_PICKUP, PROC_REF(pickup_safety_check))
+ RegisterSignal(target, COMSIG_MOVABLE_PRE_THROW, PROC_REF(throw_safety_check))
+
+/datum/element/plant_backfire/Detach(datum/target)
+ . = ..()
+ UnregisterSignal(target, list(COMSIG_ITEM_PRE_ATTACK, COMSIG_ITEM_PICKUP, COMSIG_MOVABLE_PRE_THROW))
+
+/**
+ * Checks before we attack if we're okay to continue.
+ *
+ * source - our plant
+ * user - the mob wielding our [source]
+ */
+/datum/element/plant_backfire/proc/attack_safety_check(obj/item/source, atom/target, mob/user)
+ SIGNAL_HANDLER
+
+ // Covers stuff like tk, since we aren't actually touching the plant.
+ if(!user.is_holding(source))
+ return
+ if(!backfire(source, user))
+ return
+
+ return //cancel_action ? COMPONENT_CANCEL_ATTACK_CHAIN : NONE
+
+/**
+ * Checks before we pick up the plant if we're okay to continue.
+ *
+ * source - our plant
+ * user - the mob picking our [source]
+ */
+/datum/element/plant_backfire/proc/pickup_safety_check(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ backfire(source, user)
+
+/**
+ * Checks before we throw the plant if we're okay to continue.
+ *
+ * source - our plant
+ * thrower - the mob throwing our [source]
+ */
+/datum/element/plant_backfire/proc/throw_safety_check(obj/item/source, list/arguments)
+ SIGNAL_HANDLER
+
+ var/mob/living/thrower = arguments[4] // the 4th arg = the mob throwing our item
+ if(!istype(thrower) || !thrower.is_holding(source))
+ return
+ if(!backfire(source, thrower))
+ return
+
+ return //cancel_action ? COMPONENT_CANCEL_ATTACK_CHAIN : NONE
+
+/**
+ * The actual backfire occurs here.
+ * Checks if the user is able to safely handle the plant.
+ * If not, sends the backfire signal (meaning backfire will occur and be handled by one or multiple genes).
+ *
+ * Returns FALSE if the user was safe and no backfire occured.
+ * Returns TRUE if the user was not safe and a backfire actually happened.
+ */
+/datum/element/plant_backfire/proc/backfire(obj/item/plant, mob/user)
+ if(plant_safety_check(plant, user))
+ return FALSE
+
+ SEND_SIGNAL(plant, COMSIG_PLANT_ON_BACKFIRE, user)
+ return TRUE
+
+/**
+ * Actually checks if our user is safely handling our plant.
+ *
+ * Checks for TRAIT_PLANT_SAFE, and returns TRUE if we have it.
+ * Then, any extra traits we need to check (Like TRAIT_PIERCEIMMUNE for nettles) and returns TRUE if we have one of them.
+ * Then, any extra genes we need to check (Like liquid contents for bluespace tomatos) and returns TRUE if we don't have the gene.
+ *
+ * source - our plant
+ * user - the carbon handling our [source]
+ *
+ * returns FALSE if none of the checks are successful.
+ */
+/datum/element/plant_backfire/proc/plant_safety_check(obj/item/plant, mob/living/carbon/user)
+ if(!istype(user))
+ return TRUE
+
+ if(HAS_TRAIT(user, TRAIT_PLANT_SAFE))
+ return TRUE
+
+ for(var/checked_trait in extra_traits)
+ if(HAS_TRAIT(user, checked_trait))
+ return TRUE
+
+ var/obj/item/seeds/our_seed = plant.get_plant_seed()
+ if(our_seed)
+ for(var/checked_gene in extra_genes)
+ if(!our_seed.get_gene(checked_gene))
+ return TRUE
+
+ for(var/obj/item/clothing/worn_item in user.get_equipped_items())
+ if((worn_item.body_parts_covered & HANDS) && (worn_item.clothing_flags & THICKMATERIAL))
+ return TRUE
+
+ return FALSE
diff --git a/code/datums/elements/point_of_interest.dm b/code/datums/elements/point_of_interest.dm
new file mode 100644
index 00000000000..d64ee5466ac
--- /dev/null
+++ b/code/datums/elements/point_of_interest.dm
@@ -0,0 +1,22 @@
+/// Designates the atom as a "point of interest", meaning it can be directly orbited
+/datum/element/point_of_interest
+ element_flags = ELEMENT_DETACH
+
+/datum/element/point_of_interest/Attach(datum/target)
+ if (!isatom(target))
+ return ELEMENT_INCOMPATIBLE
+
+ /*
+ // New players are abstract mobs assigned to people who are still in the lobby screen.
+ // As a result, they are not a valid POI and should never be a valid POI. If they
+ // somehow get this element attached to them, there's something we need to debug.
+ if(isnewplayer(target))
+ return ELEMENT_INCOMPATIBLE
+ */
+
+ SSpoints_of_interest.on_poi_element_added(target)
+ return ..()
+
+/datum/element/point_of_interest/Detach(datum/target)
+ SSpoints_of_interest.on_poi_element_removed(target)
+ return ..()
diff --git a/code/datums/elements/tool_bang.dm b/code/datums/elements/tool_bang.dm
new file mode 100644
index 00000000000..bc002e936de
--- /dev/null
+++ b/code/datums/elements/tool_bang.dm
@@ -0,0 +1,40 @@
+/**
+ * Tool bang bespoke element
+ *
+ * Bang the user when using this tool
+ */
+/datum/element/tool_bang
+ element_flags = ELEMENT_BESPOKE
+ id_arg_index = 2
+ /// Strength of the bang
+ var/bang_strength
+
+/datum/element/tool_bang/Attach(datum/target, bang_strength)
+ . = ..()
+ if(!isitem(target))
+ return ELEMENT_INCOMPATIBLE
+
+ src.bang_strength = bang_strength
+
+ RegisterSignal(target, COMSIG_TOOL_IN_USE, PROC_REF(prob_bang))
+ RegisterSignal(target, COMSIG_TOOL_START_USE, PROC_REF(bang))
+
+/datum/element/tool_bang/Detach(datum/source, force)
+ . = ..()
+ UnregisterSignal(source, list(COMSIG_TOOL_IN_USE, COMSIG_TOOL_START_USE))
+
+/datum/element/tool_bang/proc/prob_bang(datum/source, mob/living/user)
+ SIGNAL_HANDLER
+
+ if(prob(90))
+ return
+ bang(source, user)
+
+/datum/element/tool_bang/proc/bang(datum/source, mob/living/user)
+ SIGNAL_HANDLER
+
+ if(user && get_dist(get_turf(source), get_turf(user)) <= 1)
+ if(istype(user, /mob/living/carbon))
+ var/mob/living/carbon/carbon = user
+ carbon.soundbang_act(min(bang_strength,1), 0, 1, 5)
+
diff --git a/code/datums/elements/world_icon.dm b/code/datums/elements/world_icon.dm
index bcb0129c6c6..31e52ee7677 100644
--- a/code/datums/elements/world_icon.dm
+++ b/code/datums/elements/world_icon.dm
@@ -103,7 +103,7 @@
SIGNAL_HANDLER
if(!world_icon_state)
- source.icon_state = source.icon_state
+ source.icon_state = source.item_state
return
INVOKE_ASYNC(src, PROC_REF(check_world_icon_state), source)
diff --git a/code/datums/ert.dm b/code/datums/ert.dm
deleted file mode 100644
index 0c5227e4107..00000000000
--- a/code/datums/ert.dm
+++ /dev/null
@@ -1,290 +0,0 @@
-/datum/ert
- var/mobtype = /mob/living/carbon/human
- var/team = /datum/team/ert
- var/opendoors = FALSE
- var/leader_role = /datum/antagonist/ert/commander
- var/enforce_human = FALSE
- var/roles = list(/datum/antagonist/ert/security, /datum/antagonist/ert/medic, /datum/antagonist/ert/engineer) //List of possible roles to be assigned to ERT members.
- var/rename_team
- var/code
- var/mission = "Assist your employers in achieving their goals. Protect corporate assets."
- var/teamsize = 5
- var/polldesc
- /// If TRUE, gives the team members "[role] [random last name]" style names
- var/random_names = FALSE
- /// If TRUE, special slots (that are not the leader) will use a predefined limit
- var/limit_slots = FALSE
- /// If TRUE, the admin who created the response team will be spawned in the briefing room (or in the shuttle) in their preferred briefing outfit (assuming they're a ghost)
- var/spawn_admin = FALSE
- /// If TRUE, we try and pick one of the most experienced players who volunteered to fill the leader slot
- var/leader_experience = TRUE
- /// A custom map template to spawn the ERT at. If use_custom_shuttle is FALSE, the ERT will spawn on foot. By default, a Kunai-Class.
- var/datum/map_template/ert_template = /datum/map_template/shuttle/subshuttles/kunai
- /// If we should actually _use_ the ert_template custom shuttle
- var/use_custom_shuttle = TRUE
- /// If TRUE, the ERT will spawn at the outpost. If use_custom_shuttle is also TRUE, the shuttle will be docked at the outpost
- var/spawn_at_outpost = TRUE
-
-// Nanotrasen
-
-/datum/ert/New()
- if (!polldesc)
- polldesc = "a Code [code] Nanotrasen Emergency Response Team"
-
-/datum/ert/blue
- opendoors = FALSE
- code = "Blue"
-
-/datum/ert/amber
- code = "Amber"
-
-/datum/ert/red
- leader_role = /datum/antagonist/ert/commander/red
- roles = list(/datum/antagonist/ert/security/red, /datum/antagonist/ert/medic/red, /datum/antagonist/ert/engineer/red)
- code = "Red"
-
-/datum/ert/deathsquad
- roles = list(/datum/antagonist/ert/deathsquad)
- leader_role = /datum/antagonist/ert/deathsquad/leader
- rename_team = "Deathsquad"
- code = "Delta"
- mission = "Leave no witnesses."
- polldesc = "an elite Nanotrasen Strike Team"
-
-/datum/ert/marine
- leader_role = /datum/antagonist/ert/marine
- roles = list(/datum/antagonist/ert/marine/security, /datum/antagonist/ert/marine/engineer = 1, /datum/antagonist/ert/marine/medic = 1)
- rename_team = "Marine Squad"
- polldesc = "an 'elite' Nanotrasen Strike Team"
- opendoors = FALSE
-
-/datum/ert/centcom_official
- code = "Green"
- teamsize = 1
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/official
- roles = list(/datum/antagonist/ert/official)
- rename_team = "CentCom Officials"
- polldesc = "a CentCom Official"
- random_names = FALSE
- leader_experience = FALSE
- spawn_at_outpost = FALSE
- ert_template = /datum/map_template/shuttle/subshuttles/ancon
-
-/datum/ert/centcom_official/New()
- mission = "Conduct a routine review of [station_name()]'s vessels."
-
-/datum/ert/janitor
- roles = list(/datum/antagonist/ert/janitor, /datum/antagonist/ert/janitor/heavy)
- leader_role = /datum/antagonist/ert/janitor/heavy
- teamsize = 4
- opendoors = FALSE
- rename_team = "Janitor"
- mission = "Clean up EVERYTHING."
- polldesc = "a Nanotrasen Janitorial Response Team"
-
-/datum/ert/intern
- roles = list(/datum/antagonist/ert/intern)
- leader_role = /datum/antagonist/ert/intern/leader
- teamsize = 7
- opendoors = FALSE
- spawn_at_outpost = FALSE
- rename_team = "Horde of Interns"
- mission = "Assist in conflict resolution."
- polldesc = "an unpaid internship opportunity with Nanotrasen"
- ert_template = /datum/map_template/shuttle/subshuttles/ancon
-
-/datum/ert/intern/unarmed
- roles = list(/datum/antagonist/ert/intern/unarmed)
- leader_role = /datum/antagonist/ert/intern/leader/unarmed
- rename_team = "Unarmed Horde of Interns"
-
-/datum/ert/loss_prevention
- code = "Light Blue"
- teamsize = 4
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/lp/lieutenant
- roles = list(/datum/antagonist/ert/lp, /datum/antagonist/ert/lp/medic = 1, /datum/antagonist/ert/lp/engineer = 1)
- rename_team = "Loss Prevention Team"
- polldesc = "a Nanotrasen loss prevention team"
-
-// Inteq
-
-/datum/ert/inteq
- teamsize = 4
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/inteq/leader
- roles = list(/datum/antagonist/ert/inteq)
- mission = "Carry out your contract."
- rename_team = "Generic Inteq Team"
- polldesc = "an Inteq emergency team"
- ert_template = /datum/map_template/shuttle/subshuttles/anvil
-
-// SolGov
-
-/datum/ert/solgov
- teamsize = 4
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/solgov
- roles = list(/datum/antagonist/ert/solgov)
- mission = "Intervene in Solarian interests."
- rename_team = "SolGov Sonnensoldner Team"
- polldesc = "a SolGov mercenary team"
-
-/datum/ert/solgov/inspector
- teamsize = 1
- leader_role = /datum/antagonist/ert/official/solgov
- roles = list(/datum/antagonist/ert/official/solgov)
- rename_team = "SolGov Inspector"
- polldesc = "a solarian inspector"
- spawn_at_outpost = FALSE
-
-/datum/ert/solgov/inspector/New()
- mission = "Conduct a routine review on [station_name()]'s vessels."
-
-// CLIP
-
-/datum/ert/minutemen
- teamsize = 5
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/minutemen/leader
- /// TODO: figure out a way to fill in at least one rifleman first
- roles = list(/datum/antagonist/ert/minutemen, /datum/antagonist/ert/minutemen/corpsman = 1, /datum/antagonist/ert/minutemen/engi = 1, /datum/antagonist/ert/minutemen/gunner = 1)
- mission = "Keep the peace in sector affairs"
- rename_team = "CLIP Minutemen Squadron"
- polldesc = "a CLIP Minutemen squadron"
- ert_template = /datum/map_template/shuttle/subshuttles/crux
-
-//quick infantry - for use when you need to throw minutemen somewhere fast but dont want ANY preperation at all
-/datum/ert/minutemen/quick
- teamsize = 4
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/minutemen/leader
- roles = list(/datum/antagonist/ert/minutemen)
- mission = "Resolve the conflict at hand"
- polldesc = "a CLIP Minutemen emergency team"
- random_names = TRUE
-
-
-/datum/ert/minutemen/bard
- leader_role = /datum/antagonist/ert/minutemen/bard/leader
- roles = list(/datum/antagonist/ert/minutemen/bard, /datum/antagonist/ert/minutemen/bard/medic = 1, /datum/antagonist/ert/minutemen/bard/flamer = 1)
- rename_team = "CLIP Minutemen BARD Squadron"
- polldesc = "a CLIP Minutemen biohazard removal team"
-
-/datum/ert/minutemen/riot
- teamsize = 6
- leader_role = /datum/antagonist/ert/minutemen/riot/leader
- roles = list(/datum/antagonist/ert/minutemen/riot)
- rename_team = "CLIP Minutemen Riot Control Squadron"
- polldesc = "a CLIP Minutemen riot control team"
-
-/datum/ert/minutemen/eva
- leader_role = /datum/antagonist/ert/minutemen/eva/leader
- roles = list(/datum/antagonist/ert/minutemen/eva)
-
-/datum/ert/minutemen/inspector
- teamsize = 1
- leader_role = /datum/antagonist/ert/official/minutemen
- roles = list(/datum/antagonist/ert/official/minutemen)
- rename_team = "CLIP Minutemen GOLD Inspector"
- polldesc = "a CLIP Minutemen inspector"
-
-// Syndicate
-
-/datum/ert/syndicate
- teamsize = 4
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/syndicate/leader
- roles = list(/datum/antagonist/ert/syndicate)
- mission = "Serve the interests of the Syndicate."
- rename_team = "Generic Syndicate Team"
- polldesc = "a Syndicate emergency team"
- spawn_at_outpost = FALSE
-
-/datum/ert/syndicate/gorlex
- leader_role = /datum/antagonist/ert/syndicate/gorlex/leader
- roles = list(/datum/antagonist/ert/syndicate/gorlex, /datum/antagonist/ert/syndicate/gorlex/pointman = 1, /datum/antagonist/ert/syndicate/gorlex/medic = 1, /datum/antagonist/ert/syndicate/gorlex/sniper = 1)
- mission = "Serve the interests of the 2nd Battlegroup."
- rename_team = "2nd Battlegroup Squad"
- polldesc = "a loyalist Gorlex squad"
-
-/datum/ert/syndicate/cybersun
- leader_role = /datum/antagonist/ert/syndicate/cybersun/leader
- roles = list(/datum/antagonist/ert/syndicate/cybersun)
- mission = "Serve the interests of CyberSun."
- rename_team = "Cybersun Commando Team"
- polldesc = "a Cybersun Commando team"
-
-/datum/ert/syndicate/cybersun/medic
- leader_role = /datum/antagonist/ert/syndicate/cybersun/medic/leader
- roles = list(/datum/antagonist/ert/syndicate/cybersun/medic)
- mission = "Assist CyberSun clients."
- rename_team = "Cybersun Medical Intervention Team"
- polldesc = "a Cybersun paramedic team"
- ert_template = /datum/map_template/shuttle/subshuttles/runner
-
-/datum/ert/syndicate/inspector
- teamsize = 1
- leader_role = /datum/antagonist/ert/official/syndicate
- roles = list(/datum/antagonist/ert/official/syndicate)
- rename_team = "Syndicate Inspector"
- polldesc = "a syndicate inspector"
- spawn_at_outpost = FALSE
-
-/datum/ert/syndicate/inspector/New()
- mission = "Conduct a routine review on [station_name()]'s vessels."
-
-// Frontiersmen
-/datum/ert/frontier
- teamsize = 4
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/frontier/leader
- roles = list(/datum/antagonist/ert/frontier)
- rename_team = "Generic Frontiersmen Team"
- mission = "Pillage in the name of the Frontiersmen."
- polldesc = "an armed group of pirates"
- random_names = TRUE
- leader_experience = FALSE
- spawn_at_outpost = FALSE
- ert_template = /datum/map_template/shuttle/subshuttles/sugarcube
-
-/datum/ert/frontier/random
- teamsize = 8
- leader_role = /datum/antagonist/ert/frontier/random
- roles = list(/datum/antagonist/ert/frontier/random)
- rename_team = "Randomly Equipped Frontiersmen Team"
-
-/datum/ert/frontier/assault
- leader_role = /datum/antagonist/ert/frontier/leader
- roles = list(/datum/antagonist/ert/frontier/better, /datum/antagonist/ert/frontier/medic, /datum/antagonist/ert/frontier/engineer)
- rename_team = "Assault Frontiersmen Team"
- polldesc = "a well armed squad of pirates"
-
-/datum/ert/frontier/unarmed //use for finer control of pirate's armaments
- leader_role = /datum/antagonist/ert/frontier/leader/unnarmed
- roles = list(/datum/antagonist/ert/frontier/unnarmed)
- rename_team = "Unnarmed Frontiersmen Team"
- polldesc = "a custom squad of pirates"
-
-/datum/ert/independent
- teamsize = 3
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/independent
- roles = list(/datum/antagonist/ert/independent)
- rename_team = "Security Independent Team"
- polldesc = "an independent security team"
-
-/datum/ert/independent/emt
- teamsize = 4
- leader_role = /datum/antagonist/ert/independent/emt
- roles = list(/datum/antagonist/ert/independent/emt)
- rename_team = "Medical Independent Team"
- polldesc = "an independent medical response team"
-
-/datum/ert/independent/firefighter
- teamsize = 5
- leader_role = /datum/antagonist/ert/independent/firefighter/leader
- roles = list(/datum/antagonist/ert/independent/firefighter, /datum/antagonist/ert/independent/firefighter/medic)
- rename_team = "Independent Firefighter Team"
- polldesc = "an independent firefighting team"
diff --git a/code/datums/ert/_ert.dm b/code/datums/ert/_ert.dm
new file mode 100644
index 00000000000..3618d99dee2
--- /dev/null
+++ b/code/datums/ert/_ert.dm
@@ -0,0 +1,39 @@
+/datum/ert
+ var/mobtype = /mob/living/carbon/human
+ var/team = /datum/team/ert
+ // opens a special subtype of blastdoor. also a legacy setting that will probably not work with multiple outposts
+ var/opendoors = FALSE
+ var/leader_role = /datum/antagonist/ert/independent
+ // makes members spawn as humans. mostly a legacy setting but maybe you'll find it useful
+ var/enforce_human = FALSE
+ // list of possible roles to be assigned to ERT members. if it has a value (e.g. datum/antagonist/myspecialguy = 1), the role will be limited
+ var/roles = list(/datum/antagonist/ert/independent)
+ // this will appear in the end of round report and the antagonist team list
+ var/rename_team = "Emergency Response Team"
+ // this will be shown to the ERT members to be put in their memory
+ var/mission = "Make effective use of your tools."
+ // determines the size of the team. make sure there's enough size for all the special roles you may add
+ var/teamsize = 5
+ // this will be shown to ghosts as "Would you like to be considered for [polldesc]?"
+ var/polldesc = "an emergency response team"
+ /// If TRUE, gives the team members "[role] [random last name]" style names
+ var/random_names = FALSE
+ /// If TRUE, special slots (that are not the leader) will use a predefined limit
+ var/limit_slots = TRUE
+ /// If TRUE, the admin who created the response team will be spawned in the briefing room (or in the shuttle) in their preferred briefing outfit (assuming they're a ghost)
+ var/spawn_admin = FALSE
+ /// If TRUE, we try and pick one of the most experienced players who volunteered to fill the leader slot
+ var/leader_experience = TRUE
+ /// A custom map template to spawn the ERT at. If use_custom_shuttle is FALSE, the ERT will spawn on foot. By default, a Kunai-Class.
+ var/datum/map_template/ert_template = /datum/map_template/shuttle/subshuttles/kunai
+ /// If we should actually _use_ the ert_template custom shuttle
+ var/use_custom_shuttle = TRUE
+ /// If TRUE, the ERT will spawn at the outpost. If use_custom_shuttle is also TRUE, the shuttle will be docked at the outpost
+ var/spawn_at_outpost = TRUE
+ /// should we give the ERT access to the outpost
+ var/outpost_access = FALSE
+
+/datum/ert/New()
+ . = ..()
+ if(!polldesc)
+ polldesc = "uhm uhh uhmmmm"
diff --git a/code/datums/ert/ert_clip.dm b/code/datums/ert/ert_clip.dm
new file mode 100644
index 00000000000..79c4c7493ed
--- /dev/null
+++ b/code/datums/ert/ert_clip.dm
@@ -0,0 +1,59 @@
+/datum/ert/minutemen
+ teamsize = 5
+ leader_role = /datum/antagonist/ert/minutemen/leader
+ /// TODO: figure out a way to fill in at least one rifleman first
+ roles = list(/datum/antagonist/ert/minutemen, /datum/antagonist/ert/minutemen/corpsman = 1, /datum/antagonist/ert/minutemen/engi = 1, /datum/antagonist/ert/minutemen/gunner = 1)
+ mission = "Keep the peace in sector affairs."
+ rename_team = "CLIP Minutemen Infantry"
+ polldesc = "a CLIP Minutemen squadron"
+ ert_template = /datum/map_template/shuttle/subshuttles/crux
+
+/datum/ert/minutemen/eva
+ leader_role = /datum/antagonist/ert/minutemen/leader/eva
+ roles = list(/datum/antagonist/ert/minutemen/eva)
+
+/datum/ert/minutemen/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/minutemen/inspector
+ roles = list(/datum/antagonist/ert/minutemen/inspector)
+ rename_team = "CLIP Minutemen GOLD Inspector"
+ polldesc = "a CLIP Minutemen inspector"
+
+/datum/ert/minutemen/inspector/guarded
+ teamsize = 3
+ roles = list(/datum/antagonist/ert/minutemen/military_police)
+
+/datum/ert/minutemen/bard
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/minutemen/bard
+ roles = list(/datum/antagonist/ert/minutemen/bard)
+ rename_team = "BARD Biohazard Squadron"
+ polldesc = "a CLIP BARD biohazard team"
+
+/datum/ert/minutemen/bard/emergency
+ leader_role = /datum/antagonist/ert/minutemen/bard/emergency/leader
+ roles = list(/datum/antagonist/ert/minutemen/bard/emergency, /datum/antagonist/ert/minutemen/bard/medic = 1, /datum/antagonist/ert/minutemen/bard/flamer = 1)
+ rename_team = "BARD Emergency Squadron"
+ polldesc = "an emergency CLIP BARD team"
+
+/datum/ert/minutemen/military_police
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/minutemen/military_police/leader
+ roles = list(/datum/antagonist/ert/minutemen/military_police)
+ rename_team = "C-MM Military Police"
+ polldesc = "a C-MM military police team"
+
+/datum/ert/minutemen/military_police/riot
+ leader_role = /datum/antagonist/ert/minutemen/military_police/leader/riot
+ roles = list(/datum/antagonist/ert/minutemen/military_police/riot)
+ rename_team = "C-MM Riot Control Team"
+ polldesc = "a C-MM riot control team"
+
+/datum/ert/minutemen/journalist
+ teamsize = 3
+ leader_role = /datum/antagonist/ert/minutemen/correspondant
+ roles = list(/datum/antagonist/ert/minutemen/correspondant)
+ mission = "Inform the public of the frontier's news."
+ rename_team = "C-MM Correspondants"
+ polldesc = "a C-MM media team"
+ ert_template = /datum/map_template/shuttle/subshuttles/kunai
diff --git a/code/datums/ert/ert_frontiersmen.dm b/code/datums/ert/ert_frontiersmen.dm
new file mode 100644
index 00000000000..58934fa30a1
--- /dev/null
+++ b/code/datums/ert/ert_frontiersmen.dm
@@ -0,0 +1,36 @@
+/datum/ert/frontier
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/frontier/leader
+ roles = list(/datum/antagonist/ert/frontier)
+ rename_team = "Generic Frontiersmen Team"
+ mission = "Pillage in the name of the Frontiersmen."
+ polldesc = "a group of frontiersmen"
+ random_names = TRUE
+ leader_experience = FALSE
+ spawn_at_outpost = FALSE
+ ert_template = /datum/map_template/shuttle/subshuttles/brawler
+
+/datum/ert/frontier/unarmed // use for finer control of pirate's armaments
+ leader_role = /datum/antagonist/ert/frontier/leader/unarmed
+ roles = list(/datum/antagonist/ert/frontier/unarmed)
+ rename_team = "Unarmed Frontiersmen Team"
+
+/datum/ert/frontier/random
+ teamsize = 8 // the second takes the rifle and shoots
+ leader_role = /datum/antagonist/ert/frontier/random
+ roles = list(/datum/antagonist/ert/frontier/random)
+ rename_team = "Randomly Equipped Frontiersmen Team"
+
+/datum/ert/frontier/raiders
+ leader_role = /datum/antagonist/ert/frontier/leader
+ roles = list(/datum/antagonist/ert/frontier/skm, /datum/antagonist/ert/frontier/medic = 1, /datum/antagonist/ert/frontier/engineer = 1)
+ rename_team = "Assault Frontiersmen Team"
+ polldesc = "a well armed squad of pirates"
+
+/datum/ert/frontier/shock
+ teamsize = 6
+ leader_role = /datum/antagonist/ert/frontier/leader/heavy
+ roles = list(/datum/antagonist/ert/frontier/skm, /datum/antagonist/ert/frontier/sentry = 1, /datum/antagonist/ert/frontier/flamer = 1, /datum/antagonist/ert/frontier/medic/heavy = 1, /datum/antagonist/ert/frontier/engineer = 1)
+ rename_team = "Frontiersmen Shock Troops"
+ polldesc = "a frontiersmen shock troop squadron"
diff --git a/code/datums/ert/ert_gezena.dm b/code/datums/ert/ert_gezena.dm
new file mode 100644
index 00000000000..4e0057a567c
--- /dev/null
+++ b/code/datums/ert/ert_gezena.dm
@@ -0,0 +1,21 @@
+/datum/ert/gezena
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/gezena/leader
+ roles = list(/datum/antagonist/ert/gezena, /datum/antagonist/ert/gezena/gunner, /datum/antagonist/ert/gezena/medic, /datum/antagonist/ert/gezena/engineer)
+ rename_team = "Gezenan Heavy Response Team"
+ polldesc = "a PGF response team"
+ ert_template = /datum/map_template/shuttle/subshuttles/nail
+
+/datum/ert/gezena/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/gezena/inspector
+ roles = list(/datum/antagonist/ert/gezena/inspector)
+ rename_team = "Gezenan Federation Observer"
+ polldesc = "a PGF inspector"
+
+/datum/ert/gezena/inspector/guarded
+ teamsize = 3
+ roles = list(/datum/antagonist/ert/gezena)
+
+/datum/ert/gezena/inspector/New()
+ mission = "Conduct a routine review on [station_name()]'s Federation vessels."
diff --git a/code/datums/ert/ert_indies.dm b/code/datums/ert/ert_indies.dm
new file mode 100644
index 00000000000..a4fc323b9b8
--- /dev/null
+++ b/code/datums/ert/ert_indies.dm
@@ -0,0 +1,50 @@
+/datum/ert/independent
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/independent
+ roles = list(/datum/antagonist/ert/independent)
+ rename_team = "Security Independent Team"
+ polldesc = "an independent security team"
+
+/datum/ert/independent/emt
+ teamsize = 3
+ leader_role = /datum/antagonist/ert/independent/emt
+ roles = list(/datum/antagonist/ert/independent/emt)
+ rename_team = "Medical Independent Team"
+ polldesc = "an independent medical response team"
+
+/datum/ert/independent/emt/eva
+ leader_role = /datum/antagonist/ert/independent/emt/eva
+ roles = list(/datum/antagonist/ert/independent/emt/eva)
+
+/datum/ert/independent/firefighter
+ teamsize = 5
+ leader_role = /datum/antagonist/ert/independent/firefighter/leader
+ roles = list(/datum/antagonist/ert/independent/firefighter, /datum/antagonist/ert/independent/firefighter/medic)
+ rename_team = "Independent Firefighter Team"
+ polldesc = "an independent firefighting team"
+
+/datum/ert/independent/engineer
+ leader_role = /datum/antagonist/ert/independent/technician
+ roles = list(/datum/antagonist/ert/independent/technician)
+ rename_team = "Engineering Independent Team"
+ polldesc = "an independent engineering team"
+
+/datum/ert/independent/janitor
+ leader_role = /datum/antagonist/ert/independent/janitor
+ roles = list(/datum/antagonist/ert/independent/janitor)
+ rename_team = "Independent Janitorial Team"
+ polldesc = "an independent clean-up team"
+
+/datum/ert/independent/pizza
+ leader_role = /datum/antagonist/ert/independent/pizza
+ roles = list(/datum/antagonist/ert/independent/pizza)
+ rename_team = "Independent Pizza Delivery Team"
+ polldesc = "a pizza delivery job"
+
+/datum/ert/independent/deathsquad
+ teamsize = 2
+ leader_role = /datum/antagonist/ert/independent/deathsquad
+ roles = list(/datum/antagonist/ert/independent/deathsquad)
+ rename_team = "Death Commando Team"
+ polldesc = "a death squadron team"
diff --git a/code/datums/ert/ert_inteq.dm b/code/datums/ert/ert_inteq.dm
new file mode 100644
index 00000000000..a1152688ef2
--- /dev/null
+++ b/code/datums/ert/ert_inteq.dm
@@ -0,0 +1,32 @@
+/datum/ert/inteq
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/inteq/leader
+ roles = list(/datum/antagonist/ert/inteq, /datum/antagonist/ert/inteq/medic, /datum/antagonist/ert/inteq/engineer)
+ mission = "Carry out your contract."
+ rename_team = "Inteq Assault Team"
+ polldesc = "an Inteq assault team"
+ ert_template = /datum/map_template/shuttle/subshuttles/anvil
+
+/datum/ert/inteq/eva
+ leader_role = /datum/antagonist/ert/inteq/leader/eva
+ roles = list(/datum/antagonist/ert/inteq/eva, /datum/antagonist/ert/inteq/medic/eva, /datum/antagonist/ert/inteq/engineer/eva)
+
+/datum/ert/inteq/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/inteq/inspector
+ roles = list(/datum/antagonist/ert/inteq/inspector)
+ mission = "Assure Inteq's quality on the frontier."
+ rename_team = "Inteq Investigator Team"
+ polldesc = "an Inteq investigator"
+
+/datum/ert/inteq/inspector/guarded
+ teamsize = 3
+ leader_role = /datum/antagonist/ert/inteq/inspector
+ roles = list(/datum/antagonist/ert/inteq/honor_guard)
+
+/datum/ert/inteq/honor_guard
+ teamsize = 3
+ leader_role = /datum/antagonist/ert/inteq/honor_guard
+ roles = list(/datum/antagonist/ert/inteq/honor_guard)
+ rename_team = "Inteq Honor Guard"
+ polldesc = "an Inteq honor guardsman team"
diff --git a/code/datums/ert/ert_nanotrasen.dm b/code/datums/ert/ert_nanotrasen.dm
new file mode 100644
index 00000000000..79b2adf4bc8
--- /dev/null
+++ b/code/datums/ert/ert_nanotrasen.dm
@@ -0,0 +1,26 @@
+/datum/ert/nanotrasen
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/nanotrasen/leader
+ roles = list(/datum/antagonist/ert/nanotrasen)
+ mission = "Work for the corporate values of Nanotrasen."
+ rename_team = "Vigilitas Security Team"
+ polldesc = "a Vigilitas security team"
+
+// /datum/ert/nanotrasen/emergency
+// leader_role = /datum/antagonist/ert/nanotrasen/leader/emergency
+// roles = list(/datum/antagonist/ert/nanotrasen/emergency, /datum/antagonist/ert/nanotrasen/emergency/engineer=1, /datum/antagonist/ert/nanotrasen/emergency/medic=1)
+// rename_team = "Vigilitas Distress Response Team"
+// polldesc = "a Vigilitas emergency team"
+
+/datum/ert/nanotrasen/delivery
+ leader_role = /datum/antagonist/ert/nanotrasen/delivery
+ roles = list(/datum/antagonist/ert/nanotrasen/delivery)
+ rename_team = "N+S Delivery Team"
+ polldesc = "a N+S delivery job"
+
+/datum/ert/nanotrasen/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/nanotrasen/inspector
+ roles = list(/datum/antagonist/ert/nanotrasen/inspector)
+ rename_team = "Nanotrasen Central Command Liaison"
+ polldesc = "a NT CentCom inspector"
diff --git a/code/datums/ert/ert_roumain.dm b/code/datums/ert/ert_roumain.dm
new file mode 100644
index 00000000000..5c33bdd39cb
--- /dev/null
+++ b/code/datums/ert/ert_roumain.dm
@@ -0,0 +1,24 @@
+/datum/ert/srm
+ teamsize = 5
+ leader_role = /datum/antagonist/ert/roumain/leader
+ roles = list(/datum/antagonist/ert/roumain/medic = 1, /datum/antagonist/ert/roumain/engineer = 1, /datum/antagonist/ert/roumain)
+ mission = "Serve the Church of Saint Roumain."
+ rename_team = "Roumain Hunting Party"
+ polldesc = "a Roumain hunting party"
+
+/datum/ert/srm/battle
+ teamsize = 7
+ leader_role = /datum/antagonist/ert/roumain/leader/twobore // if you haven't heard of the srm you sure fucking will now
+ roles = list(
+ /datum/antagonist/ert/roumain/leader/colligne = 1,
+ /datum/antagonist/ert/roumain/medic = 1,
+ /datum/antagonist/ert/roumain/engineer = 1,
+ /datum/antagonist/ert/roumain/firestorm = 1,
+ /datum/antagonist/ert/roumain/scout = 1,
+ /datum/antagonist/ert/roumain/vickland
+ )
+ mission = "Defend the Church of Saint Roumain presence in this sector."
+ rename_team = "Roumain Militia Defense Team"
+ polldesc = "a Roumain militia defense team"
+
+// ashhands one day maybes
diff --git a/code/datums/ert/ert_solgov.dm b/code/datums/ert/ert_solgov.dm
new file mode 100644
index 00000000000..4d0cf8b8301
--- /dev/null
+++ b/code/datums/ert/ert_solgov.dm
@@ -0,0 +1,19 @@
+/datum/ert/solgov
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/solgov
+ roles = list(/datum/antagonist/ert/solgov)
+ mission = "Intervene in Solarian interests."
+ rename_team = "SolGov Sonnensoldner Team"
+ polldesc = "a SolGov mercenary team"
+
+/datum/ert/solgov/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/solgov/inspector
+ roles = list(/datum/antagonist/ert/solgov/inspector)
+ rename_team = "SolGov Inspector"
+ polldesc = "a solarian inspector"
+ spawn_at_outpost = FALSE
+
+/datum/ert/solgov/inspector/New()
+ mission = "Conduct a routine review on [station_name()]'s vessels."
diff --git a/code/datums/ert/ert_syndicate.dm b/code/datums/ert/ert_syndicate.dm
new file mode 100644
index 00000000000..77558a5bc57
--- /dev/null
+++ b/code/datums/ert/ert_syndicate.dm
@@ -0,0 +1,73 @@
+// stand-ins
+
+/datum/ert/syndicate
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/syndicate/leader
+ roles = list(/datum/antagonist/ert/syndicate)
+ mission = "Serve the interests of the Syndicate."
+ rename_team = "Generic Syndicate Team"
+ polldesc = "a Syndicate emergency team"
+ spawn_at_outpost = FALSE
+
+/datum/ert/syndicate/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/syndicate/inspector
+ roles = list(/datum/antagonist/ert/syndicate/inspector)
+ rename_team = "Syndicate Inspector"
+ polldesc = "a syndicate ACLF inspector"
+
+/datum/ert/syndicate/inspector/New()
+ mission = "Conduct a routine review on [station_name()]'s Coalition vessels."
+
+// new gorlex republic
+
+/datum/ert/syndicate/ngr
+ teamsize = 5
+ leader_role = /datum/antagonist/ert/syndicate/ngr/leader
+ roles = list(/datum/antagonist/ert/syndicate/ngr, /datum/antagonist/ert/syndicate/ngr/grenadier = 1, /datum/antagonist/ert/syndicate/ngr/medic = 1, /datum/antagonist/ert/syndicate/ngr/sniper = 1)
+ mission = "Uphold the sovereignty of the New Gorlex Republic."
+ rename_team = "Gorlex Republic Detachment"
+ polldesc = "a Gorlex Republic battle squad"
+
+/datum/ert/syndicate/ngr/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/syndicate/ngr/inspector
+ roles = list(/datum/antagonist/ert/syndicate/ngr/inspector)
+ rename_team = "Gorlex Republic Official"
+ polldesc = "a Gorlex Republic inspector"
+
+/datum/ert/syndicate/ngr/inspector/guarded
+ teamsize = 3
+ leader_role = /datum/antagonist/ert/syndicate/ngr/inspector
+ roles = list(/datum/antagonist/ert/syndicate/ngr)
+
+// cybersun
+
+/datum/ert/syndicate/cybersun
+ leader_role = /datum/antagonist/ert/syndicate/cybersun/leader
+ roles = list(/datum/antagonist/ert/syndicate/cybersun)
+ mission = "Serve the interests of CyberSun."
+ rename_team = "Cybersun Commando Team"
+ polldesc = "a Cybersun Commando team"
+
+/datum/ert/syndicate/cybersun/medic
+ leader_role = /datum/antagonist/ert/syndicate/cybersun/medic/leader
+ roles = list(/datum/antagonist/ert/syndicate/cybersun/medic)
+ mission = "Assist CyberSun clients."
+ rename_team = "Cybersun Medical Intervention Team"
+ polldesc = "a Cybersun paramedic team"
+ ert_template = /datum/map_template/shuttle/subshuttles/runner
+
+/datum/ert/syndicate/hardliners
+ leader_role = /datum/antagonist/ert/syndicate/hardliner/leader
+ roles = list(/datum/antagonist/ert/syndicate/hardliner, /datum/antagonist/ert/syndicate/hardliner/medic = 1, /datum/antagonist/ert/syndicate/hardliner/engineer = 1)
+ mission = "Serve the interests of CyberSun."
+ rename_team = "Hardliner Element"
+ polldesc = "a Hardliner attack team"
+
+/datum/ert/syndicate/ramzi
+ leader_role = /datum/antagonist/ert/syndicate/ramzi/leader
+ roles = list(/datum/antagonist/ert/syndicate/ramzi, /datum/antagonist/ert/syndicate/ramzi/medic = 1, /datum/antagonist/ert/syndicate/ramzi/demolitionist = 1)
+ mission = "Make Ramzi proud."
+ rename_team = "Ramzi Cell"
+ polldesc = "a Ramzi pirate team"
diff --git a/code/datums/guestbook.dm b/code/datums/guestbook.dm
index 99104f09d71..ecb7087ed08 100644
--- a/code/datums/guestbook.dm
+++ b/code/datums/guestbook.dm
@@ -67,7 +67,7 @@
given_name = reject_bad_name(given_name)
if(!given_name)
if(!silent)
- to_chat(user, span_warning("That's a pretty terrible name. You can do better."))
+ to_chat(user, span_warning("That's a pretty terrible name."))
return FALSE
if(!visibility_checks(user, guest, silent))
return FALSE
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index c5f907f9c31..d394d7707be 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -34,6 +34,8 @@
/datum/holocall
var/mob/living/user //the one that called
+ ///area of the caller
+ var/area/caller_location
var/obj/machinery/holopad/calling_holopad //the one that sent the call
var/obj/machinery/holopad/connected_holopad //the one that answered the call (may be null)
var/list/dialed_holopads //all things called, will be cleared out to just connected_holopad once answered
@@ -48,6 +50,7 @@
/datum/holocall/New(mob/living/caller, obj/machinery/holopad/calling_pad, list/callees, elevated_access = FALSE)
call_start_time = world.time
user = caller
+ caller_location = get_area_name(caller)
calling_pad.outgoing_call = src
calling_holopad = calling_pad
dialed_holopads = list()
@@ -109,7 +112,7 @@
var/area/A = get_area(connected_holopad)
calling_holopad.say("[A] holopad disconnected.")
else if(H == calling_holopad && connected_holopad)
- connected_holopad.say("[user] disconnected.")
+ connected_holopad.say("[caller_location] disconnected.")
ConnectionFailure(H, TRUE)
@@ -227,7 +230,7 @@
/obj/item/disk/holodisk
name = "holorecord disk"
- desc = "Stores recorder holocalls."
+ desc = "Stores recorded holocalls."
random_color = FALSE
color = "#A7A3A6"
blueshift_pallete = FALSE
diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index 24865387794..4703a31ea0f 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -14,7 +14,6 @@ GLOBAL_LIST_INIT(huds, list(
DATA_HUD_SENTIENT_DISEASE = new/datum/atom_hud/sentient_disease(),
DATA_HUD_AI_DETECT = new/datum/atom_hud/ai_detector(),
DATA_HUD_FAN = new/datum/atom_hud/data/human/fan_hud(),
- ANTAG_HUD_CULT = new/datum/atom_hud/antag(),
ANTAG_HUD_REV = new/datum/atom_hud/antag(),
ANTAG_HUD_OPS = new/datum/atom_hud/antag(),
ANTAG_HUD_WIZ = new/datum/atom_hud/antag(),
@@ -23,9 +22,6 @@ GLOBAL_LIST_INIT(huds, list(
ANTAG_HUD_NINJA = new/datum/atom_hud/antag/hidden(),
ANTAG_HUD_CHANGELING = new/datum/atom_hud/antag/hidden(),
ANTAG_HUD_ABDUCTOR = new/datum/atom_hud/antag/hidden(),
- ANTAG_HUD_DEVIL = new/datum/atom_hud/antag(),
- ANTAG_HUD_SINTOUCHED = new/datum/atom_hud/antag/hidden(),
- ANTAG_HUD_SOULLESS = new/datum/atom_hud/antag/hidden(),
ANTAG_HUD_BROTHER = new/datum/atom_hud/antag/hidden(),
ANTAG_HUD_OBSESSED = new/datum/atom_hud/antag/hidden(),
ANTAG_HUD_FUGITIVE = new/datum/atom_hud/antag(),
diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm
index bb7a33846a3..f88e594e3fc 100644
--- a/code/datums/looping_sounds/_looping_sound.dm
+++ b/code/datums/looping_sounds/_looping_sound.dm
@@ -100,7 +100,7 @@
/datum/looping_sound/proc/get_sound(starttime, _mid_sounds)
. = _mid_sounds || mid_sounds
while(!isfile(.) && !isnull(.))
- . = pickweight(.)
+ . = pick_weight(.)
/datum/looping_sound/proc/on_start()
var/start_wait = 0
diff --git a/code/datums/looping_sounds/item_sounds.dm b/code/datums/looping_sounds/item_sounds.dm
index 96c2ec7533c..7eeabf513b8 100644
--- a/code/datums/looping_sounds/item_sounds.dm
+++ b/code/datums/looping_sounds/item_sounds.dm
@@ -36,17 +36,6 @@
#undef RAD_GEIGER_MEDIUM
#undef RAD_GEIGER_HIGH
-/datum/looping_sound/reverse_bear_trap
- mid_sounds = list('sound/effects/clock_tick.ogg')
- mid_length = 3.5
- volume = 25
-
-
-/datum/looping_sound/reverse_bear_trap_beep
- mid_sounds = list('sound/machines/beep.ogg')
- mid_length = 60
- volume = 10
-
/datum/looping_sound/siren
mid_sounds = list('sound/items/weeoo1.ogg' = 1)
mid_length = 15
diff --git a/code/datums/looping_sounds/weather.dm b/code/datums/looping_sounds/weather.dm
index 4398e7d5b1b..0e26b4592eb 100644
--- a/code/datums/looping_sounds/weather.dm
+++ b/code/datums/looping_sounds/weather.dm
@@ -74,3 +74,20 @@
/datum/looping_sound/weather/rain/indoors
volume = 30
+
+/datum/looping_sound/weather/rain/storm
+ mid_sounds = list(
+ 'sound/ambience/storm_outdoors.ogg' = 1
+ )
+ mid_length = 20.03 SECONDS // The lengths for the files vary, but the longest is ten seconds, so this will make it sound like intermittent wind.
+ start_sound = 'sound/ambience/acidrain_start.ogg'
+ start_length = null
+ end_sound = null
+ volume = 50
+
+/datum/looping_sound/weather/rain/storm/indoors
+ volume = 30
+ mid_sounds = list(
+ 'sound/ambience/storm_indoors.ogg' = 1
+ )
+ mid_length = 20.03 SECONDS // The lengths for the files vary, but the longest is ten seconds, so this will make it sound like intermittent wind.
diff --git a/code/datums/map_zones.dm b/code/datums/map_zones.dm
index c50b93cb2dd..fe4b487f5c8 100644
--- a/code/datums/map_zones.dm
+++ b/code/datums/map_zones.dm
@@ -533,6 +533,9 @@
/datum/virtual_level/proc/get_block()
return block(locate(low_x,low_y,z_value), locate(high_x,high_y,z_value))
+/datum/virtual_level/proc/get_block_portion(lower_x, lower_y, higher_x, higher_y)
+ return block(locate(lower_x,lower_y,z_value), locate(higher_x,higher_y,z_value))
+
/datum/virtual_level/proc/get_unreserved_block()
return block(locate(low_x + reserved_margin, low_y + reserved_margin, z_value), locate(high_x - reserved_margin,high_y - reserved_margin,z_value))
@@ -542,6 +545,9 @@
/datum/virtual_level/proc/get_random_position()
return locate(rand(low_x, high_x), rand(low_y, high_y), z_value)
+/datum/virtual_level/proc/get_random_position_in_margin()
+ return locate(rand(low_x + reserved_margin, high_x - reserved_margin), rand(low_y + reserved_margin, high_y - reserved_margin), z_value)
+
/datum/virtual_level/proc/get_below_turf(turf/Turf)
if(!down_linkage)
return
@@ -556,6 +562,25 @@
var/abs_y = Turf.y - low_y
return locate(up_linkage.low_x + abs_x, up_linkage.low_y + abs_y, up_linkage.z_value)
+/datum/virtual_level/proc/get_zone_step(turf/source, direction)
+ // multiz dir is just the up/down dir flags
+ var/multiz_dir = direction & (UP|DOWN)
+ // while the passed dir is normalized to just the cardinals
+ direction &= ~(UP|DOWN)
+ var/turf/my_turf = get_step(source, direction)
+ if(isnull(my_turf))
+ return
+ switch(multiz_dir)
+ // the old version of this code prioritized UP over DOWN when
+ // both were passed. i don't want to fuck with that, so here it is preserved
+ if(UP|DOWN)
+ return get_above_turf(my_turf)
+ if(UP)
+ return get_above_turf(my_turf)
+ if(DOWN)
+ return get_below_turf(my_turf)
+ return my_turf
+
/datum/virtual_level/proc/get_client_mobs()
return get_alive_client_mobs() + get_dead_client_mobs()
@@ -631,7 +656,7 @@
var/ty = destination_y
var/turf/DT = locate(tx, ty, destination_z)
var/itercount = 0
- while(DT.density || istype(DT.loc,/area/shuttle)) // Extend towards the center of the map, trying to look for a better place to arrive
+ while(DT.density) // Extend towards the center of the map, trying to look for a better place to arrive
if (itercount++ >= 100)
log_game("SPACE Z-TRANSIT ERROR: Could not find a safe place to land [arrived] within 100 iterations.")
break
diff --git a/code/datums/mapgen/Whitesandsatmos.dm b/code/datums/mapgen/Whitesandsatmos.dm
index 87d4ef33b88..231a9c9eec1 100644
--- a/code/datums/mapgen/Whitesandsatmos.dm
+++ b/code/datums/mapgen/Whitesandsatmos.dm
@@ -1,28 +1,3 @@
#define WHITESANDS_WALL_ENV "rock"
#define WHITESANDS_SAND_ENV "sand"
#define WHITESANDS_DRIED_ENV "dried_up"
-#define WHITESANDS_ATMOS "ws_atmos"
-
-/datum/atmosphere/whitesands
- id = WHITESANDS_ATMOS
-
- base_gases = list(
- GAS_O2=5,
- GAS_N2=10,
- )
- normal_gases = list(
- GAS_O2=10,
- GAS_N2=10,
- GAS_CO2=10,
- )
- restricted_gases = list(
- GAS_PLASMA=0.1,
- GAS_H2O=0.1,
- )
- restricted_chance = 50
-
- minimum_pressure = HAZARD_LOW_PRESSURE + 10
- maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1
-
- minimum_temp = 180
- maximum_temp = 180
diff --git a/code/datums/mapgen/planetary/AsteroidGenerator.dm b/code/datums/mapgen/planetary/AsteroidGenerator.dm
index 737194b5ee2..dc5c27ac79e 100644
--- a/code/datums/mapgen/planetary/AsteroidGenerator.dm
+++ b/code/datums/mapgen/planetary/AsteroidGenerator.dm
@@ -111,10 +111,8 @@
)
feature_spawn_list = list(
+ /obj/structure/spawner/burrow/asteroid = 3,
/obj/structure/geyser/random = 1,
- /obj/structure/spawner/mining/goliath = 1,
- /obj/structure/spawner/mining = 1,
- /obj/structure/spawner/mining/hivelord = 1,
/obj/structure/vein/asteroid = 5,
/obj/structure/vein/classtwo/asteroid = 10,
/obj/structure/vein/classthree/asteroid = 5
@@ -161,7 +159,7 @@
feature_spawn_list = list(
/obj/structure/geyser/random = 5,
- /obj/structure/spawner/mining/carp = 5,
+ /obj/structure/spawner/carp = 5,
/obj/structure/vein/asteroid = 10,
/obj/structure/vein/classtwo/asteroid = 15,
/obj/structure/vein/classthree/asteroid = 12
diff --git a/code/datums/mapgen/planetary/JungleGenerator.dm b/code/datums/mapgen/planetary/JungleGenerator.dm
index 45ae4a7120c..f64e4750495 100644
--- a/code/datums/mapgen/planetary/JungleGenerator.dm
+++ b/code/datums/mapgen/planetary/JungleGenerator.dm
@@ -100,7 +100,7 @@
mob_spawn_list = list(
/mob/living/carbon/monkey = 10,
/mob/living/simple_animal/hostile/retaliate/chicken = 10,
- /obj/effect/spawner/lootdrop/chicken/jungle/flock = 1
+ /obj/effect/spawner/random/chicken/jungle/flock = 1
)
/datum/biome/jungle/dense
@@ -123,7 +123,7 @@
/mob/living/simple_animal/hostile/gorilla = 1,
/mob/living/carbon/monkey = 6,
/mob/living/simple_animal/hostile/retaliate/chicken = 4,
- /obj/effect/spawner/lootdrop/chicken/jungle/flock = 1
+ /obj/effect/spawner/random/chicken/jungle/flock = 1
)
/datum/biome/jungle/plains
@@ -180,8 +180,8 @@
feature_spawn_chance = 0.5
feature_spawn_list = list(
/obj/item/pickaxe/rusted = 1,
- /obj/structure/spawner/ice_moon = 1,
- /obj/effect/spawner/lootdrop/anomaly/jungle = 1
+ /obj/structure/spawner/burrow/jungle_planet = 1,
+ /obj/effect/spawner/random/anomaly/jungle = 1
)
/datum/biome/cave/jungle/dirt
diff --git a/code/datums/mapgen/planetary/LavaGenerator.dm b/code/datums/mapgen/planetary/LavaGenerator.dm
index ef66cca1103..120f3a80d43 100644
--- a/code/datums/mapgen/planetary/LavaGenerator.dm
+++ b/code/datums/mapgen/planetary/LavaGenerator.dm
@@ -98,17 +98,15 @@
feature_spawn_chance = 0.3
feature_spawn_list = list(
/obj/structure/flora/rock/hell = 20,
- /obj/structure/elite_tumor = 4,
/obj/structure/geyser/random = 4,
- /obj/effect/spawner/lootdrop/anomaly/lava = 2,
+ /obj/effect/spawner/random/anomaly/lava = 2,
/obj/structure/flora/rock/hell = 14,
/obj/structure/vein = 5,
/obj/structure/vein/classtwo = 2,
- /obj/structure/elite_tumor = 2,
/obj/structure/geyser/random = 2,
/obj/structure/vein/classthree = 1,
/obj/effect/spawner/minefield = 1,
- /obj/effect/spawner/lootdrop/anomaly/lava = 1,
+ /obj/effect/spawner/random/anomaly/lava = 1,
)
mob_spawn_chance = 4
mob_spawn_list = list(
@@ -120,9 +118,7 @@
/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal = 1,
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/forgotten = 1,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/crystal = 1,
- /obj/structure/spawner/lavaland/low_threat = 8,
- /obj/structure/spawner/lavaland/medium_threat = 3,
- /obj/structure/spawner/lavaland/high_threat = 1,
+ /obj/structure/spawner/burrow/lava_planet = 10
)
/datum/biome/lavaland/forest
@@ -169,7 +165,7 @@
feature_spawn_list = list(
/obj/structure/flora/tree/dead/barren = 50,
/obj/structure/flora/tree/dead/tall/grey = 45,
- /obj/effect/spawner/lootdrop/anomaly/lava = 10,
+ /obj/effect/spawner/random/anomaly/lava = 10,
/obj/structure/vein = 5,
/obj/structure/vein/classtwo = 2,
/obj/structure/vein/classthree = 1,
@@ -242,10 +238,7 @@
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30,
/mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
- /obj/structure/spawner/lavaland/low_threat = 8,
- /obj/structure/spawner/lavaland/medium_threat = 3,
- /obj/structure/spawner/lavaland/high_threat = 2,
- /obj/structure/spawner/lavaland/extreme_threat = 1
+ /obj/structure/spawner/burrow/lava_planet = 10
)
flora_spawn_chance = 1
flora_spawn_list = list(
diff --git a/code/datums/mapgen/planetary/RockGenerator.dm b/code/datums/mapgen/planetary/RockGenerator.dm
index c675c87714f..7bf544cff3a 100644
--- a/code/datums/mapgen/planetary/RockGenerator.dm
+++ b/code/datums/mapgen/planetary/RockGenerator.dm
@@ -87,12 +87,11 @@
feature_spawn_list = list(
/obj/structure/geyser/random = 80,
/obj/structure/vein = 60,
- /obj/structure/elite_tumor = 40,
/obj/structure/vein/classtwo = 40,
- /obj/effect/spawner/lootdrop/anomaly/rock = 10,
+ /obj/effect/spawner/random/anomaly/rock = 10,
/obj/structure/vein/classthree = 10,
/obj/effect/spawner/minefield = 2,
- /obj/effect/spawner/lootdrop/anomaly/big = 1 //get out of here stalker
+ /obj/effect/spawner/random/anomaly/big = 1 //get out of here stalker
)
flora_spawn_chance = 5
@@ -158,11 +157,10 @@
/obj/structure/vein = 3,
/obj/structure/geyser/random = 2,
/obj/structure/vein/classtwo = 2,
- /obj/structure/elite_tumor = 1,
/obj/structure/vein/classthree = 1,
+ /obj/structure/spawner/burrow/rock_plant = 4,
/obj/effect/spawner/minefield = 1,
- /obj/structure/spawner/ice_moon/rockplanet = 4,
- /obj/effect/spawner/lootdrop/anomaly/rock/cave = 1,
+ /obj/effect/spawner/random/anomaly/rock/cave = 1,
)
mob_spawn_chance = 6
mob_spawn_list = list(
diff --git a/code/datums/mapgen/planetary/SandGenerator.dm b/code/datums/mapgen/planetary/SandGenerator.dm
index 91fad1430a4..d388529a16e 100644
--- a/code/datums/mapgen/planetary/SandGenerator.dm
+++ b/code/datums/mapgen/planetary/SandGenerator.dm
@@ -94,9 +94,8 @@
/obj/structure/geyser/random = 8,
/obj/structure/vein = 8,
/obj/structure/vein/classtwo = 4,
- /obj/structure/elite_tumor = 4,
/obj/structure/vein/classthree = 2,
- /obj/effect/spawner/lootdrop/anomaly/sand = 1,
+ /obj/effect/spawner/random/anomaly/sand = 1,
)
mob_spawn_chance = 4
mob_spawn_list = list(
@@ -120,7 +119,7 @@
/obj/structure/flora/ash/cap_shroom = 4,
/obj/structure/flora/ash/stem_shroom = 4,
/obj/effect/decal/remains/human = 4,
- /obj/effect/spawner/lootdrop/maintenance = 40,
+ /obj/effect/spawner/random/maintenance = 40,
)
/datum/biome/sand/grass
@@ -173,10 +172,10 @@
)
/datum/biome/sand/acid //plains
- open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/lit = 10, /turf/open/acid/whitesands = 1)
+ open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/lit = 10, /turf/open/water/acid/whitesands = 1)
/datum/biome/sand/acid/total
- open_turf_types = list(/turf/open/acid/whitesands = 1)
+ open_turf_types = list(/turf/open/water/acid/whitesands = 1)
flora_spawn_chance = 0
feature_spawn_chance = 0
mob_spawn_chance = 0
@@ -198,8 +197,7 @@
/obj/structure/vein = 8,
/obj/structure/geyser/random = 4,
/obj/structure/vein/classtwo = 4,
- /obj/structure/elite_tumor = 4,
- /obj/effect/spawner/lootdrop/anomaly/sand/cave = 1
+ /obj/effect/spawner/random/anomaly/sand/cave = 1
)
mob_spawn_chance = 4
mob_spawn_list = list(
@@ -217,9 +215,7 @@
/mob/living/simple_animal/hostile/asteroid/basilisk/whitesands = 40,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30,
/mob/living/simple_animal/hostile/asteroid/goldgrub = 20,
- /obj/structure/spawner/lavaland/sand_world/low_threat = 14,
- /obj/structure/spawner/lavaland/sand_world/medium_threat = 8,
- /obj/structure/spawner/lavaland/sand_world/high_threat = 2,
+ /obj/structure/spawner/burrow/sand_planet = 25
)
/datum/biome/cave/sand/volcanic
@@ -230,4 +226,4 @@
open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/dried = 7, /turf/open/lava = 1)
/datum/biome/cave/sand/volcanic/acidic
- open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/dried = 8, /turf/open/acid/whitesands = 1)
+ open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/dried = 8, /turf/open/water/acid/whitesands = 1)
diff --git a/code/datums/mapgen/planetary/SnowGenerator.dm b/code/datums/mapgen/planetary/SnowGenerator.dm
index 8489cbb970b..4297f8a50f2 100644
--- a/code/datums/mapgen/planetary/SnowGenerator.dm
+++ b/code/datums/mapgen/planetary/SnowGenerator.dm
@@ -102,8 +102,7 @@
mob_spawn_chance = 1
mob_spawn_list = list(
/mob/living/simple_animal/hostile/asteroid/wolf/random = 30,
- /obj/structure/spawner/ice_moon = 2,
- /obj/structure/spawner/ice_moon/polarbear = 2,
+ /obj/structure/spawner/burrow/ice_planet = 4,
/mob/living/simple_animal/hostile/asteroid/polarbear/random = 30,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50,
/mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
@@ -113,11 +112,9 @@
)
feature_spawn_chance = 0.1
feature_spawn_list = list(
- /obj/effect/spawner/lootdrop/anomaly/ice = 12,
- /obj/effect/spawner/lootdrop/anomaly/big = 1,
- /obj/structure/spawner/ice_moon/demonic_portal/low_threat = 25,
- /obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 50,
- /obj/structure/spawner/ice_moon/demonic_portal/high_threat = 13,
+ /obj/effect/spawner/random/anomaly/ice = 12,
+ /obj/effect/spawner/random/anomaly/big = 1,
+ /obj/structure/spawner/burrow/ice_planet = 80,
/obj/structure/vein/ice = 25,
/obj/effect/spawner/minefield = 2,
/obj/structure/vein/ice/classtwo = 50,
@@ -171,8 +168,7 @@
)
feature_spawn_chance = 0.1
feature_spawn_list = list(
- /obj/structure/spawner/ice_moon = 2,
- /obj/structure/spawner/ice_moon/polarbear = 2,
+ /obj/structure/spawner/burrow/ice_planet = 4,
/obj/structure/statue/snow/snowman = 3,
/obj/structure/statue/snow/snowlegion = 1,
/obj/structure/vein/ice = 3,
@@ -181,8 +177,7 @@
)
mob_spawn_list = list(
/mob/living/simple_animal/hostile/asteroid/wolf/random = 30,
- /obj/structure/spawner/ice_moon = 2,
- /obj/structure/spawner/ice_moon/polarbear = 2,
+ /obj/structure/spawner/burrow/ice_planet = 2,
/mob/living/simple_animal/hostile/asteroid/polarbear/random = 30,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50,
/mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
@@ -217,12 +212,9 @@
)
feature_spawn_chance = 0.3
feature_spawn_list = list(
- /obj/effect/spawner/lootdrop/anomaly/ice = 100,
- /obj/effect/spawner/lootdrop/anomaly/big = 1,
- /obj/structure/spawner/ice_moon/demonic_portal/low_threat = 200,
- /obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 400,
- /obj/structure/spawner/ice_moon/demonic_portal/high_threat = 40,
- /obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 1,
+ /obj/effect/spawner/random/anomaly/ice = 100,
+ /obj/effect/spawner/random/anomaly/big = 1,
+ /obj/structure/spawner/burrow/ice_planet/hard = 600,
/obj/structure/vein/ice = 300,
/obj/structure/vein/ice/classtwo = 500,
/obj/structure/vein/ice/classthree = 50,
@@ -264,8 +256,7 @@
mob_spawn_chance = 2
mob_spawn_list = list(
/mob/living/simple_animal/hostile/asteroid/wolf/random = 30,
- /obj/structure/spawner/ice_moon = 2,
- /obj/structure/spawner/ice_moon/polarbear = 2,
+ /obj/structure/spawner/burrow/ice_planet = 4,
/mob/living/simple_animal/hostile/asteroid/polarbear/random = 30,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50,
/mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
@@ -275,13 +266,9 @@
)
feature_spawn_chance = 0.2
feature_spawn_list = list(
- /obj/structure/spawner/ice_moon/demonic_portal/low_threat = 20,
- /obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 40,
- /obj/structure/spawner/ice_moon/demonic_portal/high_threat = 5,
- /obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 1,
- /obj/structure/spawner/ice_moon = 20,
- /obj/structure/spawner/ice_moon/polarbear = 20,
- /obj/effect/spawner/lootdrop/anomaly/ice/cave = 10,
+ /obj/structure/spawner/burrow/ice_planet = 60,
+ /obj/structure/spawner/burrow/ice_planet = 40,
+ /obj/effect/spawner/random/anomaly/ice/cave = 10,
/obj/structure/vein/ice = 30,
/obj/structure/vein/ice/classtwo = 50,
/obj/structure/vein/ice/classthree = 6,
diff --git a/code/datums/mapgen/planetary/WasteGenerator.dm b/code/datums/mapgen/planetary/WasteGenerator.dm
index c6e1244be12..15690125c00 100644
--- a/code/datums/mapgen/planetary/WasteGenerator.dm
+++ b/code/datums/mapgen/planetary/WasteGenerator.dm
@@ -66,9 +66,9 @@
BIOME_COLD_CAVE = list(
BIOME_LOWEST_HUMIDITY = /datum/biome/cave/waste,
BIOME_LOW_HUMIDITY = /datum/biome/cave/waste/rad,
- BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/waste,
- BIOME_HIGH_HUMIDITY = /datum/biome/cave/waste/rad,
- BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/waste
+ BIOME_MEDIUM_HUMIDITY = /datum/biome/cave/waste/conc,
+ BIOME_HIGH_HUMIDITY = /datum/biome/cave/waste/conc,
+ BIOME_HIGHEST_HUMIDITY = /datum/biome/cave/waste/conc
),
BIOME_WARM_CAVE = list(
BIOME_LOWEST_HUMIDITY = /datum/biome/cave/waste,
@@ -96,28 +96,27 @@
flora_spawn_list = list(
//mech spawners
- /obj/effect/spawner/lootdrop/waste/mechwreck = 100,
- /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 20,
+ /obj/effect/spawner/random/waste/mechwreck = 100,
+ /obj/effect/spawner/random/waste/mechwreck/rare = 20,
//decals and fluff structures
- /obj/effect/spawner/lootdrop/waste/trash = 1800,
- /obj/effect/spawner/lootdrop/waste/radiation = 80,
- /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 10,
+ /obj/effect/spawner/random/trash/decal = 1800,
+ /obj/effect/spawner/random/waste/radiation = 80,
+ /obj/effect/spawner/random/waste/radiation/more_rads = 10,
//stuff you can actually use
- /obj/effect/spawner/lootdrop/waste/girder = 600,
- /obj/structure/reagent_dispensers/fueltank = 100,
+ /obj/effect/spawner/random/waste/girder = 600,
/obj/structure/reagent_dispensers/watertank = 200,
/obj/item/stack/cable_coil/cut = 500,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/lootdrop/waste/atmos_can = 50,
- /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
- /obj/effect/spawner/lootdrop/waste/salvageable = 300,
- /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200,
- /obj/effect/spawner/lootdrop/maintenance = 200,
- /obj/effect/spawner/lootdrop/maintenance/two = 100,
- /obj/effect/spawner/lootdrop/maintenance/three = 50,
- /obj/effect/spawner/lootdrop/maintenance/four = 20,
+ /obj/effect/spawner/random/waste/atmos_can = 50,
+ /obj/effect/spawner/random/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/random/waste/salvageable = 300,
+ /obj/effect/spawner/random/waste/grille_or_trash = 200,
+ /obj/effect/spawner/random/maintenance = 200,
+ /obj/effect/spawner/random/maintenance/two = 100,
+ /obj/effect/spawner/random/maintenance/three = 50,
+ /obj/effect/spawner/random/maintenance/four = 20,
//plants
/obj/structure/flora/ash/garden/waste = 70,
@@ -126,7 +125,7 @@
//the illusive shrapnel plant
/obj/item/mine/pressure/explosive/shrapnel/live = 30,
- /obj/effect/spawner/lootdrop/mine = 8,
+ /obj/effect/spawner/random/mine = 8,
/obj/effect/spawner/minefield = 2
)
@@ -134,14 +133,14 @@
/obj/effect/radiation/waste = 30,
/obj/effect/radiation/waste/intense = 10,
/obj/structure/geyser/random = 1,
- /obj/effect/spawner/lootdrop/anomaly/waste = 1
+ /obj/effect/spawner/random/anomaly/waste = 1
)
mob_spawn_list = list(
//hivebots, not too difficult
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 70,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 40,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 30,
+ /mob/living/simple_animal/hostile/hivebot/strong = 20,
+ /mob/living/simple_animal/hostile/hivebot/ranged = 40,
+ /mob/living/simple_animal/hostile/hivebot/ranged/rapid = 30,
//bots, are hostile
/mob/living/simple_animal/bot/firebot/rockplanet = 15,
/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
@@ -160,23 +159,23 @@
)
flora_spawn_list = list(
- /obj/effect/spawner/lootdrop/waste/trash = 180,
- /obj/effect/spawner/lootdrop/waste/radiation = 16,
- /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 2,
- /obj/effect/spawner/lootdrop/waste/atmos_can = 36,
- /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
- /obj/effect/spawner/lootdrop/waste/salvageable = 60,
+ /obj/effect/spawner/random/trash/decal = 180,
+ /obj/effect/spawner/random/waste/radiation = 16,
+ /obj/effect/spawner/random/waste/radiation/more_rads = 2,
+ /obj/effect/spawner/random/waste/atmos_can = 36,
+ /obj/effect/spawner/random/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/random/waste/salvageable = 60,
)
mob_spawn_chance = 1
/datum/biome/waste/crater/rad
flora_spawn_list = list(
/obj/structure/flora/ash/glowshroom = 180,
- /obj/effect/spawner/lootdrop/waste/trash = 90,
- /obj/effect/spawner/lootdrop/waste/radiation = 25,
- /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 7,
- /obj/effect/spawner/lootdrop/waste/atmos_can = 7,
- /obj/effect/spawner/lootdrop/waste/salvageable = 15
+ /obj/effect/spawner/random/trash/decal = 90,
+ /obj/effect/spawner/random/waste/radiation = 25,
+ /obj/effect/spawner/random/waste/radiation/more_rads = 7,
+ /obj/effect/spawner/random/waste/atmos_can = 7,
+ /obj/effect/spawner/random/waste/salvageable = 15
)
/datum/biome/waste/clearing
@@ -185,27 +184,26 @@
/datum/biome/waste/clearing/mushroom
flora_spawn_list = list(
- /obj/effect/spawner/lootdrop/waste/mechwreck = 100,
- /obj/effect/spawner/lootdrop/waste/trash = 900,
- /obj/effect/spawner/lootdrop/waste/radiation = 300,
- /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 120,
- /obj/effect/spawner/lootdrop/waste/girder = 600,
- /obj/structure/reagent_dispensers/fueltank = 100,
+ /obj/effect/spawner/random/waste/mechwreck = 100,
+ /obj/effect/spawner/random/trash/decal = 900,
+ /obj/effect/spawner/random/waste/radiation = 300,
+ /obj/effect/spawner/random/waste/radiation/more_rads = 120,
+ /obj/effect/spawner/random/waste/girder = 600,
/obj/structure/reagent_dispensers/watertank = 200,
/obj/item/stack/cable_coil/cut = 500,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/lootdrop/waste/atmos_can = 50,
- /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
- /obj/effect/spawner/lootdrop/waste/salvageable = 300,
- /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200,
- /obj/effect/spawner/lootdrop/maintenance = 200,
- /obj/effect/spawner/lootdrop/maintenance/two = 100,
- /obj/effect/spawner/lootdrop/maintenance/three = 50,
- /obj/effect/spawner/lootdrop/maintenance/four = 20,
+ /obj/effect/spawner/random/waste/atmos_can = 50,
+ /obj/effect/spawner/random/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/random/waste/salvageable = 300,
+ /obj/effect/spawner/random/waste/grille_or_trash = 200,
+ /obj/effect/spawner/random/maintenance = 200,
+ /obj/effect/spawner/random/maintenance/two = 100,
+ /obj/effect/spawner/random/maintenance/three = 50,
+ /obj/effect/spawner/random/maintenance/four = 20,
/obj/structure/flora/ash/garden/waste = 300,
/obj/structure/flora/ash/glowshroom = 1800,
/obj/item/mine/pressure/explosive/shrapnel/live = 30,
- /obj/effect/spawner/lootdrop/mine = 8,
+ /obj/effect/spawner/random/mine = 8,
/obj/effect/spawner/minefield = 2
)
@@ -229,44 +227,40 @@
)
flora_spawn_list = list( //there are no plants here
- /obj/effect/spawner/lootdrop/waste/mechwreck = 200,
- /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 50,
- /obj/effect/spawner/lootdrop/waste/trash = 900,
- /obj/effect/spawner/lootdrop/waste/radiation = 80,
- /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 20,
- /obj/effect/spawner/lootdrop/waste/girder = 600,
- /obj/structure/reagent_dispensers/fueltank = 100,
+ /obj/effect/spawner/random/waste/mechwreck = 200,
+ /obj/effect/spawner/random/waste/mechwreck/rare = 50,
+ /obj/effect/spawner/random/trash/decal = 900,
+ /obj/effect/spawner/random/waste/radiation = 80,
+ /obj/effect/spawner/random/waste/radiation/more_rads = 20,
+ /obj/effect/spawner/random/waste/girder = 600,
/obj/structure/reagent_dispensers/watertank = 200,
/obj/item/stack/cable_coil/cut = 500,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/lootdrop/waste/atmos_can = 50,
- /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
- /obj/effect/spawner/lootdrop/waste/salvageable = 300,
- /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200,
- /obj/effect/spawner/lootdrop/maintenance = 200,
- /obj/effect/spawner/lootdrop/maintenance/two = 100,
- /obj/effect/spawner/lootdrop/maintenance/three = 50,
- /obj/effect/spawner/lootdrop/maintenance/four = 20,
+ /obj/effect/spawner/random/waste/atmos_can = 50,
+ /obj/effect/spawner/random/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/random/waste/salvageable = 300,
+ /obj/effect/spawner/random/waste/grille_or_trash = 200,
+ /obj/effect/spawner/random/maintenance = 200,
+ /obj/effect/spawner/random/maintenance/two = 100,
+ /obj/effect/spawner/random/maintenance/three = 50,
+ /obj/effect/spawner/random/maintenance/four = 20,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/lootdrop/waste/atmos_can = 180,
- /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
- /obj/effect/spawner/lootdrop/waste/salvageable = 300,
+ /obj/effect/spawner/random/waste/atmos_can = 180,
+ /obj/effect/spawner/random/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/random/waste/salvageable = 300,
/obj/item/mine/pressure/explosive/rad/live = 30,
- /obj/effect/spawner/lootdrop/mine = 8,
+ /obj/effect/spawner/random/mine = 8,
/obj/effect/spawner/minefield = 2
)
mob_spawn_list = list( //nor organics, more biased towards hivebots though
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50,
+ /mob/living/simple_animal/hostile/hivebot/strong = 20,
+ /mob/living/simple_animal/hostile/hivebot/ranged = 50,
+ /mob/living/simple_animal/hostile/hivebot/ranged/rapid = 50,
/mob/living/simple_animal/bot/firebot/rockplanet = 15,
/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
/mob/living/simple_animal/hostile/abandoned_minebot = 15,
/mob/living/simple_animal/bot/floorbot/rockplanet = 15,
- /obj/structure/spawner/wasteplanet/hivebot/low_threat = 20,
- /obj/structure/spawner/wasteplanet/hivebot/medium_threat = 10,
- /obj/structure/spawner/wasteplanet/hivebot/high_threat = 5,
- /obj/structure/spawner/wasteplanet/hivebot/extreme_threat = 2
+ /obj/structure/spawner/hivebot = 35
)
/datum/biome/waste/metal/rust
@@ -287,36 +281,35 @@
closed_turf_types = list(
/turf/closed/mineral/random/wasteplanet = 40,
- /turf/closed/wall/r_wall = 1,
- /turf/closed/wall/r_wall/rust = 3,
- /turf/closed/wall = 2,
- /turf/closed/wall/rust = 6
+ /turf/closed/wall/r_wall/wasteplanet = 1,
+ /turf/closed/wall/r_wall/rust/wasteplanet = 3,
+ /turf/closed/wall/wasteplanet = 2,
+ /turf/closed/wall/rust/wasteplanet = 6
)
flora_spawn_list = list(
- /obj/effect/spawner/lootdrop/waste/mechwreck = 100,
- /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 20,
- /obj/effect/spawner/lootdrop/waste/trash = 1800,
- /obj/effect/spawner/lootdrop/waste/radiation = 80,
- /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 10,
- /obj/effect/spawner/lootdrop/waste/girder = 600,
- /obj/structure/reagent_dispensers/fueltank = 100,
+ /obj/effect/spawner/random/waste/mechwreck = 100,
+ /obj/effect/spawner/random/waste/mechwreck/rare = 20,
+ /obj/effect/spawner/random/trash/decal = 1800,
+ /obj/effect/spawner/random/waste/radiation = 80,
+ /obj/effect/spawner/random/waste/radiation/more_rads = 10,
+ /obj/effect/spawner/random/waste/girder = 600,
/obj/structure/reagent_dispensers/watertank = 200,
/obj/item/stack/cable_coil/cut = 500,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/lootdrop/waste/atmos_can = 50,
- /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 5,
- /obj/effect/spawner/lootdrop/waste/salvageable = 300,
- /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200,
- /obj/effect/spawner/lootdrop/maintenance = 20,
- /obj/effect/spawner/lootdrop/maintenance/two = 50,
- /obj/effect/spawner/lootdrop/maintenance/three = 100,
- /obj/effect/spawner/lootdrop/maintenance/four = 200,
- /obj/effect/spawner/lootdrop/waste/salvageable = 400,
+ /obj/effect/spawner/random/waste/atmos_can = 50,
+ /obj/effect/spawner/random/waste/atmos_can/rare = 5,
+ /obj/effect/spawner/random/waste/salvageable = 300,
+ /obj/effect/spawner/random/waste/grille_or_trash = 200,
+ /obj/effect/spawner/random/maintenance = 20,
+ /obj/effect/spawner/random/maintenance/two = 50,
+ /obj/effect/spawner/random/maintenance/three = 100,
+ /obj/effect/spawner/random/maintenance/four = 200,
+ /obj/effect/spawner/random/waste/salvageable = 400,
/obj/structure/flora/ash/garden/waste = 70,
/obj/structure/flora/ash/glowshroom = 400, //more common in caves
/obj/item/mine/pressure/explosive/rad/live = 10,
- /obj/effect/spawner/lootdrop/mine = 8,
+ /obj/effect/spawner/random/mine = 8,
/obj/effect/spawner/minefield = 2
)
@@ -324,12 +317,12 @@
/obj/effect/radiation/waste = 30,
/obj/effect/radiation/waste/intense = 10,
/obj/structure/geyser/random = 1,
- /obj/effect/spawner/lootdrop/anomaly/waste/cave = 1
+ /obj/effect/spawner/random/anomaly/waste/cave = 1
)
mob_spawn_list = list(
- /mob/living/simple_animal/hostile/hivebot/strong/rockplanet = 70,
- /mob/living/simple_animal/hostile/hivebot/range/rockplanet = 40,
- /mob/living/simple_animal/hostile/hivebot/rapid/rockplanet = 30,
+ /mob/living/simple_animal/hostile/hivebot/strong = 20,
+ /mob/living/simple_animal/hostile/hivebot/ranged = 40,
+ /mob/living/simple_animal/hostile/hivebot/ranged/rapid = 30,
/mob/living/simple_animal/bot/firebot/rockplanet = 15,
/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
/mob/living/simple_animal/hostile/abandoned_minebot = 15,
@@ -355,25 +348,24 @@
/datum/biome/cave/waste/rad
flora_spawn_list = list(
- /obj/effect/spawner/lootdrop/waste/trash = 900,
- /obj/effect/spawner/lootdrop/waste/radiation = 250,
- /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 70,
- /obj/effect/spawner/lootdrop/waste/atmos_can = 50,
- /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 5,
- /obj/effect/spawner/lootdrop/waste/salvageable = 150,
- /obj/effect/spawner/lootdrop/waste/girder = 200,
- /obj/structure/reagent_dispensers/fueltank = 10,
+ /obj/effect/spawner/random/trash/decal = 900,
+ /obj/effect/spawner/random/waste/radiation = 250,
+ /obj/effect/spawner/random/waste/radiation/more_rads = 70,
+ /obj/effect/spawner/random/waste/atmos_can = 50,
+ /obj/effect/spawner/random/waste/atmos_can/rare = 5,
+ /obj/effect/spawner/random/waste/salvageable = 150,
+ /obj/effect/spawner/random/waste/girder = 200,
/obj/structure/reagent_dispensers/watertank = 10,
/obj/item/stack/cable_coil/cut = 500,
/obj/structure/closet/crate/secure/loot = 30,
- /obj/effect/spawner/lootdrop/waste/grille_or_trash = 200,
- /obj/effect/spawner/lootdrop/maintenance = 20,
- /obj/effect/spawner/lootdrop/maintenance/two = 50,
- /obj/effect/spawner/lootdrop/maintenance/three = 100,
- /obj/effect/spawner/lootdrop/maintenance/four = 200,
+ /obj/effect/spawner/random/waste/grille_or_trash = 200,
+ /obj/effect/spawner/random/maintenance = 20,
+ /obj/effect/spawner/random/maintenance/two = 50,
+ /obj/effect/spawner/random/maintenance/three = 100,
+ /obj/effect/spawner/random/maintenance/four = 200,
/obj/structure/flora/ash/glowshroom = 1800,
/obj/item/mine/pressure/explosive/rad/live = 30,
- /obj/effect/spawner/lootdrop/mine = 8,
+ /obj/effect/spawner/random/mine = 8,
/obj/effect/spawner/minefield = 2
)
feature_spawn_chance = 12
@@ -384,79 +376,109 @@
/turf/open/floor/plating/wasteplanet = 4
)
closed_turf_types = list(
- /turf/closed/wall/r_wall = 1,
- /turf/closed/wall/r_wall/rust = 1,
- /turf/closed/wall = 5,
- /turf/closed/wall/rust = 10
+ /turf/closed/wall/r_wall/wasteplanet = 1,
+ /turf/closed/wall/r_wall/rust/wasteplanet = 1,
+ /turf/closed/wall/wasteplanet = 5,
+ /turf/closed/wall/rust/wasteplanet = 10
)
flora_spawn_list = list(
- /obj/effect/spawner/lootdrop/waste/mechwreck = 40,
- /obj/effect/spawner/lootdrop/waste/mechwreck/rare = 10,
- /obj/effect/spawner/lootdrop/waste/trash = 180,
- /obj/effect/spawner/lootdrop/waste/radiation = 32,
- /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 4,
- /obj/effect/spawner/lootdrop/waste/girder = 120,
- /obj/structure/reagent_dispensers/fueltank = 20,
+ /obj/effect/spawner/random/waste/mechwreck = 40,
+ /obj/effect/spawner/random/waste/mechwreck/rare = 10,
+ /obj/effect/spawner/random/trash/decal = 180,
+ /obj/effect/spawner/random/waste/radiation = 32,
+ /obj/effect/spawner/random/waste/radiation/more_rads = 4,
+ /obj/effect/spawner/random/waste/girder = 120,
/obj/structure/reagent_dispensers/watertank = 40,
/obj/item/stack/cable_coil/cut = 100,
/obj/structure/closet/crate/secure/loot = 6,
- /obj/effect/spawner/lootdrop/waste/atmos_can = 10,
- /obj/effect/spawner/lootdrop/waste/atmos_can/rare = 1,
- /obj/effect/spawner/lootdrop/waste/salvageable = 60,
- /obj/effect/spawner/lootdrop/waste/grille_or_trash = 40,
- /obj/effect/spawner/lootdrop/maintenance = 4,
- /obj/effect/spawner/lootdrop/maintenance/two = 10,
- /obj/effect/spawner/lootdrop/maintenance/three = 20,
- /obj/effect/spawner/lootdrop/maintenance/four = 40,
- /obj/effect/spawner/lootdrop/waste/salvageable = 80,
- /obj/item/mine/proximity/spawner/manhack/live = 40,
- /obj/effect/spawner/lootdrop/mine = 8,
- /obj/effect/spawner/minefield/manhack = 2
+ /obj/effect/spawner/random/waste/atmos_can = 10,
+ /obj/effect/spawner/random/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/random/waste/salvageable = 60,
+ /obj/effect/spawner/random/waste/grille_or_trash = 40,
+ /obj/effect/spawner/random/maintenance = 4,
+ /obj/effect/spawner/random/maintenance/two = 10,
+ /obj/effect/spawner/random/maintenance/three = 20,
+ /obj/effect/spawner/random/maintenance/four = 40,
+ /obj/effect/spawner/random/waste/salvageable = 80,
+ /obj/effect/spawner/random/mine = 8,
)
mob_spawn_list = list( //nor organics, more biased towards hivebots though
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50,
+ /mob/living/simple_animal/hostile/hivebot/strong = 20,
+ /mob/living/simple_animal/hostile/hivebot/ranged = 50,
+ /mob/living/simple_animal/hostile/hivebot/ranged/rapid = 50,
/mob/living/simple_animal/bot/firebot/rockplanet = 15,
/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
/mob/living/simple_animal/hostile/abandoned_minebot = 15,
/mob/living/simple_animal/bot/floorbot/rockplanet = 15,
- /obj/structure/spawner/wasteplanet/hivebot/low_threat = 20,
- /obj/structure/spawner/wasteplanet/hivebot/medium_threat = 10,
- /obj/structure/spawner/wasteplanet/hivebot/high_threat = 5,
- /obj/structure/spawner/wasteplanet/hivebot/extreme_threat = 2
+ /obj/structure/spawner/hivebot = 20
)
/datum/biome/cave/waste/metal/hivebot
flora_spawn_list = list(
- /obj/effect/spawner/lootdrop/waste/trash = 90,
- /obj/effect/spawner/lootdrop/waste/radiation = 16,
- /obj/effect/spawner/lootdrop/waste/radiation/more_rads = 2,
- /obj/effect/spawner/lootdrop/waste/girder = 60,
- /obj/structure/reagent_dispensers/fueltank = 10,
+ /obj/effect/spawner/random/trash/decal = 90,
+ /obj/effect/spawner/random/waste/radiation = 16,
+ /obj/effect/spawner/random/waste/radiation/more_rads = 2,
+ /obj/effect/spawner/random/waste/girder = 60,
/obj/structure/reagent_dispensers/watertank = 20,
/obj/item/stack/cable_coil/cut = 50,
/obj/structure/closet/crate/secure/loot = 3,
- /obj/effect/spawner/lootdrop/maintenance = 2,
- /obj/effect/spawner/lootdrop/maintenance/two = 5,
- /obj/effect/spawner/lootdrop/maintenance/three = 10,
- /obj/effect/spawner/lootdrop/maintenance/four = 20,
- /obj/effect/spawner/lootdrop/waste/salvageable = 40,
+ /obj/effect/spawner/random/maintenance = 2,
+ /obj/effect/spawner/random/maintenance/two = 5,
+ /obj/effect/spawner/random/maintenance/three = 10,
+ /obj/effect/spawner/random/maintenance/four = 20,
+ /obj/effect/spawner/random/waste/salvageable = 40,
/obj/structure/foamedmetal = 100,
- /obj/item/mine/proximity/spawner/manhack/live = 20
)
mob_spawn_list = list( //Whoops! All hivebots!
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 80,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 50,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 50,
-
+ /mob/living/simple_animal/hostile/hivebot/strong = 20,
+ /mob/living/simple_animal/hostile/hivebot/ranged = 40,
+ /mob/living/simple_animal/hostile/hivebot/ranged/rapid = 20,
+ /mob/living/simple_animal/hostile/hivebot = 20,
+ /mob/living/simple_animal/hostile/hivebot/defender = 10
)
mob_spawn_chance = 30
feature_spawn_list = list(
- /obj/structure/spawner/wasteplanet/hivebot/low_threat = 20,
- /obj/structure/spawner/wasteplanet/hivebot/medium_threat = 10,
- /obj/structure/spawner/wasteplanet/hivebot/high_threat = 5,
- /obj/structure/spawner/wasteplanet/hivebot/extreme_threat = 2,
- /obj/effect/spawner/minefield/manhack = 2
+ /obj/structure/spawner/hivebot = 1,
)
feature_spawn_chance = 2 //hivebot biomes should have their dongles
+
+/datum/biome/cave/waste/conc //da concrete jungle baybee
+ open_turf_types = list(
+ /turf/open/floor/concrete/wasteplanet = 10,
+ /turf/open/floor/concrete/reinforced/wasteplanet = 4,
+ /turf/open/floor/concrete/pavement/wasteplanet = 4
+ )
+ closed_turf_types = list(
+ /turf/closed/wall/concrete/wasteplanet = 15,
+ /turf/closed/wall/concrete/reinforced/wasteplanet = 3
+ )
+
+ flora_spawn_list = list(
+ /obj/effect/spawner/random/waste/mechwreck = 20,
+ /obj/effect/spawner/random/trash/decal = 90,
+ /obj/effect/spawner/random/waste/radiation = 16,
+ /obj/structure/reagent_dispensers/watertank = 20,
+ /obj/item/stack/cable_coil/cut = 50,
+ /obj/structure/closet/crate/secure/loot = 3,
+ /obj/effect/spawner/random/waste/atmos_can = 5,
+ /obj/effect/spawner/random/waste/atmos_can/rare = 1,
+ /obj/effect/spawner/random/waste/salvageable = 30,
+ /obj/effect/spawner/random/maintenance = 2,
+ /obj/effect/spawner/random/maintenance/two = 5,
+ /obj/effect/spawner/random/maintenance/three = 10,
+ /obj/effect/spawner/random/waste/salvageable = 40,
+ )
+ mob_spawn_list = list(
+ /mob/living/simple_animal/hostile/hivebot/strong = 80,
+ /mob/living/simple_animal/hostile/hivebot/ranged = 50,
+ /mob/living/simple_animal/hostile/hivebot/ranged/rapid = 50,
+ /mob/living/simple_animal/bot/firebot/rockplanet = 15,
+ /mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
+ /mob/living/simple_animal/hostile/abandoned_minebot = 15,
+ /mob/living/simple_animal/bot/floorbot/rockplanet = 15,
+ /obj/structure/spawner/hivebot = 35
+ )
+
+ flora_spawn_chance = 30
+ feature_spawn_chance = 8
+ mob_spawn_chance = 5
diff --git a/code/datums/mapgen/single_biome/WasteplanetCaves.dm b/code/datums/mapgen/single_biome/WasteplanetCaves.dm
deleted file mode 100644
index 08f63ba3149..00000000000
--- a/code/datums/mapgen/single_biome/WasteplanetCaves.dm
+++ /dev/null
@@ -1,67 +0,0 @@
-/datum/map_generator/single_biome/wasteplanet
- initial_closed_chance = 45
- smoothing_iterations = 50
- birth_limit = 4
- death_limit = 3
-
- biome_type = /datum/biome/cave/wasteplanet
- area_type = /area/overmap_encounter/planetoid/wasteplanet
-
-/datum/biome/cave/wasteplanet
- open_turf_types = list(/turf/open/floor/plating/asteroid/wasteplanet = 50,
- /turf/open/floor/plating/rust/wasteplanet = 10,
- /turf/open/floor/plating/wasteplanet = 5)
- closed_turf_types = list(/turf/closed/mineral/random/wasteplanet = 45,
- /turf/closed/wall/rust = 10,)
-
- flora_spawn_list = list(
- /obj/structure/mecha_wreckage/ripley = 15,
- /obj/structure/mecha_wreckage/ripley/firefighter = 9,
- /obj/structure/mecha_wreckage/ripley/mkii = 9,
- /obj/structure/girder = 60,
- /obj/structure/reagent_dispensers/fueltank = 30,
- /obj/item/stack/cable_coil/cut = 30,
- /obj/effect/decal/cleanable/greenglow = 60,
- /obj/effect/decal/cleanable/glass = 30,
- /obj/structure/closet/crate/secure/loot = 3,
- /obj/machinery/portable_atmospherics/canister/toxins = 3,
- /obj/machinery/portable_atmospherics/canister/carbon_dioxide = 3,
- /obj/structure/radioactive = 6,
- /obj/structure/radioactive/stack = 6,
- /obj/structure/radioactive/waste = 6,
- /obj/structure/flora/ash/garden/waste = 15,
- /obj/structure/flora/ash/glowshroom = 90,
-
- /obj/structure/salvageable/machine = 20,
- /obj/structure/salvageable/autolathe = 15,
- /obj/structure/salvageable/computer = 10,
- /obj/structure/salvageable/protolathe = 10,
- /obj/structure/salvageable/circuit_imprinter = 8,
- /obj/structure/salvageable/destructive_analyzer = 8,
- /obj/structure/salvageable/server = 8,
- /obj/item/mine/pressure/explosive/rusty/live = 30,
- /obj/effect/spawner/lootdrop/mine = 8
- )
- feature_spawn_list = list(
- /obj/structure/geyser/random = 1,
- /obj/effect/spawner/minefield = 1
- )
- mob_spawn_list = list(
- //hivebots, not too difficult
- /mob/living/simple_animal/hostile/hivebot/strong/rockplanet = 70,
- /mob/living/simple_animal/hostile/hivebot/range/rockplanet = 40,
- /mob/living/simple_animal/hostile/hivebot/rapid/rockplanet = 30,
- //crystal mobs, very difficult
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal = 1,
- /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/forgotten = 1,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/crystal = 1,
- //bots, are hostile
- /mob/living/simple_animal/bot/firebot/rockplanet = 15,
- /mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
- /mob/living/simple_animal/hostile/abandoned_minebot = 15,
- /mob/living/simple_animal/bot/floorbot/rockplanet = 15,
- )
-
- flora_spawn_chance = 10
- feature_spawn_chance = 0.1
- mob_spawn_chance = 2
diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm
index ab3a76d2ddf..d834a03b02a 100644
--- a/code/datums/martial/krav_maga.dm
+++ b/code/datums/martial/krav_maga.dm
@@ -211,9 +211,9 @@
/obj/item/clothing/gloves/krav_maga/combatglovesplus
name = "combat gloves plus"
- desc = "These tactical gloves are fireproof and electrically insulated, and through the use of nanochip technology will teach you the martial art of krav maga."
+ desc = "These tactical gloves are fireproof, and through the use of nanochip technology will teach you the martial art of krav maga."
icon_state = "black"
- siemens_coefficient = 0
+ siemens_coefficient = 0.5
permeability_coefficient = 0.05
strip_delay = 80
cold_protection = HANDS
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 72d26cf7436..e4e3ef90ebc 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -169,96 +169,3 @@
to_chat(usr, "Crashing Wave Kick: Harm Disarm. Launch people brutally across rooms, and away from you.")
to_chat(usr, "Keelhaul: Harm Grab. Kick opponents to the floor. Against prone targets, deal additional stamina damage and disarm them.")
to_chat(usr, "In addition, your body has become incredibly resilient to most forms of attack. Weapons cannot readily pierce your hardened skin, and you are highly resistant to stuns and knockdowns, and can block all projectiles in Throw Mode. However, you are not invincible, and sustained damage will take it's toll. Avoid heat at all costs!")
-
-/obj/item/staff/bostaff
- name = "bo staff"
- desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts. Can be wielded to both kill and incapacitate."
- force = 10
- w_class = WEIGHT_CLASS_BULKY
- slot_flags = ITEM_SLOT_BACK
- throwforce = 20
- throw_speed = 2
- attack_verb = list("smashed", "slammed", "whacked", "thwacked")
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "bostaff0"
- base_icon_state = "bostaff"
- lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
- block_chance = 50
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/staff/bostaff/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
-
-/obj/item/staff/bostaff/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=24, icon_wielded="[base_icon_state]1")
-
-/// triggered on wield of two handed item
-/obj/item/staff/bostaff/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/staff/bostaff/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
-/obj/item/staff/bostaff/update_icon_state()
- icon_state = "[base_icon_state]0"
- return ..()
-
-/obj/item/staff/bostaff/attack(mob/target, mob/living/user)
- add_fingerprint(user)
- if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
- to_chat(user, "You club yourself over the head with [src].")
- user.Paralyze(60)
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- H.apply_damage(2*force, BRUTE, BODY_ZONE_HEAD)
- else
- user.take_bodypart_damage(2*force)
- return
- if(iscyborg(target))
- return ..()
- if(!isliving(target))
- return ..()
- var/mob/living/carbon/C = target
- if(C.stat)
- to_chat(user, "It would be dishonorable to attack a foe while they cannot retaliate.")
- return
- if(user.a_intent == INTENT_DISARM)
- if(!wielded)
- return ..()
- if(!ishuman(target))
- return ..()
- var/mob/living/carbon/human/H = target
- var/list/fluffmessages = list("club", "smack", "broadside", "beat", "slam")
- H.visible_message("[user] [pick(fluffmessages)]s [H] with [src]!", \
- "[user] [pick(fluffmessages)]s you with [src]!", "You hear a sickening sound of flesh hitting flesh!", null, user)
- to_chat(user, "You [pick(fluffmessages)] [H] with [src]!")
- playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, TRUE, -1)
- H.adjustStaminaLoss(rand(13,20))
- if(prob(10))
- H.visible_message("[H] collapses!", \
- "Your legs give out!")
- H.Paralyze(80)
- if(H.staminaloss && !H.IsSleeping())
- var/total_health = (H.health - H.staminaloss)
- if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat)
- H.visible_message("[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!", \
- "You're knocked unconscious by [user]!", "You hear a sickening sound of flesh hitting flesh!", null, user)
- to_chat(user, "You deliver a heavy hit to [H]'s head, knocking [H.p_them()] out cold!")
- H.SetSleeping(600)
- H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
- else
- return ..()
-
-/obj/item/staff/bostaff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(!wielded)
- return ..()
- return FALSE
diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm
index 4f505cb2a3e..1b05f7d7ef9 100644
--- a/code/datums/materials/_material.dm
+++ b/code/datums/materials/_material.dm
@@ -79,6 +79,16 @@ Simple datum which is instanced once per type and is used for every object of sa
/atom/proc/mat_update_desc(/datum/material/mat)
return
+
+/**
+ * This proc is called when the mat is found in an item that's consumed by accident. see /obj/item/proc/on_accidental_consumption.
+ * Arguments
+ * * M - person consuming the mat
+ * * S - (optional) item the mat is contained in (NOT the item with the mat itself)
+ */
+/datum/material/proc/on_accidental_mat_consumption(mob/living/carbon/M, obj/item/S)
+ return FALSE
+
///This proc is called when the material is added to an object specifically.
/datum/material/proc/on_applied_obj(obj/o, amount, material_flags)
if(material_flags & MATERIAL_AFFECT_STATISTICS)
diff --git a/code/datums/materials/meat.dm b/code/datums/materials/meat.dm
index 9539b284777..8512753a22a 100644
--- a/code/datums/materials/meat.dm
+++ b/code/datums/materials/meat.dm
@@ -5,7 +5,6 @@
desc = "Meat"
color = rgb(214, 67, 67)
categories = list(MAT_CATEGORY_RIGID = TRUE)
- sheet_type = /obj/item/stack/sheet/meat
value_per_unit = 0.05
beauty_modifier = -0.3
strength_modifier = 0.7
@@ -13,22 +12,3 @@
item_sound_override = 'sound/effects/meatslap.ogg'
turf_sound_override = FOOTSTEP_MEAT
texture_layer_icon_state = "meat"
-
-/datum/material/meat/on_removed(atom/source, amount, material_flags)
- . = ..()
- qdel(source.GetComponent(/datum/component/edible))
-
-/datum/material/meat/on_applied_obj(obj/O, amount, material_flags)
- . = ..()
- O.obj_flags |= UNIQUE_RENAME //So you can name it after the person its made from, a depressing comprimise.
- make_edible(O, amount, material_flags)
-
-/datum/material/meat/on_applied_turf(turf/T, amount, material_flags)
- . = ..()
- make_edible(T, amount, material_flags)
-
-/datum/material/meat/proc/make_edible(atom/source, amount, material_flags)
- var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT)
- var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT)
- source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, RAW | MEAT | GROSS, null, 30, list("Fleshy"))
-
diff --git a/code/datums/materials/pizza.dm b/code/datums/materials/pizza.dm
deleted file mode 100644
index 62479d90e0d..00000000000
--- a/code/datums/materials/pizza.dm
+++ /dev/null
@@ -1,31 +0,0 @@
-/datum/material/pizza
- name = "pizza"
- id = "pizza"
- desc = "~Jamme, jamme, n'coppa, jamme ja! Jamme, jamme, n'coppa jamme ja, funi-culi funi-cala funi-culi funi-cala!! Jamme jamme ja funiculi funicula!~"
- color = "#FF9F23"
- categories = list(MAT_CATEGORY_RIGID = TRUE)
- sheet_type = /obj/item/stack/sheet/pizza
- value_per_unit = 0.05
- beauty_modifier = 0.1
- strength_modifier = 0.7
- armor_modifiers = list("melee" = 0.3, "bullet" = 0.3, "laser" = 1.2, "energy" = 1.2, "bomb" = 0.3, "bio" = 0, "rad" = 0.7, "fire" = 1, "acid" = 1)
- item_sound_override = 'sound/effects/meatslap.ogg'
- turf_sound_override = FOOTSTEP_MEAT
- texture_layer_icon_state = "pizza"
-
-/datum/material/pizza/on_removed(atom/source, amount, material_flags)
- . = ..()
- qdel(source.GetComponent(/datum/component/edible))
-
-/datum/material/pizza/on_applied_obj(obj/O, amount, material_flags)
- . = ..()
- make_edible(O, amount, material_flags)
-
-/datum/material/pizza/on_applied_turf(turf/T, amount, material_flags)
- . = ..()
- make_edible(T, amount, material_flags)
-
-/datum/material/pizza/proc/make_edible(atom/source, amount, material_flags)
- var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT)
- var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT)
- source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, GRAIN | MEAT | DAIRY | VEGETABLES, null, 30, list("crust", "tomato", "cheese", "meat"), filling_color = COLOR_YELLOW)
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 96ca4b12d8b..ea9f6918706 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -345,12 +345,6 @@
remove_antag_datum(/datum/antagonist/wizard)
special_role = null
-/datum/mind/proc/remove_cultist()
- if(src in SSticker.mode.cult)
- SSticker.mode.remove_cultist(src, 0, 0)
- special_role = null
- remove_antag_equip()
-
/datum/mind/proc/remove_antag_equip()
var/list/Mob_Contents = current.get_contents()
for(var/obj/item/I in Mob_Contents)
@@ -363,7 +357,6 @@
remove_traitor()
remove_nukeop()
remove_wizard()
- remove_cultist()
/datum/mind/proc/equip_traitor(employer = "The Syndicate", silent = FALSE, datum/antagonist/uplink_owner)
if(!current)
@@ -436,10 +429,7 @@
//Link a new mobs mind to the creator of said mob. They will join any team they are currently on, and will only switch teams when their creator does.
/datum/mind/proc/enslave_mind_to_creator(mob/living/creator)
- if(iscultist(creator))
- SSticker.mode.add_cultist(src)
-
- else if(is_nuclear_operative(creator))
+ if(is_nuclear_operative(creator))
var/datum/antagonist/nukeop/converter = creator.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE)
var/datum/antagonist/nukeop/N = new()
N.send_to_spawnpoint = FALSE
@@ -708,14 +698,6 @@
assigned_role = ROLE_WIZARD
add_antag_datum(/datum/antagonist/wizard)
-
-/datum/mind/proc/make_Cultist()
- if(!has_antag_datum(/datum/antagonist/cult,TRUE))
- SSticker.mode.add_cultist(src,FALSE,equip=TRUE)
- special_role = ROLE_CULTIST
- to_chat(current, "You catch a glimpse of the Realm of Nar'Sie, The Geometer of Blood. You now see how flimsy your world is, you see that it should be open to the knowledge of Nar'Sie.")
- to_chat(current, "Assist your new brethren in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.")
-
/datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S)
spell_list += S
S.action.Grant(current)
diff --git a/code/datums/mood_events/beauty_events.dm b/code/datums/mood_events/beauty_events.dm
index 47c31811290..87d0536bdeb 100644
--- a/code/datums/mood_events/beauty_events.dm
+++ b/code/datums/mood_events/beauty_events.dm
@@ -1,19 +1,19 @@
/datum/mood_event/horridroom
- description = "This room looks terrible!\n"
+ description = span_boldwarning("This room looks terrible!")
mood_change = -5
/datum/mood_event/badroom
- description = "This room looks really bad.\n"
+ description = span_warning("This room looks really bad.")
mood_change = -3
/datum/mood_event/decentroom
- description = "This room looks alright.\n"
+ description = span_nicegreen("This room looks alright.")
mood_change = 1
/datum/mood_event/goodroom
- description = "This room looks really pretty!\n"
+ description = span_nicegreen("This room looks really pretty!")
mood_change = 3
/datum/mood_event/greatroom
- description = "This room is beautiful!\n"
+ description = span_nicegreen("This room is beautiful!")
mood_change = 5
diff --git a/code/datums/mood_events/drink_events.dm b/code/datums/mood_events/drink_events.dm
index b0a6d441814..d768ac7cdc4 100644
--- a/code/datums/mood_events/drink_events.dm
+++ b/code/datums/mood_events/drink_events.dm
@@ -1,6 +1,6 @@
/datum/mood_event/drunk
mood_change = 3
- description = "Everything just feels better after a drink or two.\n"
+ description = span_nicegreen("Everything just feels better after a drink or two.")
/datum/mood_event/drunk/add_effects(param)
// Display blush visual
@@ -13,26 +13,26 @@
owner.update_body()
/datum/mood_event/quality_nice
- description = "That drink wasn't bad at all.\n"
+ description = span_nicegreen("That drink wasn't bad at all.")
mood_change = 2
timeout = 7 MINUTES
/datum/mood_event/quality_good
- description = "That drink was pretty good.\n"
+ description = span_nicegreen("That drink was pretty good.")
mood_change = 4
timeout = 7 MINUTES
/datum/mood_event/quality_verygood
- description = "That drink was great!\n"
+ description = span_nicegreen("That drink was great!")
mood_change = 6
timeout = 7 MINUTES
/datum/mood_event/quality_fantastic
- description = "That drink was amazing!\n"
+ description = span_nicegreen("That drink was amazing!")
mood_change = 8
timeout = 7 MINUTES
/datum/mood_event/amazingtaste
- description = "Amazing taste!\n"
+ description = span_nicegreen("Amazing taste!")
mood_change = 50
timeout = 10 MINUTES
diff --git a/code/datums/mood_events/drug_events.dm b/code/datums/mood_events/drug_events.dm
index 028973c5c83..6294ef67ce4 100644
--- a/code/datums/mood_events/drug_events.dm
+++ b/code/datums/mood_events/drug_events.dm
@@ -1,14 +1,14 @@
/datum/mood_event/high
mood_change = 6
- description = "Woooow duudeeeeee...I'm tripping baaalls...\n"
+ description = span_nicegreen("Woooow duudeeeeee...I'm tripping baaalls...")
/datum/mood_event/smoked
- description = "I have had a smoke recently.\n"
+ description = span_nicegreen("I have had a smoke recently.")
mood_change = 1
timeout = 6 MINUTES
/datum/mood_event/wrong_brand
- description = "That brand of cigarette just doesn't hit right.\n"
+ description = span_warning("That brand of cigarette just doesn't hit right.")
mood_change = -1
timeout = 6 MINUTES
@@ -17,72 +17,72 @@
timeout = 5 MINUTES
/datum/mood_event/overdose/add_effects(drug_name)
- description = "I think I took a bit too much of that [drug_name]\n"
+ description = span_warning("I think I took a bit too much of that [drug_name]")
/datum/mood_event/withdrawal_light
mood_change = -2
/datum/mood_event/withdrawal_light/add_effects(drug_name)
- description = "I could use some [drug_name]\n"
+ description = span_warning("I could use some [drug_name]")
/datum/mood_event/withdrawal_medium
mood_change = -5
/datum/mood_event/withdrawal_medium/add_effects(drug_name)
- description = "I really need [drug_name]\n"
+ description = span_warning("I really need [drug_name]")
/datum/mood_event/withdrawal_severe
mood_change = -8
/datum/mood_event/withdrawal_severe/add_effects(drug_name)
- description = "Oh god I need some of that [drug_name]\n"
+ description = span_boldwarning("Oh god I need some of that [drug_name]")
/datum/mood_event/withdrawal_critical
mood_change = -10
/datum/mood_event/withdrawal_critical/add_effects(drug_name)
- description = "[drug_name]! [drug_name]! [drug_name]!\n"
+ description = span_boldwarning("[drug_name]! [drug_name]! [drug_name]!")
/datum/mood_event/happiness_drug
- description = "Can't feel a thing...\n"
+ description = span_nicegreen("Can't feel a thing...")
mood_change = 50
/datum/mood_event/happiness_drug_good_od
- description = "YES! YES!! YES!!!\n"
+ description = span_nicegreen("YES! YES!! YES!!!")
mood_change = 100
timeout = 30 SECONDS
special_screen_obj = "mood_happiness_good"
/datum/mood_event/happiness_drug_bad_od
- description = "NO! NO!! NO!!!\n"
+ description = span_boldwarning("NO! NO!! NO!!!")
mood_change = -100
timeout = 30 SECONDS
special_screen_obj = "mood_happiness_bad"
/datum/mood_event/narcotic_medium
- description = "I feel comfortably numb.\n"
+ description = span_nicegreen("I feel comfortably numb.")
mood_change = 4
timeout = 3 MINUTES
/datum/mood_event/narcotic_heavy
- description = "I feel like I'm wrapped up in cotton!\n"
+ description = span_nicegreen("I feel like I'm wrapped up in cotton!")
mood_change = 9
timeout = 3 MINUTES
/datum/mood_event/stimulant_medium
- description = "I have so much energy! I feel like I could do anything!\n"
+ description = span_nicegreen("I have so much energy! I feel like I could do anything!")
mood_change = 4
timeout = 3 MINUTES
/datum/mood_event/stimulant_heavy
- description = "Eh ah AAAAH! HA HA HA HA HAA! Uuuh.\n"
+ description = span_nicegreen("Eh ah AAAAH! HA HA HA HA HAA! Uuuh.")
mood_change = 6
timeout = 3 MINUTES
/datum/mood_event/legion_good
- mood_change = 20
- description = "I'm feeling great!\n"
+ mood_change = 5
+ description = span_nicegreen("Everything feels so light! I'm strong! Unstoppable!")
/datum/mood_event/legion_bad
- mood_change = -20
- description = "That felt awful!\n"
+ mood_change = -4
+ description = span_warning("Something is slithering through my veins")
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index f5e51d1d59f..067807d7a6b 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -1,93 +1,93 @@
/datum/mood_event/handcuffed
- description = "I guess my antics have finally caught up with me.\n"
+ description = span_warning("I guess my antics have finally caught up with me.")
mood_change = -1
/datum/mood_event/broken_vow //Used for when mimes break their vow of silence
- description = "I have brought shame upon my name, and betrayed my fellow mimes by breaking our sacred vow...\n"
+ description = span_boldwarning("I have brought shame upon my name, and betrayed my fellow mimes by breaking our sacred vow...")
mood_change = -8
/datum/mood_event/on_fire
- description = "I'M ON FIRE!!!\n"
+ description = span_boldwarning("I'M ON FIRE!!!")
mood_change = -12
/datum/mood_event/suffocation
- description = "CAN'T... BREATHE...\n"
+ description = span_boldwarning("CAN'T... BREATHE...")
mood_change = -12
/datum/mood_event/burnt_thumb
- description = "I shouldn't play with lighters...\n"
+ description = span_warning("I shouldn't play with lighters...")
mood_change = -1
timeout = 2 MINUTES
/datum/mood_event/cold
- description = "It's way too cold in here.\n"
+ description = span_warning("It's way too cold in here.")
mood_change = -5
/datum/mood_event/hot
- description = "It's getting hot in here.\n"
+ description = span_warning("It's getting hot in here.")
mood_change = -5
/datum/mood_event/creampie
- description = "I've been creamed. Tastes like pie flavor.\n"
+ description = span_warning("I've been creamed. Tastes like pie flavor.")
mood_change = -2
timeout = 3 MINUTES
/datum/mood_event/slipped
- description = "I slipped. I should be more careful next time...\n"
+ description = span_warning("I slipped. I should be more careful next time...")
mood_change = -2
timeout = 3 MINUTES
/datum/mood_event/eye_stab
- description = "I used to be an adventurer like you, until I took a screwdriver to the eye.\n"
+ description = span_boldwarning("I used to be an adventurer like you, until I took a screwdriver to the eye.")
mood_change = -4
timeout = 3 MINUTES
/datum/mood_event/delam //SM delamination
- description = "Those God damn engineers can't do anything right...\n"
+ description = span_boldwarning("Those God damn engineers can't do anything right...")
mood_change = -2
timeout = 4 MINUTES
/datum/mood_event/depression_minimal
- description = "I feel a bit down.\n"
+ description = span_warning("I feel a bit down.")
mood_change = -10
timeout = 2 MINUTES
/datum/mood_event/depression_mild
- description = "I feel sad for no particular reason.\n"
+ description = span_warning("I feel sad for no particular reason.")
mood_change = -12
timeout = 2 MINUTES
/datum/mood_event/depression_moderate
- description = "I feel miserable.\n"
+ description = span_warning("I feel miserable.")
mood_change = -14
timeout = 2 MINUTES
/datum/mood_event/depression_severe
- description = "I've lost all hope.\n"
+ description = span_warning("I've lost all hope.")
mood_change = -16
timeout = 2 MINUTES
/datum/mood_event/dismembered
- description = "AHH! I WAS USING THAT LIMB!\n"
+ description = span_boldwarning("AHH! I WAS USING THAT LIMB!")
mood_change = -10
timeout = 8 MINUTES
/datum/mood_event/tased
- description = "There's no \"z\" in \"taser\". It's in the zap.\n"
+ description = span_warning("There's no \"z\" in \"taser\". It's in the zap.")
mood_change = -3
timeout = 2 MINUTES
/datum/mood_event/embedded
- description = "Pull it out!\n"
+ description = span_boldwarning("Pull it out!")
mood_change = -7
/datum/mood_event/table
- description = "Someone threw me on a table!\n"
+ description = span_warning("Someone threw me on a table!")
mood_change = -2
timeout = 2 MINUTES
/datum/mood_event/table_headsmash
- description = "My fucking head, that hurts..."
+ description = span_warning("My fucking head, that hurts...")
mood_change = -3
timeout = 3 MINUTES
@@ -96,67 +96,67 @@
/datum/mood_event/brain_damage/add_effects()
var/damage_message = pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")
- description = "Hurr durr... [damage_message]\n"
+ description = span_warning("Hurr durr... [damage_message]")
/datum/mood_event/hulk //Entire duration of having the hulk mutation
- description = "HULK SMASH!\n"
+ description = span_warning("HULK SMASH!")
mood_change = -4
/datum/mood_event/epilepsy //Only when the mutation causes a seizure
- description = "I should have paid attention to the epilepsy warning.\n"
+ description = span_warning("I should have paid attention to the epilepsy warning.")
mood_change = -3
timeout = 5 MINUTES
/datum/mood_event/nyctophobia
- description = "It sure is dark around here...\n"
+ description = span_warning("It sure is dark around here...")
mood_change = -3
/datum/mood_event/family_heirloom_missing
- description = "I'm missing my family heirloom...\n"
+ description = span_warning("I'm missing my family heirloom...")
mood_change = -4
/datum/mood_event/healsbadman
- description = "I feel like I'm held together by flimsy string, and could fall apart at any moment!\n"
+ description = span_warning("I feel like something is moving through my veins, eating away at me!")
mood_change = -4
timeout = 2 MINUTES
/datum/mood_event/jittery
- description = "I'm nervous and on edge and I can't stand still!!\n"
+ description = span_warning("I'm nervous and on edge and I can't stand still!!")
mood_change = -2
/datum/mood_event/vomit
- description = "I just threw up. Gross.\n"
+ description = span_warning("I just threw up. Gross.")
mood_change = -2
timeout = 2 MINUTES
/datum/mood_event/vomitself
- description = "I just threw up all over myself. This is disgusting.\n"
+ description = span_warning("I just threw up all over myself. This is disgusting.")
mood_change = -4
timeout = 3 MINUTES
/datum/mood_event/painful_medicine
- description = "Medicine may be good for me but right now it stings like hell.\n"
+ description = span_warning("Medicine may be good for me but right now it stings like hell.")
mood_change = -5
timeout = 60 SECONDS
/datum/mood_event/spooked
- description = "The rattling of those bones...It still haunts me.\n"
+ description = span_warning("The rattling of those bones...It still haunts me.")
mood_change = -4
timeout = 4 MINUTES
/datum/mood_event/loud_gong
- description = "That loud gong noise really hurt my ears!\n"
+ description = span_warning("That loud gong noise really hurt my ears!")
mood_change = -3
timeout = 2 MINUTES
/datum/mood_event/notcreeping
- description = "The voices are not happy, and they painfully contort my thoughts into getting back on task.\n"
+ description = span_warning("The voices are not happy, and they painfully contort my thoughts into getting back on task.")
mood_change = -6
timeout = 30
hidden = TRUE
/datum/mood_event/notcreepingsevere//not hidden since it's so severe
- description = "THEY NEEEEEEED OBSESSIONNNN!!\n"
+ description = span_boldwarning("THEY NEEEEEEED OBSESSIONNNN!!")
mood_change = -30
timeout = 30
@@ -165,75 +165,75 @@
for(var/i in 1 to rand(3,5))
unstable += copytext_char(name, -1)
var/unhinged = uppertext(unstable.Join(""))//example Tinea Luxor > TINEA LUXORRRR (with randomness in how long that slur is)
- description = "THEY NEEEEEEED [unhinged]!!\n"
+ description = span_boldwarning("THEY NEEEEEEED [unhinged]!!")
/datum/mood_event/sapped
- description = "Some unexplainable sadness is consuming me...\n"
+ description = span_boldwarning("Some unexplainable sadness is consuming me...")
mood_change = -15
timeout = 90 SECONDS
/datum/mood_event/back_pain
- description = "Bags never sit right on my back, this hurts like hell!\n"
+ description = span_boldwarning("Bags never sit right on my back, this hurts like hell!")
mood_change = -15
/datum/mood_event/sad_empath
- description = "Someone seems upset...\n"
+ description = span_warning("Someone seems upset...")
mood_change = -2
timeout = 60 SECONDS
/datum/mood_event/sad_empath/add_effects(mob/sadtarget)
- description = "[sadtarget.name] seems upset...\n"
+ description = span_warning("[sadtarget.name] seems upset...")
/datum/mood_event/sacrifice_bad
- description ="Those darn savages!\n"
+ description =span_warning("Those darn savages!")
mood_change = -5
timeout = 2 MINUTES
/datum/mood_event/artbad
- description = "I've produced better art than that from my ass.\n"
+ description = span_warning("I've produced better art than that from my ass.")
mood_change = -2
timeout = 1200
/datum/mood_event/graverobbing
- description ="I just desecrated someone's grave... I can't believe I did that...\n"
+ description =span_boldwarning("I just desecrated someone's grave... I can't believe I did that...")
mood_change = -8
timeout = 3 MINUTES
/datum/mood_event/deaths_door
- description = "This is it... I'm really going to die.\n"
+ description = span_boldwarning("This is it... I'm really going to die.")
mood_change = -20
/datum/mood_event/gunpoint
- description = "This guy is insane! I better be careful....\n"
+ description = span_boldwarning("This guy is insane! I better be careful....")
mood_change = -10
/datum/mood_event/tripped
- description = "I can't believe I fell for the oldest trick in the book!\n"
+ description = span_boldwarning("I can't believe I fell for the oldest trick in the book!")
mood_change = -5
timeout = 2 MINUTES
/datum/mood_event/untied
- description = "I hate when my shoes come untied!\n"
+ description = span_boldwarning("I hate when my shoes come untied!")
mood_change = -3
timeout = 1 MINUTES
/datum/mood_event/high_five_alone
- description = "I tried getting a high-five with no one around, how embarassing!\n"
+ description = span_boldwarning("I tried getting a high-five with no one around, how embarassing!")
mood_change = -2
timeout = 1 MINUTES
/datum/mood_event/high_five_full_hand
- description = "Oh God, I don't even know how to high-five correctly...\n"
+ description = span_boldwarning("Oh God, I don't even know how to high-five correctly...")
mood_change = -1
timeout = 45 SECONDS
/datum/mood_event/left_hanging
- description = "But everyone loves high fives! Maybe people just... hate me?\n"
+ description = span_boldwarning("But everyone loves high fives! Maybe people just... hate me?")
mood_change = -2
timeout = 1.5 MINUTES
/datum/mood_event/too_slow
- description = "NO! HOW COULD I BE.... TOO SLOW???\n"
+ description = span_boldwarning("NO! HOW COULD I BE.... TOO SLOW???")
mood_change = -2 // multiplied by how many people saw it happen, up to 8, so potentially massive. the ULTIMATE prank carries a lot of weight
timeout = 2 MINUTES
@@ -250,55 +250,70 @@
//These are unused so far but I want to remember them to use them later
/datum/mood_event/surgery
- description = "HE'S CUTTING ME OPEN!!\n"
+ description = span_boldwarning("HE'S CUTTING ME OPEN!!")
mood_change = -8
/datum/mood_event/nanite_sadness
- description = "+++++++HAPPINESS SUPPRESSION+++++++\n"
+ description = span_warning_robot("+++++++HAPPINESS SUPPRESSION+++++++")
mood_change = -7
/datum/mood_event/nanite_sadness/add_effects(message)
- description = "+++++++[message]+++++++\n"
+ description = span_warning_robot("+++++++[message]+++++++")
/datum/mood_event/bald
- description ="I need something to cover my head...\n"
+ description = span_warning("I need something to cover my head...")
mood_change = -3
/datum/mood_event/bad_touch
- description = "I don't like when people touch me.\n"
+ description = span_warning("I don't like when people touch me.")
mood_change = -3
timeout = 4 MINUTES
/datum/mood_event/very_bad_touch
- description = "I really don't like when people touch me.\n"
+ description = span_warning("I really don't like when people touch me.")
mood_change = -5
timeout = 4 MINUTES
/datum/mood_event/noogie
- description = "Ow! This is like space high school all over again...\n"
+ description = span_warning("Ow! This is like space high school all over again...")
mood_change = -2
timeout = 1 MINUTES
/datum/mood_event/noogie_harsh
- description = "OW!! That was even worse than a regular noogie!\n"
+ description = span_warning("OW!! That was even worse than a regular noogie!")
mood_change = -4
timeout = 1 MINUTES
/datum/mood_event/irritate
- description = "It feels like I'm itching all over!"
+ description = span_warning("It feels like I'm itching all over!")
mood_change = -2
/datum/mood_event/cement
- description = "I was forced to eat cement...\n"
+ description = span_warning("I was forced to eat cement...")
mood_change = -6
timeout = 4 MINUTES
/datum/mood_event/joywire_emp
- description = span_boldwarning("IT'S GONE!! IT'S GONE!!\n")
+ description = span_boldwarning("IT'S GONE!! IT'S GONE!!")
mood_change = -30
timeout = 5 MINUTES
/datum/mood_event/mindscrew
- description = span_boldwarning("It isn't ending... it isn't ending, come on...\n")
+ description = span_boldwarning("It isn't ending... it isn't ending, come on...")
mood_change = -18
timeout = 3 MINUTES
+
+/datum/mood_event/bad_touch_bear_hug
+ description = span_warning("I just got squeezed way too hard.")
+ mood_change = -3
+ timeout = 2 MINUTES
+
+/datum/mood_event/rippedtail
+ description = span_boldwarning("I ripped their tail right off, what have I done!")
+ mood_change = -5
+ timeout = 30 SECONDS
+
+/datum/mood_event/bad_boop
+ description = span_warning("Someone booped my nose... ACK!")
+ mood_change = -3
+ timeout = 4 MINUTES
diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm
index f9e339c3c08..c69f7fb6a50 100644
--- a/code/datums/mood_events/generic_positive_events.dm
+++ b/code/datums/mood_events/generic_positive_events.dm
@@ -1,186 +1,194 @@
/datum/mood_event/hug
- description = "Hugs are nice.\n"
+ description = span_nicegreen("Hugs are nice.")
mood_change = 1
+ timeout = 2
+
+/datum/mood_event/bear_hug
+ description = span_nicegreen("I got squeezed very tightly, but it was quite nice.")
+ mood_change = 2
timeout = 2 MINUTES
/datum/mood_event/betterhug
- description = "Someone was very nice to me.\n"
+ description = span_nicegreen("Someone was very nice to me.")
mood_change = 3
timeout = 4 MINUTES
/datum/mood_event/betterhug/add_effects(mob/friend)
- description = "[friend.name] was very nice to me.\n"
+ description = span_nicegreen("[friend.name] was very nice to me.")
/datum/mood_event/besthug
- description = "Someone is great to be around, they make me feel so happy!\n"
+ description = span_nicegreen("Someone is great to be around, they make me feel so happy!")
mood_change = 5
timeout = 4 MINUTES
/datum/mood_event/besthug/add_effects(mob/friend)
- description = "[friend.name] is great to be around, [friend.p_they()] makes me feel so happy!\n"
+ description = span_nicegreen("[friend.name] is great to be around, [friend.p_they()] makes me feel so happy!")
+
+/datum/mood_event/best_boop
+ description = span_nicegreen("Someone booped my nose, they are silly!")
+ mood_change = 5
+ timeout = 4 MINUTES
+
+/datum/mood_event/best_boop/add_effects(mob/friend)
+ description = span_nicegreen("[friend.name] booped my nose, [friend.p_they()] [friend.p_are()] silly!")
/datum/mood_event/warmhug
- description = "Warm cozy hugs are the best!\n"
+ description = span_nicegreen("Warm cozy hugs are the best!")
mood_change = 1
timeout = 2 MINUTES
/datum/mood_event/arcade
- description = "I beat the arcade game!\n"
+ description = span_nicegreen("I beat the arcade game!")
mood_change = 3
timeout = 8 MINUTES
/datum/mood_event/blessing
- description = "I've been blessed.\n"
+ description = span_nicegreen("I've been blessed.")
mood_change = 3
timeout = 8 MINUTES
/datum/mood_event/book_nerd
- description = "I have recently read a book.\n"
+ description = span_nicegreen("I have recently read a book.")
mood_change = 1
timeout = 5 MINUTES
/datum/mood_event/exercise
- description = "Working out releases those endorphins!\n"
+ description = span_nicegreen("Working out releases those endorphins!")
mood_change = 2
timeout = 5 MINUTES
/datum/mood_event/pet_animal
- description = "Animals are adorable! I can't stop petting them!\n"
+ description = span_nicegreen("Animals are adorable! I can't stop petting them!")
mood_change = 2
timeout = 5 MINUTES
/datum/mood_event/pet_animal/add_effects(mob/animal)
- description = "\The [animal.name] is adorable! I can't stop petting [animal.p_them()]!\n"
+ description = span_nicegreen("\The [animal.name] is adorable! I can't stop petting [animal.p_them()]!")
/datum/mood_event/honk
- description = "I've been honked!\n"
+ description = span_nicegreen("I've been honked!")
mood_change = 2
timeout = 4 MINUTES
special_screen_obj = "honked_nose"
special_screen_replace = FALSE
/datum/mood_event/perform_cpr
- description = "It feels good to save a life.\n"
+ description = span_nicegreen("It feels good to save a life.")
mood_change = 6
timeout = 8 MINUTES
/datum/mood_event/oblivious
- description = "What a lovely day.\n"
+ description = span_nicegreen("What a lovely day.")
mood_change = 3
/datum/mood_event/jolly
- description = "I feel happy for no particular reason.\n"
+ description = span_nicegreen("I feel happy for no particular reason.")
mood_change = 6
timeout = 2 MINUTES
/datum/mood_event/focused
- description = "I have a goal, and I will reach it, whatever it takes!\n" //Used for syndies, nukeops etc so they can focus on their goals
+ description = span_nicegreen("I have a goal, and I will reach it, whatever it takes!") //Used for syndies, nukeops etc so they can focus on their goals
mood_change = 4
hidden = TRUE
/datum/mood_event/badass_antag
- description = "I'm a fucking badass and everyone around me knows it. Just look at them; they're all fucking shaking at the mere thought of having me around.\n"
+ description = span_greentext("I'm a fucking badass and everyone around me knows it. Just look at them; they're all fucking shaking at the mere thought of having me around.")
mood_change = 7
hidden = TRUE
special_screen_obj = "badass_sun"
special_screen_replace = FALSE
/datum/mood_event/creeping
- description = "The voices have released their hooks on my mind! I feel free again!\n" //creeps get it when they are around their obsession
+ description = span_greentext("The voices have released their hooks on my mind! I feel free again!") //creeps get it when they are around their obsession
mood_change = 18
timeout = 3 SECONDS
hidden = TRUE
/datum/mood_event/revolution
- description = "VIVA LA REVOLUTION!\n"
+ description = span_nicegreen("VIVA LA REVOLUTION!")
mood_change = 3
hidden = TRUE
-/datum/mood_event/cult
- description = "I have seen the truth, praise the almighty one!\n"
- mood_change = 10 //maybe being a cultist isnt that bad after all
- hidden = TRUE
-
/datum/mood_event/family_heirloom
- description = "My family heirloom is safe with me.\n"
+ description = span_nicegreen("My family heirloom is safe with me.")
mood_change = 1
/datum/mood_event/rilena_fan
- description = "I love my RILENA merch!\n"
+ description = span_nicegreen("I love my RILENA merch!")
mood_change = 1
/datum/mood_event/rilena_super_fan
- description = "I love my RILENA hoodie!\n"
+ description = span_nicegreen("I love my RILENA hoodie!")
mood_change = 1
/datum/mood_event/goodmusic
- description = "There is something soothing about this music.\n"
+ description = span_nicegreen("There is something soothing about this music.")
mood_change = 3
timeout = 60 SECONDS
/datum/mood_event/chemical_euphoria
- description = "Heh...hehehe...hehe...\n"
+ description = span_nicegreen("Heh...hehehe...hehe...")
mood_change = 4
/datum/mood_event/chemical_laughter
- description = "Laughter really is the best medicine! Or is it?\n"
+ description = span_nicegreen("Laughter really is the best medicine! Or is it?")
mood_change = 4
timeout = 3 MINUTES
/datum/mood_event/chemical_superlaughter
- description = "*WHEEZE*\n"
+ description = span_nicegreen("*WHEEZE*")
mood_change = 12
timeout = 3 MINUTES
/datum/mood_event/religiously_comforted
- description = "You are comforted by the presence of a holy person.\n"
+ description = span_nicegreen("You are comforted by the presence of a holy person.")
mood_change = 3
timeout = 5 MINUTES
/datum/mood_event/clownshoes
- description = "The shoes are a clown's legacy, I never want to take them off!\n"
+ description = span_nicegreen("The shoes are a clown's legacy, I never want to take them off!")
mood_change = 5
/datum/mood_event/sacrifice_good
- description ="The gods are pleased with this offering!\n"
+ description =span_nicegreen("The gods are pleased with this offering!")
mood_change = 5
timeout = 3 MINUTES
/datum/mood_event/artok
- description = "It's nice to see people are making art around here.\n"
+ description = span_nicegreen("It's nice to see people are making art around here.")
mood_change = 2
timeout = 5 MINUTES
/datum/mood_event/artgood
- description = "What a thought-provoking piece of art. I'll remember that for a while.\n"
+ description = span_nicegreen("What a thought-provoking piece of art. I'll remember that for a while.")
mood_change = 4
timeout = 5 MINUTES
/datum/mood_event/artgreat
- description = "That work of art was so great it made me believe in the goodness of humanity. Says a lot in a place like this.\n"
+ description = span_nicegreen("That work of art was so great it made me believe in the goodness of humanity. Says a lot in a place like this.")
mood_change = 6
timeout = 5 MINUTES
/datum/mood_event/pet_borg
- description = "I just love my robotic friends!\n"
+ description = span_nicegreen("I just love my robotic friends!")
mood_change = 3
timeout = 5 MINUTES
/datum/mood_event/bottle_flip
- description = "The bottle landing like that was satisfying.\n"
+ description = span_nicegreen("The bottle landing like that was satisfying.")
mood_change = 2
timeout = 3 MINUTES
/datum/mood_event/hope_lavaland
- description = "What a peculiar emblem. It makes me feel hopeful for my future.\n"
+ description = span_nicegreen("What a peculiar emblem. It makes me feel hopeful for my future.")
mood_change = 5
/datum/mood_event/nanite_happiness
- description = "+++++++HAPPINESS ENHANCEMENT+++++++\n"
+ description = span_nicegreen_robot("+++++++HAPPINESS ENHANCEMENT+++++++")
mood_change = 7
/datum/mood_event/nanite_happiness/add_effects(message)
- description = "+++++++[message]+++++++\n"
+ description = span_nicegreen_robot("+++++++[message]+++++++")
/datum/mood_event/area
description = "" //Fill this out in the area
@@ -191,31 +199,31 @@
description = _description
/datum/mood_event/confident_mane
- description = "I'm feeling confident with a head full of hair.\n"
+ description = span_nicegreen("I'm feeling confident with a head full of hair.")
mood_change = 2
/datum/mood_event/dkickflip
- description = "I just witnessed the most RAD thing ever.\n"
+ description = span_nicegreen("I just witnessed the most RAD thing ever.")
mood_change = 5
timeout = 2 MINUTES
/datum/mood_event/high_five
- description = "I love getting high fives!\n"
+ description = span_nicegreen("I love getting high fives!")
mood_change = 2
timeout = 45 SECONDS
/datum/mood_event/high_ten
- description = "AMAZING! A HIGH-TEN!\n"
+ description = span_nicegreen("AMAZING! A HIGH-TEN!")
mood_change = 3
timeout = 45 SECONDS
/datum/mood_event/down_low
- description = "HA! What a rube, they never stood a chance...\n"
+ description = span_nicegreen("HA! What a rube, they never stood a chance...")
mood_change = 4
timeout = 1.5 MINUTES
/datum/mood_event/kiss
- description = "Someone blew a kiss at me, I must be a real catch!"
+ description = span_nicegreen("Someone blew a kiss at me, I must be a real catch!")
mood_change = 1.5
timeout = 2 MINUTES
@@ -223,21 +231,21 @@
if(!beau)
return
if(direct)
- description = "[beau.name] gave me a kiss, ahh!!"
+ description = span_nicegreen("[beau.name] gave me a kiss, ahh!!")
else
- description = "[beau.name] blew a kiss at me, I must be a real catch!"
+ description = span_nicegreen("[beau.name] blew a kiss at me, I must be a real catch!")
/datum/mood_event/fishing
- description = "Fishing is relaxing"
+ description = span_nicegreen("Fishing is relaxing")
mood_change = 5
timeout = 3 MINUTES
/datum/mood_event/joywire
- description = span_boldnicegreen("I feel so joyous! Oh, so joyous!\n")
+ description = span_boldnicegreen("I feel so joyous! Oh, so joyous!")
mood_change = 8
timeout = 10 SECONDS
/datum/mood_event/root
- description = span_nicegreen("I rooted recently, it feels good to charge naturally.\n")
+ description = span_nicegreen("I rooted recently, it feels good to charge naturally.")
mood_change = 5
timeout = 5 MINUTES
diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm
index 5f873cf40ff..a341e4170e1 100644
--- a/code/datums/mood_events/needs_events.dm
+++ b/code/datums/mood_events/needs_events.dm
@@ -1,89 +1,89 @@
//nutrition
/datum/mood_event/wellfed
- description = "I'm stuffed!\n"
+ description = span_nicegreen("I'm stuffed!")
mood_change = 8
/datum/mood_event/fed
- description = "I have recently had some food.\n"
+ description = span_nicegreen("I have recently had some food.")
mood_change = 5
/datum/mood_event/hungry
- description = "I'm getting a bit hungry.\n"
+ description = span_warning("I'm getting a bit hungry.")
mood_change = -6
/datum/mood_event/starving
- description = "I'm starving!\n"
+ description = span_boldwarning("I'm starving!")
mood_change = -10
//charge
/datum/mood_event/supercharged
- description = "I can't possibly keep all this power inside, I need to release some quick!\n"
+ description = span_boldwarning("I can't possibly keep all this power inside, I need to release some quick!")
mood_change = -10
/datum/mood_event/overcharged
- description = "I feel dangerously overcharged, perhaps I should release some power.\n"
+ description = span_warning("I feel dangerously overcharged, perhaps I should release some power.")
mood_change = -4
/datum/mood_event/charged
- description = "I feel the power in my veins!\n"
+ description = span_nicegreen("I feel the power in my veins!")
mood_change = 6
/datum/mood_event/lowpower
- description = "My power is running low, I should go charge up somewhere.\n"
+ description = span_warning("My power is running low, I should go charge up somewhere.")
mood_change = -6
/datum/mood_event/decharged
- description = "I'm in desperate need of some electricity!\n"
+ description = span_boldwarning("I'm in desperate need of some electricity!")
mood_change = -10
//Disgust
/datum/mood_event/gross
- description = "I saw something gross.\n"
+ description = span_warning("I saw something gross.")
mood_change = -4
/datum/mood_event/verygross
- description = "I think I'm going to puke...\n"
+ description = span_warning("I think I'm going to puke...")
mood_change = -6
/datum/mood_event/disgusted
- description = "Oh god that's disgusting...\n"
+ description = span_boldwarning("Oh god that's disgusting...")
mood_change = -8
/datum/mood_event/disgust/bad_smell
- description = "You smell something horribly decayed inside this room.\n"
+ description = span_warning("You smell something horribly decayed inside this room.")
mood_change = -6
/datum/mood_event/disgust/nauseating_stench
- description = "The stench of rotting carcasses is unbearable!\n"
+ description = span_warning("The stench of rotting carcasses is unbearable!")
mood_change = -12
//Generic needs events
/datum/mood_event/favorite_food
- description = "I really enjoyed eating that.\n"
+ description = span_nicegreen("I really enjoyed eating that.")
mood_change = 5
timeout = 4 MINUTES
/datum/mood_event/gross_food
- description = "I really didn't like that food.\n"
+ description = span_warning("I really didn't like that food.")
mood_change = -2
timeout = 4 MINUTES
/datum/mood_event/disgusting_food
- description = "That food was disgusting!\n"
+ description = span_warning("That food was disgusting!")
mood_change = -6
timeout = 4 MINUTES
/datum/mood_event/breakfast
- description = "Nothing like a hearty breakfast to start the shift.\n"
+ description = span_nicegreen("Nothing like a hearty breakfast to start the shift.")
mood_change = 2
timeout = 10 MINUTES
/datum/mood_event/nice_shower
- description = "I have recently had a nice shower.\n"
+ description = span_nicegreen("I have recently had a nice shower.")
mood_change = 4
timeout = 5 MINUTES
/datum/mood_event/fresh_laundry
- description = "There's nothing like the feeling of a freshly laundered jumpsuit.\n"
+ description = span_nicegreen("There's nothing like the feeling of a freshly laundered jumpsuit.")
mood_change = 2
timeout = 10 MINUTES
diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm
index 5545c4efde5..afd4e83cfe3 100644
--- a/code/datums/mutations/speech.dm
+++ b/code/datums/mutations/speech.dm
@@ -68,129 +68,6 @@
return
REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
-/datum/mutation/human/swedish
- name = "Swedish"
- desc = "A horrible mutation originating from the distant past. Thought to be eradicated after the incident in 2037."
- quality = MINOR_NEGATIVE
- text_gain_indication = "You feel Swedish, however that works."
- text_lose_indication = "The feeling of Swedishness passes."
-
-/datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner)
- if(..())
- return
- RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-
-/datum/mutation/human/swedish/on_losing(mob/living/carbon/human/owner)
- if(..())
- return
- UnregisterSignal(owner, COMSIG_MOB_SAY)
-
-/datum/mutation/human/swedish/proc/handle_speech(datum/source, list/speech_args)
- SIGNAL_HANDLER
-
- var/message = speech_args[SPEECH_MESSAGE]
- if(message)
- message = replacetext(message,"w","v")
- message = replacetext(message,"j","y")
- message = replacetext(message,"a",pick("å","ä","æ","a"))
- message = replacetext(message,"bo","bjo")
- message = replacetext(message,"o",pick("ö","ø","o"))
- if(prob(30))
- message += " Bork[pick("",", bork",", bork, bork")]!"
- speech_args[SPEECH_MESSAGE] = trim(message)
-
-/datum/mutation/human/chav
- name = "Chav"
- desc = "Unknown"
- quality = MINOR_NEGATIVE
- text_gain_indication = "Ye feel like a reet prat like, innit?"
- text_lose_indication = "You no longer feel like being rude and sassy."
-
-/datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner)
- if(..())
- return
- RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-
-/datum/mutation/human/chav/on_losing(mob/living/carbon/human/owner)
- if(..())
- return
- UnregisterSignal(owner, COMSIG_MOB_SAY)
-
-/datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args)
- var/message = speech_args[SPEECH_MESSAGE]
- if(message)
- message = " [message] "
- message = replacetext(message," looking at "," gawpin' at ")
- message = replacetext(message," great "," bangin' ")
- message = replacetext(message," man "," mate ")
- message = replacetext(message," friend ",pick(" mate "," bruv "," bledrin "))
- message = replacetext(message," what "," wot ")
- message = replacetext(message," drink "," wet ")
- message = replacetext(message," get "," giz ")
- message = replacetext(message," what "," wot ")
- message = replacetext(message," no thanks "," wuddent fukken do one ")
- message = replacetext(message," i don't know "," wot mate ")
- message = replacetext(message," no "," naw ")
- message = replacetext(message," robust "," chin ")
- message = replacetext(message," hi "," how what how ")
- message = replacetext(message," hello "," sup bruv ")
- message = replacetext(message," kill "," bang ")
- message = replacetext(message," murder "," bang ")
- message = replacetext(message," windows "," windies ")
- message = replacetext(message," window "," windy ")
- message = replacetext(message," break "," do ")
- message = replacetext(message," your "," yer ")
- message = replacetext(message," security "," coppers ")
- speech_args[SPEECH_MESSAGE] = trim(message)
-
-
-/datum/mutation/human/elvis
- name = "Elvis"
- desc = "A terrifying mutation named after its 'patient-zero'."
- quality = MINOR_NEGATIVE
- locked = TRUE
- text_gain_indication = "You feel pretty good, honeydoll."
- text_lose_indication = "You feel a little less conversation would be great."
-
-/datum/mutation/human/elvis/on_life()
- switch(pick(1,2))
- if(1)
- if(prob(15))
- var/list/dancetypes = list("swinging", "fancy", "stylish", "20'th century", "jivin'", "rock and roller", "cool", "salacious", "bashing", "smashing")
- var/dancemoves = pick(dancetypes)
- owner.visible_message("[owner] busts out some [dancemoves] moves!")
- if(2)
- if(prob(15))
- owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!")
-
-/datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner)
- if(..())
- return
- RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-
-/datum/mutation/human/elvis/on_losing(mob/living/carbon/human/owner)
- if(..())
- return
- UnregisterSignal(owner, COMSIG_MOB_SAY)
-
-/datum/mutation/human/elvis/proc/handle_speech(datum/source, list/speech_args)
- SIGNAL_HANDLER
-
- var/message = speech_args[SPEECH_MESSAGE]
- if(message)
- message = " [message] "
- message = replacetext(message," i'm not "," I aint ")
- message = replacetext(message," girl ",pick(" honey "," baby "," baby doll "))
- message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo "))
- message = replacetext(message," out of "," outta ")
- message = replacetext(message," thank you "," thank you, thank you very much ")
- message = replacetext(message," thanks "," thank you, thank you very much ")
- message = replacetext(message," what are you "," whatcha ")
- message = replacetext(message," yes ",pick(" sure", "yea "))
- message = replacetext(message," muh valids "," my kicks ")
- speech_args[SPEECH_MESSAGE] = trim(message)
-
-
/datum/mutation/human/stoner
name = "Stoner"
desc = "A common mutation that severely decreases intelligence."
diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm
index 7134d2e8ece..c598b1c159d 100644
--- a/code/datums/progressbar.dm
+++ b/code/datums/progressbar.dm
@@ -16,7 +16,8 @@
var/last_progress = 0
///Variable to ensure smooth visual stacking on multiple progress bars.
var/listindex = 0
-
+ ///The type of our last value for bar_loc, for debugging
+ var/location_type
/datum/progressbar/New(mob/User, goal_number, atom/target)
. = ..()
@@ -32,6 +33,7 @@
return
goal = goal_number
bar_loc = target
+ location_type = bar_loc.type
bar = image('icons/effects/progressbar.dmi', bar_loc, "prog_bar_0", HUD_LAYER)
bar.plane = ABOVE_HUD_PLANE
bar.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
@@ -135,6 +137,89 @@
QDEL_IN(src, PROGRESSBAR_ANIMATION_TIME)
+///Progress bars are very generic, and what hangs a ref to them depends heavily on the context in which they're used
+///So let's make hunting harddels easier yeah?
+/datum/progressbar/dump_harddel_info()
+ return "Owner's type: [location_type]"
+
+
+/datum/world_progressbar
+ ///The progress bar visual element.
+ var/obj/effect/abstract/progbar/bar
+ ///The atom who "created" the bar
+ var/atom/movable/owner
+ ///Effectively the number of steps the progress bar will need to do before reaching completion.
+ var/goal = 1
+ ///Control check to see if the progress was interrupted before reaching its goal.
+ var/last_progress = 0
+ ///Variable to ensure smooth visual stacking on multiple progress bars.
+ var/listindex = 0
+ ///Does this qdelete on completion?
+ var/qdel_when_done = TRUE
+
+/datum/world_progressbar/New(atom/movable/_owner, _goal, image/underlay)
+ if(!_owner)
+ return
+
+ owner = _owner
+ goal = _goal
+
+ bar = new()
+
+ if(underlay)
+ if(!istype(underlay))
+ underlay = image(underlay, dir = SOUTH)
+ underlay.filters += filter(type = "outline", size = 1)
+
+ underlay.pixel_y += 2
+ underlay.alpha = 200
+ underlay.plane = GAME_PLANE
+ underlay.layer = FLY_LAYER
+ underlay.appearance_flags = APPEARANCE_UI
+ bar.underlays += underlay
+
+ owner:vis_contents += bar
+
+ animate(bar, alpha = 255, time = PROGRESSBAR_ANIMATION_TIME, easing = SINE_EASING)
+
+ RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(owner_delete))
+
+/datum/world_progressbar/Destroy()
+ owner = null
+ QDEL_NULL(bar)
+ return ..()
+
+
+/datum/world_progressbar/proc/owner_delete()
+ qdel(src)
+
+///Updates the progress bar image visually.
+/datum/world_progressbar/proc/update(progress)
+ progress = clamp(progress, 0, goal)
+ if(progress == last_progress)
+ return
+ last_progress = progress
+ bar.icon_state = "prog_bar_[round(((progress / goal) * 100), 5)]"
+
+/datum/world_progressbar/proc/end_progress()
+ if(last_progress != goal)
+ bar.icon_state = "[bar.icon_state]_fail"
+
+ if(qdel_when_done)
+ animate(bar, alpha = 0, time = PROGRESSBAR_ANIMATION_TIME)
+ QDEL_IN(src, PROGRESSBAR_ANIMATION_TIME)
+ else
+ bar.icon_state = "prog_bar_0"
#undef PROGRESSBAR_ANIMATION_TIME
#undef PROGRESSBAR_HEIGHT
+
+/obj/effect/abstract/progbar
+ icon = 'icons/effects/progressbar.dmi'
+ icon_state = "prog_bar_0"
+ plane = ABOVE_HUD_PLANE
+ appearance_flags = APPEARANCE_UI | KEEP_APART
+ pixel_y = 32
+ alpha = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ vis_flags = NONE //We don't want VIS_INHERIT_PLANE
diff --git a/code/datums/proximity_monitor/fields/timestop.dm b/code/datums/proximity_monitor/fields/timestop.dm
index 40a8c1cc947..84adc6f9666 100644
--- a/code/datums/proximity_monitor/fields/timestop.dm
+++ b/code/datums/proximity_monitor/fields/timestop.dm
@@ -29,9 +29,6 @@
for(var/mob/living/L in GLOB.player_list)
if(locate(/obj/effect/proc_holder/spell/aoe_turf/timestop) in L.mind.spell_list) //People who can stop time are immune to its effects
immune[L] = TRUE
- for(var/mob/living/simple_animal/hostile/guardian/G in GLOB.parasites)
- if(G.summoner && locate(/obj/effect/proc_holder/spell/aoe_turf/timestop) in G.summoner.mind.spell_list) //It would only make sense that a person's stand would also be immune.
- immune[G] = TRUE
if(start)
INVOKE_ASYNC(src, PROC_REF(timestop))
diff --git a/code/datums/ruins.dm b/code/datums/ruins/_ruins.dm
similarity index 97%
rename from code/datums/ruins.dm
rename to code/datums/ruins/_ruins.dm
index 9b7c86c22b0..3554faf3e2c 100644
--- a/code/datums/ruins.dm
+++ b/code/datums/ruins/_ruins.dm
@@ -16,6 +16,7 @@
var/suffix = null
var/ruin_type
+ var/ruin_tags = list()
/datum/map_template/ruin/New()
if(!name && id)
diff --git a/code/datums/ruins/beachplanet.dm b/code/datums/ruins/beachplanet.dm
index b258ef45f0e..b7ba861ef25 100644
--- a/code/datums/ruins/beachplanet.dm
+++ b/code/datums/ruins/beachplanet.dm
@@ -4,44 +4,30 @@
prefix = "_maps/RandomRuins/BeachRuins/"
ruin_type = RUINTYPE_BEACH
-/datum/map_template/ruin/beachplanet/fishinghut
- name = "Fishing Hut"
- id = "fishinghut"
- description = "A small fishing hut floating on the ocean."
- suffix = "beach_fishing_hut.dmm"
+/datum/map_template/ruin/beachplanet/crashedengie
+ name = "Crashed Engineer Ship"
+ id = "beach_crashed_engineer"
+ description = "An abandoned camp built by a crashed engineer"
+ suffix = "beach_crashed_engineer.dmm"
+ ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_HAZARDOUS)
/datum/map_template/ruin/beachplanet/ancient
name = "Ancient Danger"
id = "beach_ancient"
description = "As you draw near the ancient wall, a sense of foreboding overcomes you. You aren't sure why, but you feel this dusty structure may contain great dangers."
suffix = "beach_ancient_ruin.dmm"
-
-/datum/map_template/ruin/beachplanet/town
- name = "Beachside Town"
- id = "beach_town"
- description = "A fresh town on a lovely coast, where its inhabitants are is unknown."
- suffix = "beach_ocean_town.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
/datum/map_template/ruin/beachplanet/scrapvillage
name = "Pirate Village"
id = "beach_pirate"
description = "A small pirate outpost formed from the remains of a wrecked shuttle."
suffix = "beach_pirate_crash.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
/datum/map_template/ruin/beachplanet/treasurecove
name = "Treasure Cove"
id = "beach_treasure_cove"
description = "A abandoned colony. It seems that this colony was abandoned, for a reason or another"
suffix = "beach_treasure_cove.dmm"
-
-/datum/map_template/ruin/beachplanet/crashedengie
- name = "Crashed Engineer Ship"
- id = "beach_crashed_engineer"
- description = "An abandoned camp built by a crashed engineer"
- suffix = "beach_crashed_engineer.dmm"
-
-/datum/map_template/ruin/beachplanet/floatresort
- name = "Floating Beach Resort"
- id = "beach_float_resort"
- description = "A hidden paradise on the beach"
- suffix = "beach_float_resort.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm
index 60304e86f6f..d57684dd710 100644
--- a/code/datums/ruins/icemoon.dm
+++ b/code/datums/ruins/icemoon.dm
@@ -4,26 +4,31 @@
prefix = "_maps/RandomRuins/IceRuins/"
ruin_type = RUINTYPE_ICE
-/datum/map_template/ruin/icemoon/hydroponicslab
- name = "Hydroponics Lab"
- id = "hydroponicslab"
- description = "An abandoned hydroponics research facility containing hostile plant fauna."
- suffix = "icemoon_hydroponics_lab.dmm"
-
/datum/map_template/ruin/icemoon/abandonedvillage
name = "Abandoned Village"
id = "abandonedvillage"
description = "Who knows what lies within?"
suffix = "icemoon_underground_abandoned_village.dmm"
-
-/datum/map_template/ruin/icemoon/brazillian_lab
- name = "Barricaded Compound"
- id = "brazillian-lab"
- description = "A conspicuous compound in the middle of the cold wasteland. What goodies are inside?"
- suffix = "icemoon_underground_brazillianlab.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MINOR_LOOT, RUIN_TAG_INHOSPITABLE)
/datum/map_template/ruin/icemoon/crashed_holemaker
name = "Crashed Holemaker"
id = "crashed_holemaker"
description = "Safety records for early Nanotrasen Spaceworks vessels were, and always have been, top of their class. Absolutely no multi-billion credit projects have been painstakingly erased from history. (Citation Needed)"
suffix = "icemoon_crashed_holemaker.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MINOR_LOOT, RUIN_TAG_SHELTER)
+
+/datum/map_template/ruin/icemoon/ice_lodge
+ name = "Ice Lodge"
+ id = "ice_lodge"
+ description = "Records show this settlement as belonging to the SRM, but no one has heard from them as of late. I wonder what happened?"
+ suffix = "icemoon_ice_lodge.dmm"
+ ruin_tags = list(RUIN_TAG_HARD_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_SHELTER, RUIN_TAG_HAZARDOUS)
+
+/datum/map_template/ruin/icemoon/tesla_lab
+ name = "CLIP Research Lab"
+ id = "tesla_lab"
+ description = "Records show this settlement as belonging to the SRM, but no one has heard from them as of late. I wonder what happened?"
+ suffix = "icemoon_tesla_lab.dmm"
+ ruin_tags = list(RUIN_TAG_BOSS_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_SHELTER, RUIN_TAG_HAZARDOUS)
+
diff --git a/code/datums/ruins/jungle.dm b/code/datums/ruins/jungle.dm
index f1e2e16bfec..e8705d7f2f8 100644
--- a/code/datums/ruins/jungle.dm
+++ b/code/datums/ruins/jungle.dm
@@ -9,39 +9,39 @@
id = "syndicatebunkerjungle"
description = "A small bunker owned by the Syndicate."
suffix = "jungle_syndicate.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
/datum/map_template/ruin/jungle/interceptor
name = "Old Crashed Interceptor"
id = "crashedcondor"
description = "An overgrown crashed Condor Class, a forgotten remnant of the Corporate Wars."
suffix = "jungle_interceptor.dmm"
+ ruin_tags = list(RUIN_TAG_NO_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
/datum/map_template/ruin/jungle/paradise
name = "Hidden paradise"
id = "paradise"
description = "a crashed shuttle, and a hidden beautiful lake."
suffix = "jungle_paradise.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE, RUIN_TAG_HAZARDOUS)
/datum/map_template/ruin/jungle/airbase
name = "Bombed Airbase"
id = "airbase"
description = "A bombed out airbase from the ICW, taken back over by nature"
suffix = "jungle_bombed_starport.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_HAZARDOUS, RUIN_TAG_LIVEABLE)
/datum/map_template/ruin/jungle/medtech
name = "MedTech facility"
id = "medtech-facility"
description = "A MedTech pharmaceutical manufacturing plant where something went terribly wrong."
suffix = "jungle_medtech_outbreak.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
/datum/map_template/ruin/jungle/cavecrew
name = "Frontiersmen Cave"
id = "cavecrew"
description = "A frontiersmen base, hidden within a cave. They don't seem friendly"
suffix = "jungle_cavecrew.dmm"
-
-/datum/map_template/ruin/jungle/library
- name = "Abandoned Library"
- id = "abandoned-library"
- description = "A forgotten library, with a few angry monkeys."
- suffix = "jungle_abandoned_library.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_HAZARDOUS, RUIN_TAG_LIVEABLE, RUIN_TAG_MAJOR_LOOT)
diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
index 816ffd685c1..f94d75bd71f 100644
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -10,14 +10,7 @@
description = "A Solarian frontier research facility created by the Pionierskompanien \
This one seems to simulate the wintery climate of the northern provinces, including a sauna!"
suffix = "lavaland_surface_biodome_winter.dmm"
-
-/datum/map_template/ruin/lavaland/elephant_graveyard
- name = "Elephant Graveyard"
- id = "Graveyard"
- description = "An abandoned graveyard, calling to those unable to continue."
- suffix = "lavaland_surface_elephant_graveyard.dmm"
- allow_duplicates = FALSE
- cost = 10
+ ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MINOR_LOOT, RUIN_TAG_SHELTER)
/datum/map_template/ruin/lavaland/buried_shrine
name = "Buried Shrine"
@@ -42,3 +35,9 @@
id = "crashed_star"
description = "A crashed pirate ship. It would seem that it's crew died a while ago."
suffix = "lavaland_crashed_starwalker.dmm"
+
+/datum/map_template/ruin/lavaland/abandonedlisteningpost
+ name = "Abandoned Listening Post"
+ id = "abandonedlistening"
+ description = "An abandoned Cybersun listening post. Seems like the Ramzi Clique has an interest in the site."
+ suffix = "lavaland_abandonedlisteningpost.dmm"
diff --git a/code/datums/ruins/reebe.dm b/code/datums/ruins/reebe.dm
index fa89ada7788..d1a9de3e024 100644
--- a/code/datums/ruins/reebe.dm
+++ b/code/datums/ruins/reebe.dm
@@ -9,21 +9,18 @@
id = "clockcultarena"
description = "A abandoned base, once belonging to clock cultists."
suffix = "reebe_arena.dmm"
-
-/datum/map_template/ruin/reebe/swarmers
- name = "Swarmer Island"
- id = "swarmers"
- description = "Looks like someone has occupied Reebe in the cultists' absence."
- suffix = "reebe_swarmers.dmm"
+ ruin_tags = list(RUIN_TAG_BOSS_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
/datum/map_template/ruin/reebe/island
name = "Island Cache"
id = "islandcache"
description = "Reebe is full of these things. Something is hidden within here."
suffix = "reebe_floating_island.dmm"
+ ruin_tags = list(RUIN_TAG_BOSS_COMBAT, RUIN_TAG_MINOR_LOOT, RUIN_TAG_LIVEABLE)
/datum/map_template/ruin/reebe/sm
name = "Decayed Supermatter"
id = "smdecay"
description = "It seems whoever left here was so nice they left very vauluable items behind. How thoughtful."
suffix = "reebe_decayed_sm.dmm"
+ ruin_tags = list(RUIN_TAG_NO_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE, RUIN_TAG_HAZARDOUS)
diff --git a/code/datums/ruins/rockplanet.dm b/code/datums/ruins/rockplanet.dm
index f576f1a9346..f34c7c2d23c 100644
--- a/code/datums/ruins/rockplanet.dm
+++ b/code/datums/ruins/rockplanet.dm
@@ -5,17 +5,12 @@
ruin_type = RUINTYPE_ROCK
-/datum/map_template/ruin/rockplanet/harmfactory
- name = "Harm Factory"
- description = "A factory made for HARM and AGONY."
- id = "rockplanet_harmfactory"
- suffix = "rockplanet_harmfactory.dmm"
-
/datum/map_template/ruin/rockplanet/budgetcuts
name = "Budgetcuts"
description = "Nanotrasen's gotta lay off some personnel, and this facility hasn't been worth the effort so far"
id = "rockplanet_budgetcuts"
suffix = "rockplanet_budgetcuts.dmm"
+ ruin_tags = list(RUIN_TAG_HARD_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_LIVEABLE)
/datum/map_template/ruin/rockplanet/shippingdock
name = "Abandoned Shipping Dock"
@@ -23,9 +18,15 @@
id = "rockplanet_shippingdock"
suffix = "rockplanet_shippingdock.dmm"
-/datum/map_template/ruin/rockplanet/nomadcrash
- name = "Nomad Crash"
- description = "A Crashed Arrow & Axe Interceptor. A long forgotten Crew. They tried their best to survive..."
- id = "rockplanet_nomadcrash"
- suffix = "rockplanet_nomadcrash.dmm"
+/datum/map_template/ruin/rockplanet/distillery
+ name = "Frontiersman Distillery"
+ description = "A former pre-ICW era Nanotrasen outpost converted into a moonshine distillery by Frontiersman bootleggers."
+ id = "rockplanet_distillery"
+ suffix = "rockplanet_distillery.dmm"
+/datum/map_template/ruin/rockplanet/mining_base
+ name = "N+S Mining Installation"
+ description = "A N+S mining installation recently fallen prey to a band of Ramzi pirates."
+ id = "rockplanet_mining_base"
+ suffix = "rockplanet_mining_installation.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_SHELTER)
diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm
index 1aedb0b9be8..8bdc04a9161 100644
--- a/code/datums/ruins/space.dm
+++ b/code/datums/ruins/space.dm
@@ -11,19 +11,14 @@
suffix = "corporate_mining.dmm"
name = "Corporate Mining Module"
description = "An old and rusty mining facility, with big ore potential."
-
-/datum/map_template/ruin/space/bigderelict1
- id = "bigderelict1"
- suffix = "bigderelict1.dmm"
- name = "Derelict Tradepost"
- description = "A once-bustling tradestation that handled imports and exports from nearby stations now lays eerily dormant. \
- The last received message was a distress call from one of the on-board officers, but we had no success in making contact again."
+ ruin_tags = list(RUIN_TAG_NO_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_SHELTER)
/datum/map_template/ruin/space/onehalf
id = "onehalf"
suffix = "onehalf.dmm"
name = "DK Excavator 453"
description = "Formerly a thriving planetary mining outpost, now a bit of an exploded mess. One has to wonder how it got here"
+ ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_INHOSPITABLE)
/datum/map_template/ruin/space/power_puzzle
id = "power_puzzle"
@@ -31,21 +26,18 @@
name = "Power Puzzle"
description = "an abandoned secure storage location. there is no power left in the batteries and the former ocupants locked it pretty tight before leaving.\
You will have to power areas to raise the bolts on the doors. look out for secrets."
-
-/datum/map_template/ruin/space/astraeus
- id = "astraeus"
- suffix = "astraeus.dmm"
- name = "Astraeus Ruin"
- description = "This vessel served a lengthy period in the Nanotrasen fleet, before an accident in the munitions bay caused to to be destroyed while in active combat."
+ ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_SHELTER, RUIN_TAG_HAZARDOUS)
/datum/map_template/ruin/space/singularitylab
id = "singularitylab"
suffix = "singularity_lab.dmm"
name = "Singularity Lab"
description = "An overgrown facility, home to an unstarted singularity and many plants"
+ ruin_tags = list(RUIN_TAG_BOSS_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_SHELTER)
/datum/map_template/ruin/space/spacemall
id = "spacemall"
suffix = "spacemall.dmm"
name = "Space Mall"
description = "An old shopping centre, owned by a former member of Nanotrasen's board of directors.."
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_SHELTER)
diff --git a/code/datums/ruins/wasteplanet.dm b/code/datums/ruins/wasteplanet.dm
index 8083567a7c6..b80533b3ae7 100644
--- a/code/datums/ruins/wasteplanet.dm
+++ b/code/datums/ruins/wasteplanet.dm
@@ -4,26 +4,37 @@
prefix = "_maps/RandomRuins/WasteRuins/"
ruin_type = RUINTYPE_WASTE
-/datum/map_template/ruin/wasteplanet/weaponstest
- name = "Weapons testing facility"
- id = "guntested"
- description = "A abandoned Nanotrasen weapons facility, presumably the place where the X-01 was manufactured."
- suffix = "wasteplanet_lab.dmm"
-
/datum/map_template/ruin/wasteplanet/pandora
id = "pandora_arena"
suffix = "wasteplanet_pandora.dmm"
name = "Pandora Arena"
description = "Some... thing has settled here."
+ ruin_tags = list(RUIN_TAG_BOSS_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_MEGAFAUNA, RUIN_TAG_LIVEABLE)
/datum/map_template/ruin/wasteplanet/radiation
name = "Honorable deeds storage"
id = "wasteplanet_radiation"
description = "A dumping ground for nuclear waste."
suffix = "wasteplanet_unhonorable.dmm"
+ ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_SHELTER, RUIN_TAG_HAZARDOUS)
/datum/map_template/ruin/wasteplanet/abandoned_mechbay
- name = "Abandoned Mech Bay"
- description = "A military base formerly used for staging 4 mechs and crew. God knows what's in it now."
+ name = "Abandoned Exosuit Bay"
+ description = "A military base formerly used for staging 4 exosuits and crew. God knows what's in it now."
id = "abandoned_mechbay"
suffix = "wasteplanet_abandoned_mechbay.dmm"
+ ruin_tags = list(RUIN_TAG_BOSS_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_SHELTER, RUIN_TAG_HAZARDOUS)
+
+/datum/map_template/ruin/wasteplanet/tradepost
+ name = "Ruined Tradepost"
+ description = "Formerly a functioning, if not thriving tradepost. Now a graveyard of Inteq soldiers and hivebots."
+ id = "wasteplanet_tradepost"
+ suffix = "wasteplanet_tradepost.dmm"
+
+/datum/map_template/ruin/wasteplanet/yard
+ name = "Abandoned Miskilamo salvage yard"
+ description = "An abandonded shipbreaking yard."
+ id = "wasteplanet_yard"
+ suffix = "wasteplanet_yard.dmm"
+
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_SHELTER, RUIN_TAG_HAZARDOUS)
diff --git a/code/datums/ruins/whitesands.dm b/code/datums/ruins/whitesands.dm
index b3e0cb13adc..79ddbf6b99f 100644
--- a/code/datums/ruins/whitesands.dm
+++ b/code/datums/ruins/whitesands.dm
@@ -4,17 +4,19 @@
prefix = "_maps/RandomRuins/SandRuins/"
ruin_type = RUINTYPE_SAND
-/datum/map_template/ruin/whitesands/medipen_plant
- name = "Abandoned Medipen Factory"
- id = "medipenplant"
- description = "A once prosperous autoinjector manufacturing plant."
- suffix = "whitesands_surface_medipen_plant.dmm"
-
/datum/map_template/ruin/whitesands/pubbyslopcrash
name = "Pubby Slop Crash"
id = "ws-pubbyslopcrash"
description = "A failed attempt of the Nanotrasen nutrional replacement program"
suffix = "whitesands_surface_pubbyslopcrash.dmm"
+ ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_SHELTER)
+
+/datum/map_template/ruin/whitesands/cave_base
+ name = "Abandoned Cave Base"
+ id = "cave_base"
+ description = "The former home of a poor sod on observation duty. Now a cunning trap."
+ suffix = "whitesands_cave_base.dmm"
+ ruin_tags = list(RUIN_TAG_MINOR_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_SHELTER)
//////////OUTSIDE SETTLEMENTS/RUINS//////////
/datum/map_template/ruin/whitesands/survivors/saloon
@@ -22,6 +24,7 @@
id = "ws-saloon"
description = "A western style saloon, most popular spot for the hermits to gather planetside"
suffix = "whitesands_surface_camp_saloon.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_INHOSPITABLE)
/datum/map_template/ruin/whitesands/survivors/combination //combined extra large ruin of several other whitesands survivor ruins
name = "Wasteland Survivor Village"
@@ -29,4 +32,18 @@
description = "A small encampment of nomadic survivors of the First Colony, and their descendants. By all accounts, feral and without allegance to anyone but themselves."
suffix = "whitesands_surface_camp_combination.dmm"
allow_duplicates = FALSE
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_INHOSPITABLE, RUIN_TAG_HAZARDOUS)
+
+/datum/map_template/ruin/whitesands/e11_manufactory
+ name = "E-11 Manufacturing Plant"
+ id = "ws-e11manufactory"
+ description = "An old Eoehoma Firearms manufacturing plant dedicated to assembly of the beloved-by-many E-11 rifle."
+ suffix = "whitesands_surface_e11_manufactory.dmm"
+ ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_HAZARDOUS)
+/datum/map_template/ruin/whitesands/brazillian_lab
+ name = "Hermit Weapons-Testing Compound"
+ id = "brazillian-lab"
+ description = "A conspicuous compound in the middle of the sandy wasteland. What goodies are inside?"
+ suffix = "whitesands_brazillianlab.dmm"
+ ruin_tags = list(RUIN_TAG_BOSS_COMBAT, RUIN_TAG_MAJOR_LOOT, RUIN_TAG_INHOSPITABLE)
diff --git a/code/datums/saymode.dm b/code/datums/saymode.dm
index 848940d4e9d..708a8110731 100644
--- a/code/datums/saymode.dm
+++ b/code/datums/saymode.dm
@@ -95,15 +95,11 @@
return FALSE
-/datum/saymode/binary //everything that uses .b (silicons, drones, swarmers)
+/datum/saymode/binary //everything that uses .b (silicons, drones)
key = MODE_KEY_BINARY
mode = MODE_BINARY
/datum/saymode/binary/handle_message(mob/living/user, message, datum/language/language)
- if(isswarmer(user))
- var/mob/living/simple_animal/hostile/swarmer/S = user
- S.swarmer_chat(message)
- return FALSE
if(isdrone(user))
var/mob/living/simple_animal/drone/D = user
D.drone_chat(message)
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index d7b60476d97..9e0e8c12597 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -21,6 +21,8 @@
var/prefix = "ISV"
/// The full name of the ship's faction.
var/faction_name = "Independent"
+ var/faction_path = /datum/faction/independent
+ var/datum/faction/faction_datum
/// Whether or not players from other ships can open airlocks.
var/unique_ship_access = TRUE
/// Set by config JSON. If true, the template's ships' "default" spawn location (when bought by a player or loaded at roundstart)
@@ -358,11 +360,7 @@
name = "Sugarcube Transport"
prefix = "ISV"
-//your subshuttle here
-/datum/map_template/shuttle/subshuttles/heron
- file_name = "nanotrasen_falcon"
- name = "Falcon Dropship"
- prefix = "NTSV"
+//your subshuttle here //why is my subshuttle here // its no longer there
/datum/map_template/shuttle/subshuttles/crux
file_name = "minutemen_crux"
@@ -402,7 +400,17 @@
name = "Nail-class Boarding Vessel"
prefix = "PGF"
+/datum/map_template/shuttle/subshuttles/tanto
+ file_name = "independent_tanto"
+ name = "Tanto-class Drop Pod"
+ prefix = "SV"
+
/datum/map_template/shuttle/subshuttles/brawler
file_name = "frontiersmen_brawler"
name = "Brawler-class Dropship"
prefix = "SV"
+
+/datum/map_template/shuttle/subshuttles/skink
+ file_name = "nanotrasen_skink"
+ name = "Skink-class Cargo Runner"
+ prefix = "NTSV"
diff --git a/code/datums/simple_beam.dm b/code/datums/simple_beam.dm
new file mode 100644
index 00000000000..ec653823975
--- /dev/null
+++ b/code/datums/simple_beam.dm
@@ -0,0 +1,71 @@
+/datum/simple_beam
+ ///The source of the beam, which must be visible for the beam to be seen. Can NOT be null.
+ VAR_PRIVATE/atom/movable/origin
+ ///The target of the beam. Can be null.
+ VAR_PRIVATE/atom/movable/target
+ ///The visual representation of the beam.
+ VAR_PRIVATE/obj/effect/simple_beam/its_beam
+
+/datum/simple_beam/New(_origin, _target, icon = 'icons/effects/beam.dmi', icon_state = "1-full", icon_color = null, icon_alpha = 255)
+ origin = _origin
+ target = _target
+
+ its_beam = new /obj/effect/simple_beam(origin, icon, icon_state, icon_color, icon_alpha)
+ origin.vis_contents += its_beam
+
+ set_target(target)
+
+/datum/simple_beam/Destroy(force)
+ origin.vis_contents -= its_beam
+ QDEL_NULL(its_beam)
+
+ if(target)
+ UnregisterSignal(origin, COMSIG_MOVABLE_MOVED)
+ UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
+
+ return ..()
+
+/datum/simple_beam/proc/draw()
+ if(origin.z != target.z)
+ set_target(null)
+ return
+
+ var/f_dx = ((target.pixel_x - origin.pixel_x + 16) / world.icon_size) + (target.x - origin.x)
+ var/f_dy = ((target.pixel_y - origin.pixel_y) / world.icon_size) + (target.y - origin.y)
+ var/dist = sqrt(f_dx * f_dx + f_dy * f_dy)
+ var/s_dx = f_dy/dist
+ var/s_dy = -f_dx/dist
+ var/matrix/translation = matrix()
+ translation.Translate(0, 16)
+ translation.Multiply(new /matrix(s_dx, f_dx, 0, s_dy, f_dy, 0))
+
+ its_beam.transform = translation
+
+/datum/simple_beam/proc/set_target(new_target)
+ if(target)
+ UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
+ UnregisterSignal(origin, COMSIG_MOVABLE_MOVED)
+
+ target = new_target
+
+ if(target)
+ its_beam.vis_flags &= ~VIS_HIDE
+
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(draw))
+ RegisterSignal(origin, COMSIG_MOVABLE_MOVED, PROC_REF(draw))
+
+ draw()
+ else
+ its_beam.vis_flags |= VIS_HIDE
+
+/obj/effect/simple_beam
+ layer = ABOVE_LIGHTING_LAYER
+ plane = ABOVE_LIGHTING_PLANE
+
+/obj/effect/simple_beam/New(loc, icon, icon_state, icon_color, icon_alpha)
+ src.icon = icon
+ src.icon_state = icon_state
+ src.color = icon_color
+ src.alpha = icon_alpha
+
+ return ..()
diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm
index 9e7e4b334dd..01709a00c1a 100644
--- a/code/datums/spawners_menu.dm
+++ b/code/datums/spawners_menu.dm
@@ -53,7 +53,7 @@
if(!spawnerlist.len)
return
var/obj/effect/mob_spawn/MS = pick(spawnerlist)
- if(!istype(MS) || !(MS in GLOB.poi_list))
+ if(!istype(MS) || !(MS in SSpoints_of_interest.other_points_of_interest))
return
switch(action)
if("jump")
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 43c7bd3ab2e..6ffd5f40396 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -85,35 +85,6 @@
desc = "You are being resurrected!"
icon_state = "wish_granter"
-/datum/status_effect/cult_master
- id = "The Cult Master"
- duration = -1
- alert_type = null
- on_remove_on_mob_delete = TRUE
- var/alive = TRUE
-
-/datum/status_effect/cult_master/proc/deathrattle()
- if(!QDELETED(GLOB.cult_narsie))
- return //if Nar'Sie is alive, don't even worry about it
- var/area/A = get_area(owner)
- for(var/datum/mind/B in SSticker.mode.cult)
- if(isliving(B.current))
- var/mob/living/M = B.current
- SEND_SOUND(M, sound('sound/hallucinations/veryfar_noise.ogg'))
- to_chat(M, "The Cult's Master, [owner], has fallen in \the [A]!")
-
-/datum/status_effect/cult_master/tick()
- if(owner.stat != DEAD && !alive)
- alive = TRUE
- return
- if(owner.stat == DEAD && alive)
- alive = FALSE
- deathrattle()
-
-/datum/status_effect/cult_master/on_remove()
- deathrattle()
- . = ..()
-
/datum/status_effect/blooddrunk
id = "blooddrunk"
duration = 10
@@ -435,14 +406,15 @@
/datum/status_effect/regenerative_core/on_apply()
ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id)
- owner.adjustBruteLoss(-25)
- owner.adjustFireLoss(-25)
+ owner.adjustBruteLoss(-20)
+ owner.adjustFireLoss(-20)
owner.remove_CC()
owner.bodytemperature = owner.get_body_temp_normal()
return TRUE
/datum/status_effect/regenerative_core/on_remove()
REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id)
+ to_chat(owner, span_warning("The tendrils of the regenerative core sink into your flesh, leaving dark markings where they dive."))
/datum/status_effect/antimagic
id = "antimagic"
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 02b96c1b81d..6d803d98ec4 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -49,6 +49,7 @@
. = ..()
if(!.)
return
+ owner.trip_with_gun("knockdown")
ADD_TRAIT(owner, TRAIT_FLOORED, TRAIT_STATUS_EFFECT(id))
/datum/status_effect/incapacitating/knockdown/on_remove()
@@ -79,6 +80,7 @@
. = ..()
if(!.)
return
+ owner.trip_with_gun("paralyze")
ADD_TRAIT(owner, TRAIT_INCAPACITATED, TRAIT_STATUS_EFFECT(id))
ADD_TRAIT(owner, TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(id))
ADD_TRAIT(owner, TRAIT_FLOORED, TRAIT_STATUS_EFFECT(id))
@@ -251,19 +253,6 @@
/datum/status_effect/pacify/on_remove()
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
-/datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
- id = "cult_ghost"
- duration = -1
- alert_type = null
-
-/datum/status_effect/cultghost/on_apply()
- owner.see_invisible = SEE_INVISIBLE_OBSERVER
- owner.see_in_dark = 2
-
-/datum/status_effect/cultghost/tick()
- if(owner.reagents)
- owner.reagents.del_reagent(/datum/reagent/water/holywater) //can't be deconverted
-
/datum/status_effect/crusher_mark
id = "crusher_mark"
duration = 300 //if you leave for 30 seconds you lose the mark, deal with it
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index d1a8fd6acaa..306c3d6b8d5 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -105,11 +105,11 @@
if("Clown")
heirloom_type = /obj/item/bikehorn/golden
if("Mime")
- heirloom_type = /obj/item/reagent_containers/food/snacks/baguette
+ heirloom_type = /obj/item/food/baguette
if("Janitor")
heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket, /obj/item/paper/fluff/stations/soap)
if("Cook")
- heirloom_type = pick(/obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/chefhat)
+ heirloom_type = pick(/obj/item/reagent_containers/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/chefhat)
if("Botanist")
heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/toy/plush/beeplushie)
if("Bartender")
@@ -451,20 +451,19 @@
/datum/quirk/social_anxiety/on_process()
var/nearby_people = 0
+ if(HAS_TRAIT(quirk_holder, TRAIT_FEARLESS))
+ return
for(var/mob/living/carbon/human/H in oview(3, quirk_holder))
if(H.client)
nearby_people++
var/mob/living/carbon/human/H = quirk_holder
if(prob(2 + nearby_people))
- H.stuttering = max(3, H.stuttering)
- else if(prob(min(3, nearby_people)) && !H.silent)
- to_chat(H, "You retreat into yourself. You really don't feel up to talking.")
- H.silent = max(10, H.silent)
+ H.stuttering = max(4, H.stuttering)
else if(prob(0.5) && dumb_thing)
to_chat(H, "You think of a dumb thing you said a long time ago and scream internally.")
dumb_thing = FALSE //only once per life
if(prob(1))
- new/obj/item/reagent_containers/food/snacks/spaghetti/pastatomato(get_turf(H)) //now that's what I call spaghetti code
+ new/obj/item/food/spaghetti/pastatomato(get_turf(H)) //now that's what I call spaghetti code
// small chance to make eye contact with inanimate objects/mindless mobs because of nerves
/datum/quirk/social_anxiety/proc/looks_at_floor(datum/source, atom/A)
@@ -479,6 +478,8 @@
/datum/quirk/social_anxiety/proc/eye_contact(datum/source, mob/living/other_mob, triggering_examiner)
SIGNAL_HANDLER
+ if(HAS_TRAIT(quirk_holder, TRAIT_FEARLESS))
+ return
if(prob(75))
return
var/msg
@@ -641,6 +642,25 @@
return
SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "wrong_cigs", /datum/mood_event/wrong_brand)
+/datum/quirk/congenital_analgesia
+ name = "Congenital Analgesia"
+ desc = "Due to a rare condition, you have never felt pain. Physical pain, at least. That breakup still hurt."
+ value = -1
+ mob_traits = list(TRAIT_ANALGESIA)
+ gain_text = "You've never really felt pain."
+ lose_text = "...Oh god, you're sore."
+ medical_record_text = "Patient is unable to process pain"
+
+/datum/quirk/congenital_analgesia/on_spawn()
+ var/mob/living/carbon/human/H = quirk_holder
+ H.set_screwyhud(SCREWYHUD_HEALTHY)
+
+/datum/quirk/congenital_analgesia/remove()
+ if(quirk_holder)
+ var/mob/living/carbon/human/H = quirk_holder
+ H.set_screwyhud(SCREWYHUD_NONE)
+
+
/datum/quirk/unstable
name = "Unstable"
desc = "Due to past troubles, you are unable to recover your sanity if you lose it. Be very careful managing your mood!"
diff --git a/code/datums/votes/_vote_datum.dm b/code/datums/votes/_vote_datum.dm
index c34d4600d2b..7118695bf1b 100644
--- a/code/datums/votes/_vote_datum.dm
+++ b/code/datums/votes/_vote_datum.dm
@@ -10,7 +10,7 @@
/// If supplied, an override question will be displayed instead of the name of the vote.
var/override_question
/// The sound effect played to everyone when this vote is initiated.
- var/vote_sound = 'sound/misc/compiler-stage2.ogg'
+ var/vote_sound = 'sound/misc/announce_dig.ogg'
/// A list of default choices we have for this vote.
var/list/default_choices
/// What message do we want to pass to the player-side vote panel as a tooltip?
@@ -156,7 +156,7 @@
/// Gets the winner of the vote, selecting a random choice from all choices based on their vote count.
/datum/vote/proc/get_random_winner()
- var/winner = pickweight(choices)
+ var/winner = pick_weight(choices)
return winner ? list(winner) : list()
/**
diff --git a/code/datums/weather/weather_controller.dm b/code/datums/weather/weather_controller.dm
index ad4d5005c04..30be3ebb23c 100644
--- a/code/datums/weather/weather_controller.dm
+++ b/code/datums/weather/weather_controller.dm
@@ -60,7 +60,7 @@
if(!possible_weathers)
return
next_weather = world.time + rand(wait_interval_low, wait_interval_high)
- next_weather_type = pickweight(possible_weathers)
+ next_weather_type = pick_weight(possible_weathers)
/datum/weather_controller/proc/run_weather(datum/weather/weather_datum_type, telegraph = TRUE)
if(!ispath(weather_datum_type, /datum/weather))
diff --git a/code/datums/weather/weather_types/hailstorm.dm b/code/datums/weather/weather_types/hailstorm.dm
index 127a92f0356..ef0cd70b2db 100644
--- a/code/datums/weather/weather_types/hailstorm.dm
+++ b/code/datums/weather/weather_types/hailstorm.dm
@@ -32,5 +32,5 @@
/// Think of some good solution of how weather should affect monsters and how they should be resistant to things like this
if(isanimal(living_mob))
return
- living_mob.adjust_bodytemperature(-rand(3,6))
+ living_mob.adjust_bodytemperature(-rand(1,2))
living_mob.adjustBruteLoss(rand(2,4))
diff --git a/code/datums/weather/weather_types/rain.dm b/code/datums/weather/weather_types/rain.dm
index fbbb0269ed2..591a569b19e 100644
--- a/code/datums/weather/weather_types/rain.dm
+++ b/code/datums/weather/weather_types/rain.dm
@@ -47,3 +47,17 @@
desc = "Storm with rain and lightning."
weather_message = "The clouds blacken and the sky starts to flash as thunder strikes down!"
thunder_chance = 10
+
+/datum/weather/rain/heavy/storm_intense
+ name = "storm"
+ desc = "Storm with rain and lightning."
+ weather_overlay = "storm_very"
+ thunder_chance = 20
+ weather_color = "#a3daf7"
+ weather_duration_lower = 420690
+ weather_duration_upper = 420690
+
+ sound_active_outside = /datum/looping_sound/weather/rain/storm/indoors
+ sound_active_inside = /datum/looping_sound/weather/rain/storm
+ sound_weak_outside = /datum/looping_sound/weather/rain/storm/indoors
+ sound_weak_inside = /datum/looping_sound/weather/rain/storm
diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm
index ba74a39ddb4..db11f26e753 100644
--- a/code/datums/weather/weather_types/snow_storm.dm
+++ b/code/datums/weather/weather_types/snow_storm.dm
@@ -29,5 +29,5 @@
sound_weak_inside = /datum/looping_sound/weak_inside_ashstorm
/datum/weather/snow_storm/weather_act(mob/living/living_mob)
- living_mob.adjust_bodytemperature(-rand(5,15))
+ living_mob.adjust_bodytemperature(-rand(2,4))
diff --git a/code/datums/weather/weather_types/snowfall.dm b/code/datums/weather/weather_types/snowfall.dm
index 5600547705b..d3eab8b1099 100644
--- a/code/datums/weather/weather_types/snowfall.dm
+++ b/code/datums/weather/weather_types/snowfall.dm
@@ -43,4 +43,4 @@
thunder_chance = 2
/datum/weather/snowfall/heavy/weather_act(mob/living/living_mob)
- living_mob.adjust_bodytemperature(-rand(2,4))
+ living_mob.adjust_bodytemperature(-rand(1,2))
diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm
index e6db7790fd6..79b02564d2b 100644
--- a/code/datums/wires/_wires.dm
+++ b/code/datums/wires/_wires.dm
@@ -173,6 +173,15 @@
S.connected = src
return S
+/datum/wires/proc/attach_assembly_init(obj/item/assembly/S)
+ var/obj/item/assembly/I = new S(holder.loc)
+ for(var/color in colors)
+ if(I && istype(I) && I.attachable && !is_attached(color))
+ assemblies[color] = I
+ I.forceMove(holder)
+ I.connected = src
+ return I
+
/datum/wires/proc/detach_assembly(color)
var/obj/item/assembly/S = get_attached(color)
if(S && istype(S))
diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm
index a8e9873150e..c99a27b300a 100644
--- a/code/datums/wires/explosive.dm
+++ b/code/datums/wires/explosive.dm
@@ -66,7 +66,7 @@
/datum/wires/explosive/c4/explode()
var/obj/item/grenade/c4/P = holder
- P.prime()
+ P.receive_signal()
/datum/wires/explosive/pizza
holder_type = /obj/item/pizzabox
diff --git a/code/datums/wires/mines.dm b/code/datums/wires/mines.dm
index 4c856cf99d3..91e0ac81618 100644
--- a/code/datums/wires/mines.dm
+++ b/code/datums/wires/mines.dm
@@ -28,7 +28,7 @@
if(WIRE_PIN)
if(ourmine.clicked == TRUE)
holder.visible_message(span_notice("[icon2html(ourmine, viewers(holder))] You hear something inside \the [ourmine] click softly."))
- playsound(ourmine, 'sound/weapons/empty.ogg', 30, TRUE)
+ playsound(ourmine, SOUND_EMPTY_MAG, 30, TRUE)
ourmine.clicked = FALSE
else
holder.visible_message(span_notice("[icon2html(ourmine, viewers(holder))] \The [ourmine]'s detonation pad shifts slightly. Nothing happens."))
@@ -61,7 +61,7 @@
ourmine.dud = TRUE
if(ourmine.clicked == TRUE)
holder.visible_message(span_notice("[icon2html(ourmine, viewers(holder))] You hear something inside \the [ourmine] shift out of place."))
- playsound(ourmine, 'sound/weapons/empty.ogg', 30, TRUE)
+ playsound(ourmine, SOUND_EMPTY_MAG, 30, TRUE)
ourmine.clicked = FALSE
else
holder.visible_message(span_notice("[icon2html(ourmine, viewers(holder))] \The [ourmine]'s detonation pad goes loose."))
diff --git a/code/datums/wires/mod.dm b/code/datums/wires/mod.dm
new file mode 100644
index 00000000000..b5805557eaf
--- /dev/null
+++ b/code/datums/wires/mod.dm
@@ -0,0 +1,57 @@
+/datum/wires/mod
+ holder_type = /obj/item/mod/control
+ proper_name = "MOD control unit"
+
+/datum/wires/mod/New(atom/holder)
+ wires = list(WIRE_HACK, WIRE_DISABLE, WIRE_SHOCK, WIRE_INTERFACE)
+ add_duds(2)
+ ..()
+
+/datum/wires/mod/interactable(mob/user)
+ if(!..())
+ return FALSE
+ var/obj/item/mod/control/mod = holder
+ return mod.open
+
+/datum/wires/mod/get_status()
+ var/obj/item/mod/control/mod = holder
+ var/list/status = list()
+ status += "The orange light is [mod.seconds_electrified ? "on" : "off"]."
+ status += "The red light is [mod.malfunctioning ? "off" : "blinking"]."
+ status += "The green light is [mod.locked ? "on" : "off"]."
+ status += "The yellow light is [mod.interface_break ? "off" : "on"]."
+ return status
+
+/datum/wires/mod/on_pulse(wire)
+ var/obj/item/mod/control/mod = holder
+ switch(wire)
+ if(WIRE_HACK)
+ mod.locked = !mod.locked
+ if(WIRE_DISABLE)
+ mod.malfunctioning = TRUE
+ if(WIRE_SHOCK)
+ mod.seconds_electrified = MACHINE_DEFAULT_ELECTRIFY_TIME
+ if(WIRE_INTERFACE)
+ mod.interface_break = !mod.interface_break
+
+/datum/wires/mod/on_cut(wire, mend)
+ var/obj/item/mod/control/mod = holder
+ switch(wire)
+ if(WIRE_HACK)
+ if(!mend)
+ mod.req_access = list()
+ if(WIRE_DISABLE)
+ mod.malfunctioning = !mend
+ if(WIRE_SHOCK)
+ if(mend)
+ mod.seconds_electrified = MACHINE_NOT_ELECTRIFIED
+ else
+ mod.seconds_electrified = MACHINE_ELECTRIFIED_PERMANENT
+ if(WIRE_INTERFACE)
+ mod.interface_break = !mend
+
+/datum/wires/mod/ui_act(action, params)
+ var/obj/item/mod/control/mod = holder
+ if(!issilicon(usr) && mod.seconds_electrified && mod.shock(usr))
+ return FALSE
+ return ..()
diff --git a/code/game/MapData/shuttles/nanotrasen_ranger.dm b/code/game/MapData/shuttles/nanotrasen_ranger.dm
index 1766cd11ee0..06d98876072 100644
--- a/code/game/MapData/shuttles/nanotrasen_ranger.dm
+++ b/code/game/MapData/shuttles/nanotrasen_ranger.dm
@@ -101,7 +101,7 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/lp
resistance_flags = null
max_heat_protection_temperature = null
- slowdown = 1.2
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
/obj/item/clothing/head/helmet/space/hardsuit/ert/lp
armor = list("melee" = 50, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 60, "fire" = 50, "acid" = 80)
@@ -111,7 +111,7 @@
max_heat_protection_temperature = null
/obj/item/clothing/suit/space/hardsuit/ert/lp/sec
- armor = list("melee" = 35, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
+ armor = list("melee" = 40, "bullet" = 40, "laser" = 20, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 50, "fire" = 40, "acid" = 40)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/lp/sec
name = "Loss Prevention Security Hardsuit"
desc = "The best of the best security staff get assigned to the ERT. Second best are given this Hardsuit as a part of the LP Team."
@@ -119,7 +119,7 @@
item_state = "ert_security"
/obj/item/clothing/head/helmet/space/hardsuit/ert/lp/sec
- armor = list("melee" = 35, "bullet" = 20, "laser" = 30,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
+ armor = list("melee" = 40, "bullet" = 40, "laser" = 20,"energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 50, "fire" = 40, "acid" = 40)
hardsuit_type = "ert_security"
name = "Loss Prevention Security Hardsuit Helmet"
desc = "The helmet that comes attached to the LP Team Security Hardsuit."
@@ -127,7 +127,7 @@
item_state = "hardsuit0-ert_security"
/obj/item/clothing/suit/space/hardsuit/ert/lp/engi
- armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
+ armor = list("melee" = 30, "bullet" = 20, "laser" = 30, "energy" = 30, "bomb" = 25, "bio" = 100, "rad" = 75, "fire" = 90, "acid" = 75)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/lp/engi
name = "Loss Prevention Engineering Hardsuit"
desc = "The best of the best engineering staff get assigned to the ERT. Second best are given this Hardsuit as a part of the LP Team."
@@ -135,7 +135,7 @@
item_state = "ert_engineer"
/obj/item/clothing/head/helmet/space/hardsuit/ert/lp/engi
- armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
+ armor = list("melee" = 38, "bullet" = 20, "laser" = 30, "energy" = 30, "bomb" = 25, "bio" = 100, "rad" = 75, "fire" = 90, "acid" = 75)
name = "Loss Prevention Engineering Hardsuit Helmet"
desc = "The helmet that comes attached to the LP Team Engineering Hardsuit."
icon_state = "hardsuit0-ert_engineer"
@@ -143,32 +143,34 @@
hardsuit_type = "ert_engineer"
/obj/item/clothing/suit/space/hardsuit/ert/lp/med
- armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75)
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 25, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/lp/med
name = "Loss Prevention Medical Hardsuit"
desc = "The best of the best medical staff get assigned to the ERT. Second best are given this Hardsuit as a part of the LP Team."
icon_state = "ert_medical"
item_state = "ert_medical"
+ slowdown = 0.5
/obj/item/clothing/head/helmet/space/hardsuit/ert/lp/med
- armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75)
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 25, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60)
name = "Loss Prevention Medical Hardsuit Helmet"
desc = "The helmet that comes attached to the LP Team Medical Hardsuit."
icon_state = "hardsuit0-ert_medical"
item_state = "hardsuit0-ert_medical"
hardsuit_type = "ert_medical"
+ clothing_flags = SCAN_REAGENTS | STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS
/obj/item/clothing/head/helmet/space/hardsuit/lp
name = "RIG heatsuit helmet"
desc = "The helmet to the RIG heat suit. It's packed with heat diverting materials, coolant pipes, and a two inch thick face screen."
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 75)
+ armor = list("melee" = 5, "bullet" = 5, "laser" = 1, "energy" = 1, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 75)
heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = ACID_PROOF | FIRE_PROOF
/obj/item/clothing/suit/space/hardsuit/ancient/lp
name = "RIG heat suit"
- desc = "A fully heat resistance suit based on an early RIG hardsuit prototype. It sacrifices armor of any kind for intricate heatsinks. It remains rather bulky as a result."
+ desc = "A fully heat-resistant suit based on an early RIG hardsuit prototype. It sacrifices armor of any kind for intricate heatsinks. It remains rather bulky as a result."
armor = list("melee" = 5, "bullet" = 5, "laser" = 1, "energy" = 1, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 75)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/lp
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
@@ -177,116 +179,8 @@
//holotapes
-/obj/item/disk/holodisk/lp/combat/syndicate1
- name = "Combat Mission Eliminate Force"
- desc = "A holodisk containing a combat mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around a combat objective. The LP will have to get their hands dirty for this one.
- DELAY 25
- SAY The LP is to respond to a hostile threat from a Syndicate vessel. In such action they are to kill or otherwise subdue the primary fighting force.
- DELAY 25
- "}
-
-/obj/item/disk/holodisk/lp/combat/syndicate2
- name = "Combat Mission Capture"
- desc = "A holodisk containing a combat mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around a combat objective. The LP will have to get their hands dirty for this one.
- DELAY 25
- SAY The LP is to respond to a hostile threat from a Syndicate vessel. In such action they are to subdue and capture one of the armed members of the crew. They should be stripped of gear, interrogated, and converted to NT if possible. If not possible, release them to whatever ship they belonged to or will accept them.
- DELAY 25
- "}
-
-/obj/item/disk/holodisk/lp/combat/syndicate3
- name = "Combat Mission Capture Commander"
- desc = "A holodisk containing a combat mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around a combat objective. The LP will have to get their hands dirty for this one.
- DELAY 25
- SAY The LP is to respond to a hostile threat from a Syndicate vessel. In such action they are to eliminate whatever leader or captain of such vession and bring their body back in a bodybag. The Medical Specialist has been given a box of them for such an occasion.
- DELAY 25
- "}
-
-/obj/item/disk/holodisk/lp/combat/syndicate4
- name = "Combat Mission Secret Documents"
- desc = "A holodisk containing a combat mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around a combat objective. The LP will have to get their hands dirty for this one.
- DELAY 25
- SAY The LP is to respond to a hostile threat from a Syndicate vessel. In such action they are to retrieve a set of secret documents from the syndicate vessel. This will likely require a boarding operation. Good luck.
- DELAY 25
- "}
-
-/obj/item/disk/holodisk/lp/combat/megafauna
- name = "Combat Mission Megafauna"
- desc = "A holodisk containing a combat mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around a combat objective. The LP will have to get their hands dirty for this one.
- DELAY 25
- SAY This mission is very simple. The LP is to seek out a megafauna specimen and slay it.
- DELAY 25
- "}
-
-/obj/item/disk/holodisk/lp/combat/bdm
- name = "Combat Mission Blood Drunk"
- desc = "A holodisk containing a combat mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around a combat objective. The LP will have to get their hands dirty for this one.
- DELAY 25
- SAY This mission is straightforward. The LP team is to seek out two blood drunk mines and termninate them. Bring back whatever weapons they wield and recover the bodies for the vault.
- DELAY 25
- "}
-
-/obj/item/disk/holodisk/lp/combat/tumor
- name = "Combat Mission Tumor"
- desc = "A holodisk containing a combat mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around a combat objective. The LP will have to get their hands dirty for this one.
- DELAY 25
- SAY This mission is rather straightforward. Seak out 2 pulsing tumors and elimate the threat they produce. Return the body of the threat to the vault.
- DELAY 25
- "}
-
-/obj/item/disk/holodisk/lp/combat/bloodred
- name = "Combat Mission Blood Red"
- desc = "A holodisk containing a combat mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around a combat objective. The LP will have to get their hands dirty for this one.
- DELAY 25
- SAY This mission overlaps with the retrieval missions. The LP is simply to obtain a Blood Red Hardsuit. This may include responding to a hostile syndicate vessel to take it by force.
- DELAY 25
- "}
-
-/obj/item/disk/holodisk/lp/retrieval/supersuit
- name = "Retrieval Mission Lost Hardsuit"
- desc = "A holodisk containing a retrieval mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around a retrieval objective. The LP will need to obtain or create something.
- DELAY 25
- SAY This one is a bit difficult but completing it is extremely rewarding. Our sources show that two of our experimental hardsuits have been lost to the necropolis. Retrieve a Champion's Hardsuit or an Inquisitor's Hardsuit. These are often found in necropolis chests or held by certain megafauna.
- DELAY 25
- "}
-
/obj/item/disk/holodisk/lp/retrieval/phazon
- name = "Retrieval Mission Secret Mecha"
+ name = "Retrieval Mission Secret Exosuit"
desc = "A holodisk containing a retrieval mission for the LP."
preset_image_type = /datum/preset_holoimage/commissioner
preset_record_text = {"
@@ -321,18 +215,6 @@
DELAY 25
"}
-/obj/item/disk/holodisk/lp/retrieval/artifact
- name = "Retrieval Mission Artifact"
- desc = "A holodisk containing a retrieval mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around a retrieval objective. The LP will need to obtain or create something.
- DELAY 25
- SAY For this mission the LP is to find three artifacts. These include but are not limited to, anything stored in a necropolis chest, most megafauna loot, anything befitting someone magical or otherwise special.
- DELAY 25
- "}
-
/obj/item/disk/holodisk/lp/retrieval/materials
name = "Retrieval Mission Materials"
desc = "A holodisk containing a retrieval mission for the LP."
@@ -345,18 +227,6 @@
DELAY 25
"}
-/obj/item/disk/holodisk/lp/aid/recruits
- name = "Aid Mission Recruitment Drive"
- desc = "A holodisk containing an aid mission for the LP."
- preset_image_type = /datum/preset_holoimage/commissioner
- preset_record_text = {"
- NAME Commissioner Gorre Donn
- SAY This mission, should you choose to accept it, revolves around an aid objective. The LP will need to provide aid to local vessels not hostile or syndicate.
- DELAY 25
- SAY Less providing aid and more networking. The LP will need to convince 4 independent vessels to switch to NTSV flight tags.
- DELAY 25
- "}
-
/obj/item/disk/holodisk/lp/aid/repairs
name = "Aid Mission Repair"
desc = "A holodisk containing an aid mission for the LP."
@@ -370,7 +240,7 @@
"}
/obj/item/disk/holodisk/lp/aid/rescue
- name = "Aid Mission Rescure"
+ name = "Aid Mission Rescue"
desc = "A holodisk containing an aid mission for the LP."
preset_image_type = /datum/preset_holoimage/commissioner
preset_record_text = {"
@@ -413,48 +283,28 @@
//lootdrop
-/obj/effect/spawner/lootdrop/lpcombat
- name = "LP Combat Missions"
- lootdoubles = FALSE
-
- loot = list(
- /obj/item/disk/holodisk/lp/combat/syndicate1 = 1,
- /obj/item/disk/holodisk/lp/combat/syndicate2 = 1,
- /obj/item/disk/holodisk/lp/combat/syndicate3 = 1,
- /obj/item/disk/holodisk/lp/combat/syndicate4 = 1,
- /obj/item/disk/holodisk/lp/combat/megafauna = 5,
- /obj/item/disk/holodisk/lp/combat/bdm = 5,
- /obj/item/disk/holodisk/lp/combat/tumor = 5,
- /obj/item/disk/holodisk/lp/combat/bloodred = 5
- )
-
- lootcount = 2
-
-/obj/effect/spawner/lootdrop/lpretrieval
+/obj/effect/spawner/random/lpretrieval
name = "LP Retrieval Missions"
- lootdoubles = FALSE
+ spawn_loot_double = FALSE
loot = list(
- /obj/item/disk/holodisk/lp/retrieval/supersuit = 1,
/obj/item/disk/holodisk/lp/retrieval/phazon = 1,
/obj/item/disk/holodisk/lp/retrieval/durand = 1,
/obj/item/disk/holodisk/lp/retrieval/gunstock = 1,
- /obj/item/disk/holodisk/lp/retrieval/artifact = 1,
/obj/item/disk/holodisk/lp/retrieval/materials = 1
)
- lootcount = 2
+ spawn_loot_count = 2
-/obj/effect/spawner/lootdrop/lpaid
+/obj/effect/spawner/random/lpaid
name = "LP Aid Missions"
- lootdoubles = FALSE
+ spawn_loot_double = FALSE
loot = list(
- /obj/item/disk/holodisk/lp/aid/recruits = 1,
/obj/item/disk/holodisk/lp/aid/repairs = 1,
/obj/item/disk/holodisk/lp/aid/rescue = 1,
/obj/item/disk/holodisk/lp/aid/guard = 1,
)
- lootcount = 2
+ spawn_loot_count = 4
diff --git a/code/game/MapData/shuttles/pgf_bolide.dm b/code/game/MapData/shuttles/pgf_bolide.dm
new file mode 100644
index 00000000000..13a9767de68
--- /dev/null
+++ b/code/game/MapData/shuttles/pgf_bolide.dm
@@ -0,0 +1,245 @@
+/obj/machinery/air_sensor/ship/bolide/air
+ id_tag = "bolide_air"
+
+/obj/machinery/air_sensor/ship/bolide/fuel
+ id_tag = "bolide_fuel_1"
+
+/obj/machinery/air_sensor/ship/bolide/fuel_2
+ id_tag = "bolide_fuel_2"
+
+/obj/machinery/computer/atmos_control/ship/bolide
+ sensors = list(
+ "bolide_air" = "Airmix Chamber",
+ "bolide_fuel_1" = "Port Fuel Chamber",
+ "bolide_fuel_2" = "Starboard Fuel Chamber",
+ )
+
+//this should go somewhere else
+/obj/structure/closet/crate/rations
+ name = "ration crate"
+ desc = "A rectangular steel crate, filled with marine food."
+ var/ration_count = 10
+
+/obj/structure/closet/crate/rations/PopulateContents()
+ . = ..()
+ for(var/i in 1 to ration_count)
+ new /obj/effect/spawner/random/food_or_drink/ration(src)
+
+/obj/item/storage/toolbox/explosives
+ name = "\improper explosives handling kit"
+ desc = "Be careful to not jostle it."
+ icon_state = "explosive"
+ item_state = "toolbox_red"
+ latches = "double_latch"
+
+/obj/item/storage/toolbox/explosives/PopulateContents()
+ new /obj/item/screwdriver(src)
+ new /obj/item/wirecutters(src)
+ new /obj/item/multitool(src)
+ for(var/i in 1 to 4)
+ new /obj/item/assembly/signaler(src)
+
+/obj/structure/toilet/secret/bolide
+ secret_type = /obj/item/storage/fancy/cigarettes/cigpack_mindbreaker
+
+/obj/item/folder/pgf/blue/bolide
+
+/obj/item/folder/pgf/blue/bolide/Initialize()
+ . = ..()
+ new /obj/item/paper/fluff/ship/bolide/one(src)
+ new /obj/item/paper/fluff/ship/bolide/two(src)
+ new /obj/item/paper/fluff/ship/bolide/three(src)
+ new /obj/item/paper/fluff/ship/bolide/four(src)
+ update_appearance()
+
+/obj/item/folder/pgf/empty_sheets
+ name = "PGF Fax Templates"
+
+/obj/item/folder/pgf/empty_sheets/Initialize()
+ . = ..()
+ for(var/i in 1 to 7)
+ new /obj/item/paper/fluff/ship/bolide(src)
+
+/mob/living/simple_animal/pet/fox/bolide
+ name = "Saperzy"
+ desc = "A lovable rogue that scampered aboard during a readiness drill. Now an honorary marine."
+ gender = MALE
+ unique_pet = TRUE
+ icon_state = "saperzy"
+ icon_living = "saperzy"
+ icon_dead = "fox_dead"
+ faction = list("neutral", FACTION_PLAYER_GEZENA)
+ speak = list("Ack-Ack","Ack-Ack-Ack-Ackawoooo","Geckers","Awoo","Tchoff","Aweh!")
+ speak_emote = list("geckers!", "barks!", "yips!")
+ emote_hear = list("yips!","barks!","geckers!")
+ emote_see = list("sits at attention.", "shakes his fur out.", "wags a few times.", "perks up.","sniffs the air.")
+
+/obj/item/paper/fluff/ship/bolide
+ name = "Blank Federated Navy Paperwork"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+
logo here (one day)
+
+ Pan Gezenan Federation Navy Bolide-Class Lander
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT:
+ "}
+
+/obj/item/paper/fluff/ship/bolide/one
+ name = "Official Briefing"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+
logo here (one day)
+
+ Pan Gezenan Federation Navy Office of Naval Deployment
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT: Briefing Crew of Vessel
+
+
+
1. The Office of Naval Deployment has seen fit to deploy you in command of an Elated Bolide class Frigate Assault Lander (Bolide-Class). Congratulations on your assignment. You are expected to coordinate with the Marine Lieutenant assigned to the vessel for the duration of this deployment.
+
2. A Bolide-class Lander's mission profile is traditionally; landing in occupied regions, planetary assault in contested systems, construction of Navy Infrastructure, assistance of CLIP colonists, and aiding in conducting Federation Readiness Drills.
+
3. The assignment issued to your vessel is as follows: Identify locations of interest, construct infrastructure, avoid non-decisive confrontations, conduct readiness drills if possible. Deviation from these goals is accepted and expected. Failure to meet any of them will result in an investigatory effort on your command.
+
4. The Office Of Naval Deployment directs that it is supplied with the following: Reports on construction projects, reports on conflict in area, reports on crew readiness. Failure to supply pertinent reports in a timely fashion will lead to termination of your command.
+
5. The Office Of Naval Deployment directs that you coordinate with the Marine Lieutenant to ensure a chain of command is followed aboard at all times. The Office recommends assigning 'buddies' to risk-prone marines, assigning 'Team Leaders' to watch over any group of more than 3, and ensuring radio contact at all times.
+
6. The Office recommends that all other documents in this folder are read, and distributed to the crew as necessary.
+
+
+
+
+
+ Eutei-Tar
+ Eutei-Tar
+ Vice Admiral, PGF Navy
+ Assistant Director Of the Office Of Navy Deployment
+ Pan Gezenan Federation Navy Office Of Requisitions
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT: Safe storage of explosive materials
+
+
+
1. The Office of Requisition has seen fit to deploy your command with a complement of explosive compounds. These compounds include - Composition C-4, Composition X-4.
+
2. Composition C-4 is an dense explosive package composed of; RDX, Plastic binders, plasticizer. Composition C-4 is a stable, malleable explosive meant for demolition usage. It is resistant to detonation from gunshots and jostling. The C-4 charges you have been issued include a detonator in their assembly, and should not be tinkered with by untrained hands.
+
3. Ensure that any usage of Composition C-4 is monitored and controlled. Do not issue Composition c-4 to your vessel without a cause for such.
+
4. Composition X-4 is a high powered explosive package composed of an RDX filling mixed with a teslium based detonator, allowing for a far more focused explosion. Unless the casing has degraded, it is safe to handle in the same manner as Composition C-4.
+
5. Take care in assigning usage of Composition X-4 due to it's increased potency. While focused, an injury resulting from being caught in a blast would likely prove fatal.
+
6. The Office recommends assigning a trained expert to monitor field usage of explosives.
+ Pan Gezenan Federation Navy Office Of Personnel
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT: Prevention of Inappropriate Relationships.
+
+
+
The Office of Personnel recommends that the captain of any PGFN vessel keep an active eye out for inappropriate relationships in the ranks.
+
Inappropriate relationships are a relationship that fulfills one of the following criteria; Compromises the integrity of supervisory authority, causes unfairness, involves improper use of rank or position for personal gain, gives the perception that it is exploitive or coercive in nature, can create an adverse effect on good order and discipline or mission accomplishment.
+
As an officer, behaviors to avoid including enlisted in are; business matters, gambling, dating, sharing living accomodations.
+
Actual or percieved, these activities are prohibited. If it looks wrong, it's probably wrong.
+ Pan Gezenan Federation Navy Office Of Personnel
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT: Chain of Command aboard vessel.
+
+
+
The Office of Personnel recommends that the Captain of a PGFN vessel in deployment establish a chain of command that encompasses all crew aboard the vessel.
+
The ranks of all serving members aboard a vessel creates a natural chain of command for the Captain and any other officers to base any further Chain Of Command alterations upon. It should be stressed that a Captain should avoid issuing field promotions to fulfill an artifical chain of command.
+
A Captain should discuss any change in chain of command with any other officers aboard before putting it into action. This allows multiple opinions to be fed into the process, thus creating a stronger product.
+
Aboard a Bolide-Class Lander, the Office of Personnel recommends that the captain designate one 'team leader' per three marines aboard. These team leaders should report directly to the Marine Lieutenant, They should be reported to by the two marines in their team. It is not suggested to work the naval engineers into this program, as they are not expected to deploy in combat.
+
Marines should be made aware that being declared team leader carries no authority unless delegated. In the event of a conflicted chain of command, or contested order, the figure with rank should be obeyed.
+
This Office recommends monitoring marines for behavioral patterns before assigning a team leader. The ideal marine team leader is cool-headed, rational, and able to make tough choices.
+
+
+
+ "}
+
diff --git a/code/game/MapData/shuttles/pgf_crying_sun.dm b/code/game/MapData/shuttles/pgf_crying_sun.dm
index 6df40aa0efd..2851518e669 100644
--- a/code/game/MapData/shuttles/pgf_crying_sun.dm
+++ b/code/game/MapData/shuttles/pgf_crying_sun.dm
@@ -2,7 +2,7 @@
name = "The UCWLWM"
desc = "It's looks old and worn out."
icon_state = "book3"
- author = "Welds-the-Steel"
+ author = "Senior Engineer Wihlz-Saai"
title = "The Universal Colossal Warship Linear Weapon Mount"
dat = {"
diff --git a/code/game/MapData/shuttles/pgf_woeful_cthonian.dm b/code/game/MapData/shuttles/pgf_woeful_cthonian.dm
new file mode 100644
index 00000000000..cffb8229e36
--- /dev/null
+++ b/code/game/MapData/shuttles/pgf_woeful_cthonian.dm
@@ -0,0 +1,69 @@
+/obj/item/storage/backpack/satchel/flat/cthonian/PopulateContents()
+ new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/food/drinks/bottle/rum(src)
+ new /obj/item/reagent_containers/food/drinks/bottle/absinthe(src)
+
+/obj/item/paper/fluff/ship/cthonian
+ name = "Blank Federated Navy Paperwork"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+
logo here (one day)
+
+ Pan Gezenan Federation Navy Bolide-Class Lander
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT:
+ "}
+
+/obj/item/paper/fluff/ship/cthonian/one
+ name = "Official Briefing"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+
logo here (one day)
+
+ Pan Gezenan Federation Navy Office of Naval Deployment
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT: Briefing Crew of Vessel
+
+
+
1. The Office of Naval Deployment has seen fit to deploy you in command of an Woeful Cthonian class Patrol Cutter. Congratulations on your assignment. Due to the small size of this vessel, it is possible that it is your first command. If this is the case, the Office Of Naval Deployment recommends christening your vessel with the provided bottle of champagne.
+
2. A Cthonian-class Cutter's mission profile is traditionally; Patrol in contested and claimed space, assisting in CLIP anti-piracy operations, intercepting smugglers and other individual suspected of breaking the laws of the Federation, and providing information for larger vessels.
+
3. The assignment issued to your vessel is as follows: Assume a standard "contested space" patrol within the system you are operating in. Maintain stand-off relations with other states unless ordered by a higher authority. Engage and destroy pirates within the system whenever possible.
+
4. The Office Of Naval Deployment directs that it is supplied with the following: reports on pirate hideouts in system, reports on conflict in area, reports on nations in area. Failure to supply pertinent reports in a timely fashion will lead to investigation of your command.
+
+
+
+
+
+ Eutei-Tar
+ Eutei-Tar
+ Vice Admiral, PGF Navy
+ Assistant Director Of the Office Of Navy Deployment
+
+ "}
diff --git a/code/game/MapData/shuttles/srm_elder.dm b/code/game/MapData/shuttles/srm_elder.dm
index 97805731ec2..453767e4394 100644
--- a/code/game/MapData/shuttles/srm_elder.dm
+++ b/code/game/MapData/shuttles/srm_elder.dm
@@ -1,15 +1,12 @@
-/obj/item/melee/transforming/cleaving_saw/old
+/obj/item/melee/cleaving_saw/old
name = "old cleaving saw"
desc = "This saw, old and rusted, is still an effective tool at bleeding beasts and monsters."
force = 10
- force_on = 15 //force when active
+ active_force = 15 //force when active
throwforce = 15
- throwforce_on = 15
- faction_bonus_force = 5
- nemesis_factions = list("mining", "boss")
+ active_throwforce = 15
bleed_stacks_per_hit = 1.5
-
/obj/structure/closet/secure_closet/medicalsrm
name = "hunter doctor closet"
desc = "Everything the Hunter Doctor needs to heal the hurting masses."
diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm
index 96f09636fec..873828d2c26 100644
--- a/code/game/alternate_appearance.dm
+++ b/code/game/alternate_appearance.dm
@@ -130,32 +130,6 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
/datum/atom_hud/alternate_appearance/basic/observers/mobShouldSee(mob/M)
return isobserver(M)
-/datum/atom_hud/alternate_appearance/basic/noncult
-
-/datum/atom_hud/alternate_appearance/basic/noncult/New()
- ..()
- for(var/mob in GLOB.player_list)
- if(mobShouldSee(mob))
- add_hud_to(mob)
-
-/datum/atom_hud/alternate_appearance/basic/noncult/mobShouldSee(mob/M)
- if(!iscultist(M))
- return TRUE
- return FALSE
-
-/datum/atom_hud/alternate_appearance/basic/cult
-
-/datum/atom_hud/alternate_appearance/basic/cult/New()
- ..()
- for(var/mob in GLOB.player_list)
- if(mobShouldSee(mob))
- add_hud_to(mob)
-
-/datum/atom_hud/alternate_appearance/basic/cult/mobShouldSee(mob/M)
- if(iscultist(M))
- return TRUE
- return FALSE
-
/datum/atom_hud/alternate_appearance/basic/blessedAware
/datum/atom_hud/alternate_appearance/basic/blessedAware/New()
@@ -167,8 +141,6 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
/datum/atom_hud/alternate_appearance/basic/blessedAware/mobShouldSee(mob/M)
if(M.mind && (M.mind.assigned_role == "Chaplain"))
return TRUE
- if (istype(M, /mob/living/simple_animal/hostile/construct/wraith))
- return TRUE
if(isrevenant(M) || iswizard(M))
return TRUE
return FALSE
diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
deleted file mode 100644
index 366f9127cd5..00000000000
--- a/code/game/area/Space_Station_13_areas.dm
+++ /dev/null
@@ -1,1350 +0,0 @@
-/*
-
-### This file contains a list of all the areas in your station. Format is as follows:
-
-/area/CATEGORY/OR/DESCRIPTOR/NAME (you can make as many subdivisions as you want)
- name = "NICE NAME" (not required but makes things really nice)
- icon = 'ICON FILENAME' (defaults to 'icons/turf/areas.dmi')
- icon_state = "NAME OF ICON" (defaults to "unknown" (blank))
- requires_power = FALSE (defaults to true)
- ambientsounds = list() (defaults to GENERIC from sound.dm. override it as "ambientsounds = list('sound/ambience/signal.ogg')" or using another define.
-
-NOTE: there are two lists of areas in the end of this file: centcom and station itself. Please maintain these lists valid. --rastaf0
-
-*/
-
-
-/*-----------------------------------------------------------------------------*/
-
-/* Shiptest Begin
-
-/area/ai_monitored //stub defined ai_monitored.dm
-
-/area/ai_monitored/turret_protected
-
-/area/space
- icon_state = "space"
- requires_power = TRUE
- always_unpowered = TRUE
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
- power_light = FALSE
- power_equip = FALSE
- power_environ = FALSE
- area_flags = UNIQUE_AREA | CAVES_ALLOWED | MOB_SPAWN_ALLOWED
- outdoors = TRUE
- ambientsounds = SPACE
- flags_1 = CAN_BE_DIRTY_1
- sound_environment = SOUND_AREA_SPACE
-
-/area/space/nearstation
- icon_state = "space_near"
- dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
-
-/area/start
- name = "start area"
- icon_state = "start"
- requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
- has_gravity = STANDARD_GRAVITY
-
-
-/area/testroom
- requires_power = FALSE
- name = "Test Room"
- icon_state = "storage"
-
-//EXTRA
-
-/area/asteroid
- name = "Asteroid"
- icon_state = "asteroid"
- requires_power = FALSE
- has_gravity = STANDARD_GRAVITY
- area_flags = UNIQUE_AREA | CAVES_ALLOWED | MOB_SPAWN_ALLOWED
- ambientsounds = MINING
- flags_1 = CAN_BE_DIRTY_1
- sound_environment = SOUND_AREA_ASTEROID
-
-/area/asteroid/nearstation
- dynamic_lighting = DYNAMIC_LIGHTING_FORCED
- ambientsounds = RUINS
- always_unpowered = FALSE
- requires_power = TRUE
- area_flags = UNIQUE_AREA | BLOBS_ALLOWED
-
-/area/asteroid/nearstation/bomb_site
- name = "Bomb Testing Asteroid"
-
-//STATION13
-
-//Maintenance
-
-/area/maintenance
- ambientsounds = MAINTENANCE
- lighting_colour_tube = "#ffe5cb"
- lighting_colour_bulb = "#ffdbb4"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA
- sound_environment = SOUND_AREA_TUNNEL_ENCLOSED
-
-//Departments
-
-/area/maintenance/department/chapel
- name = "Chapel Maintenance"
- icon_state = "maint_chapel"
-
-/area/maintenance/department/chapel/monastery
- name = "Monastery Maintenance"
- icon_state = "maint_monastery"
-
-/area/maintenance/department/crew_quarters/bar
- name = "Bar Maintenance"
- icon_state = "maint_bar"
- sound_environment = SOUND_AREA_WOODFLOOR
-
-/area/maintenance/department/crew_quarters/dorms
- name = "Dormitory Maintenance"
- icon_state = "maint_dorms"
-
-/area/maintenance/department/eva
- name = "EVA Maintenance"
- icon_state = "maint_eva"
-
-/area/maintenance/department/electrical
- name = "Electrical Maintenance"
- icon_state = "maint_electrical"
-
-/area/maintenance/department/engine/atmos
- name = "Atmospherics Maintenance"
- icon_state = "maint_atmos"
-
-/area/maintenance/department/security
- name = "Security Maintenance"
- icon_state = "maint_sec"
-
-/area/maintenance/department/security/upper
- name = "Upper Security Maintenance"
-
-/area/maintenance/department/security/brig
- name = "Brig Maintenance"
- icon_state = "maint_brig"
-
-/area/maintenance/department/medical
- name = "Medbay Maintenance"
- icon_state = "medbay_maint"
-
-/area/maintenance/department/medical/central
- name = "Central Medbay Maintenance"
- icon_state = "medbay_maint_central"
-
-/area/maintenance/department/medical/morgue
- name = "Morgue Maintenance"
- icon_state = "morgue_maint"
-
-/area/maintenance/department/science
- name = "Science Maintenance"
- icon_state = "maint_sci"
-
-/area/maintenance/department/science/central
- name = "Central Science Maintenance"
- icon_state = "maint_sci_central"
-
-/area/maintenance/department/cargo
- name = "Cargo Maintenance"
- icon_state = "maint_cargo"
-
-/area/maintenance/department/bridge
- name = "Bridge Maintenance"
- icon_state = "maint_bridge"
-
-/area/maintenance/department/engine
- name = "Engineering Maintenance"
- icon_state = "maint_engi"
-
-/area/maintenance/department/science/xenobiology
- name = "Xenobiology Maintenance"
- icon_state = "xenomaint"
- area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | XENOBIOLOGY_COMPATIBLE
-
-
-//Maintenance - Generic
-
-/area/maintenance/aft
- name = "Aft Maintenance"
- icon_state = "amaint"
-
-/area/maintenance/aft/upper
- name = "Upper Aft Maintenance"
-
-/area/maintenance/aft/secondary
- name = "Aft Maintenance"
- icon_state = "amaint_2"
-
-/area/maintenance/central
- name = "Central Maintenance"
- icon_state = "maintcentral"
-
-/area/maintenance/central/secondary
- name = "Central Maintenance"
- icon_state = "maintcentral"
-
-/area/maintenance/fore
- name = "Fore Maintenance"
- icon_state = "fmaint"
-
-/area/maintenance/fore/upper
- name = "Upper Fore Maintenance"
-
-/area/maintenance/fore/secondary
- name = "Fore Maintenance"
- icon_state = "fmaint_2"
-
-/area/maintenance/starboard
- name = "Starboard Maintenance"
- icon_state = "smaint"
-
-/area/maintenance/starboard/upper
- name = "Upper Starboard Maintenance"
-
-/area/maintenance/starboard/central
- name = "Central Starboard Maintenance"
- icon_state = "smaint"
-
-/area/maintenance/starboard/secondary
- name = "Secondary Starboard Maintenance"
- icon_state = "smaint_2"
-
-/area/maintenance/starboard/aft
- name = "Starboard Quarter Maintenance"
- icon_state = "asmaint"
-
-/area/maintenance/starboard/aft/secondary
- name = "Secondary Starboard Quarter Maintenance"
- icon_state = "asmaint_2"
-
-/area/maintenance/starboard/fore
- name = "Starboard Bow Maintenance"
- icon_state = "fsmaint"
-
-/area/maintenance/port
- name = "Port Maintenance"
- icon_state = "pmaint"
-
-/area/maintenance/port/central
- name = "Central Port Maintenance"
- icon_state = "maintcentral"
-
-/area/maintenance/port/aft
- name = "Port Quarter Maintenance"
- icon_state = "apmaint"
-
-/area/maintenance/port/fore
- name = "Port Bow Maintenance"
- icon_state = "fpmaint"
-
-/area/maintenance/disposal
- name = "Waste Disposal"
- icon_state = "disposal"
-
-/area/maintenance/disposal/incinerator
- name = "Incinerator"
- icon_state = "disposal"
-
-
-//Hallway
-/area/hallway
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/hallway
- lighting_colour_tube = "#ffce99"
- lighting_colour_bulb = "#ffdbb4"
- lighting_brightness_tube = 7
-
-
-/area/hallway/primary/aft
- name = "Aft Primary Hallway"
- icon_state = "hallA"
-
-/area/hallway/primary/fore
- name = "Fore Primary Hallway"
- icon_state = "hallF"
-
-/area/hallway/primary/starboard
- name = "Starboard Primary Hallway"
- icon_state = "hallS"
-
-/area/hallway/primary/port
- name = "Port Primary Hallway"
- icon_state = "hallP"
-
-/area/hallway/primary/central
- name = "Central Primary Hallway"
- icon_state = "hallC"
-
-/area/hallway/primary/upper
- name = "Upper Central Primary Hallway"
- icon_state = "hallC"
-
-
-/area/hallway/secondary/command
- name = "Command Hallway"
- icon_state = "bridge_hallway"
-
-/area/hallway/secondary/construction
- name = "Construction Area"
- icon_state = "construction"
-
-/area/hallway/secondary/exit
- name = "Escape Shuttle Hallway"
- icon_state = "escape"
-
-/area/hallway/secondary/exit/departure_lounge
- name = "Departure Lounge"
- icon_state = "escape_lounge"
-
-/area/hallway/secondary/entry
- name = "Arrival Shuttle Hallway"
- icon_state = "entry"
-
-/area/hallway/secondary/service
- name = "Service Hallway"
- icon_state = "hall_service"
-
-//Command
-
-/area/bridge
- name = "Bridge"
- icon_state = "bridge"
- ambientsounds = list('sound/ambience/signal.ogg')
- lighting_colour_tube = "#ffce99"
- lighting_colour_bulb = "#ffdbb4"
- lighting_brightness_tube = 6
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/bridge/meeting_room
- name = "Heads of Staff Meeting Room"
- icon_state = "meeting"
- sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
-
-/area/bridge/meeting_room/council
- name = "Council Chamber"
- icon_state = "meeting"
- sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
-
-/area/bridge/showroom/corporate
- name = "Corporate Showroom"
- icon_state = "showroom"
- sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
-
-/area/crew_quarters/heads/captain
- name = "Captain's Office"
- icon_state = "captain"
- sound_environment = SOUND_AREA_WOODFLOOR
-
-/area/crew_quarters/heads/captain/private
- name = "Captain's Quarters"
- icon_state = "captain"
- sound_environment = SOUND_AREA_WOODFLOOR
-
-/area/crew_quarters/heads/chief
- name = "Chief Engineer's Office"
- icon_state = "ce_office"
-
-/area/crew_quarters/heads/cmo
- name = "Chief Medical Officer's Office"
- icon_state = "cmo_office"
-
-/area/crew_quarters/heads/head_of_personnel
- name = "Head of Personnel's Office"
- icon_state = "hop_office"
-
-/area/crew_quarters/heads/hos
- name = "Head of Security's Office"
- icon_state = "hos_office"
-
-/area/crew_quarters/heads/hor
- name = "Research Director's Office"
- icon_state = "rd_office"
-
-/area/comms
- name = "Communications Relay"
- icon_state = "tcomsatcham"
- lighting_colour_tube = "#e2feff"
- lighting_colour_bulb = "#d5fcff"
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/server
- name = "Messaging Server Room"
- icon_state = "server"
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-//Crew
-
-/area/crew_quarters
- lighting_colour_tube = "#ffce99"
- lighting_colour_bulb = "#ffdbb4"
- lighting_brightness_tube = 6
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/crew_quarters/dorms
- name = "Dormitories"
- icon_state = "Sleep"
- area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA
-
-/area/crew_quarters/dorms/barracks
- name = "Sleep Barracks"
-
-/area/crew_quarters/dorms/barracks/male
- name = "Male Sleep Barracks"
-
-/area/crew_quarters/dorms/barracks/female
- name = "Female Sleep Barracks"
-
-/area/crew_quarters/toilet
- name = "Dormitory Toilets"
- icon_state = "toilet"
- lighting_colour_tube = "#e3ffff"
- lighting_colour_bulb = "#d5ffff"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/crew_quarters/toilet/auxiliary
- name = "Auxiliary Restrooms"
- icon_state = "toilet"
-
-/area/crew_quarters/toilet/locker
- name = "Locker Toilets"
- icon_state = "toilet"
-
-/area/crew_quarters/toilet/restrooms
- name = "Restrooms"
- icon_state = "toilet"
-
-/area/crew_quarters/locker
- name = "Locker Room"
- icon_state = "locker"
-
-/area/crew_quarters/lounge
- name = "Lounge"
- icon_state = "yellow"
- sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
-
-/area/crew_quarters/fitness
- name = "Fitness Room"
- icon_state = "fitness"
-
-/area/crew_quarters/fitness/locker_room
- name = "Unisex Locker Room"
- icon_state = "fitness"
-
-/area/crew_quarters/fitness/locker_room/male
- name = "Male Locker Room"
-
-/area/crew_quarters/fitness/locker_room/female
- name = "Female Locker Room"
-
-
-/area/crew_quarters/fitness/recreation
- name = "Recreation Area"
- icon_state = "fitness"
-
-/area/crew_quarters/cafeteria
- name = "Cafeteria"
- icon_state = "cafeteria"
-
-/area/crew_quarters/kitchen
- name = "Kitchen"
- icon_state = "kitchen"
- lighting_colour_tube = "#e3ffff"
- lighting_colour_bulb = "#d5ffff"
-
-/area/crew_quarters/kitchen/coldroom
- name = "Kitchen Cold Room"
- icon_state = "kitchen_cold"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/crew_quarters/bar
- name = "Bar"
- icon_state = "bar"
- mood_bonus = 5
- mood_message = "I love being in the bar!\n"
- lighting_colour_tube = "#fff4d6"
- lighting_colour_bulb = "#ffebc1"
- sound_environment = SOUND_AREA_WOODFLOOR
-
-/area/crew_quarters/bar/atrium
- name = "Atrium"
- icon_state = "bar"
- sound_environment = SOUND_AREA_WOODFLOOR
-
-/area/crew_quarters/electronic_marketing_den
- name = "Electronic Marketing Den"
- icon_state = "bar"
-
-/area/crew_quarters/abandoned_gambling_den
- name = "Abandoned Gambling Den"
- icon_state = "abandoned_g_den"
-
-/area/crew_quarters/abandoned_gambling_den/secondary
- icon_state = "abandoned_g_den_2"
-
-/area/crew_quarters/theatre
- name = "Theatre"
- icon_state = "Theatre"
- sound_environment = SOUND_AREA_WOODFLOOR
-
-/area/crew_quarters/theatre/abandoned
- name = "Abandoned Theatre"
- icon_state = "Theatre"
-
-/area/library
- name = "Library"
- icon_state = "library"
- flags_1 = CULT_PERMITTED_1
- lighting_colour_tube = "#ffce99"
- lighting_colour_bulb = "#ffdbb4"
- sound_environment = SOUND_AREA_LARGE_SOFTFLOOR
-
-/area/library/lounge
- name = "Library Lounge"
- icon_state = "library"
- sound_environment = SOUND_AREA_LARGE_SOFTFLOOR
-
-/area/library/artgallery
- name = " Art Gallery"
- icon_state = "library"
-
-/area/library/private
- name = "Library Private Study"
- icon_state = "library"
-
-/area/library/upper
- name = "Library Upper Floor"
- icon_state = "library"
-
-/area/library/printer
- name = "Library Printer Room"
- icon_state = "library"
-
-/area/library/abandoned
- name = "Abandoned Library"
- icon_state = "library"
- flags_1 = CULT_PERMITTED_1
-
-/area/chapel
- icon_state = "chapel"
- ambientsounds = HOLY
- flags_1 = NONE
- sound_environment = SOUND_AREA_LARGE_ENCLOSED
-
-/area/chapel/main
- name = "Chapel"
-
-/area/chapel/main/monastery
- name = "Monastery"
-
-/area/chapel/office
- name = "Chapel Office"
- icon_state = "chapeloffice"
-
-/area/chapel/asteroid
- name = "Chapel Asteroid"
- icon_state = "explored"
- sound_environment = SOUND_AREA_ASTEROID
-
-/area/chapel/asteroid/monastery
- name = "Monastery Asteroid"
-
-/area/chapel/dock
- name = "Chapel Dock"
- icon_state = "construction"
-
-/area/lawoffice
- name = "Law Office"
- icon_state = "law"
- sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
-
-
-//Engineering
-
-/area/engine
- ambientsounds = ENGINEERING
- lighting_colour_tube = "#ffce93"
- lighting_colour_bulb = "#ffbc6f"
- sound_environment = SOUND_AREA_LARGE_ENCLOSED
-
-/area/engine/engine_smes
- name = "Engineering SMES"
- icon_state = "engine_smes"
-
-/area/engine/engineering
- name = "Engineering"
- icon_state = "engine"
-
-/area/engine/atmos
- name = "Atmospherics"
- icon_state = "atmos"
- flags_1 = CULT_PERMITTED_1
-
-/area/engine/atmos/upper
- name = "Upper Atmospherics"
-
-/area/engine/atmospherics_engine
- name = "Atmospherics Engine"
- icon_state = "atmos_engine"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA
- sound_environment = SOUND_AREA_LARGE_ENCLOSED
-
-/area/engine/engine_room //donut station specific
- name = "Engine Room"
- icon_state = "atmos_engine"
-
-/area/engine/lobby
- name = "Engineering Lobby"
- icon_state = "engi_lobby"
-
-/area/engine/engine_room/external
- name = "Supermatter External Access"
- icon_state = "engine_foyer"
-
-/area/engine/supermatter
- name = "Supermatter Engine"
- icon_state = "engine_sm"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/engine/break_room
- name = "Engineering Foyer"
- icon_state = "engine_foyer"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/engine/gravity_generator
- name = "Gravity Generator Room"
- icon_state = "grav_gen"
-
-/area/engine/storage
- name = "Engineering Storage"
- icon_state = "engi_storage"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/engine/storage_shared
- name = "Shared Engineering Storage"
- icon_state = "engi_storage"
-
-/area/engine/transit_tube
- name = "Transit Tube"
- icon_state = "transit_tube"
-
-
-//Solars
-
-/area/solar
- requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
- area_flags = UNIQUE_AREA
- flags_1 = NONE
- ambientsounds = ENGINEERING
- sound_environment = SOUND_AREA_SPACE
-
-/area/solar/fore
- name = "Fore Solar Array"
- icon_state = "yellow"
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/solar/aft
- name = "Aft Solar Array"
- icon_state = "yellow"
-
-/area/solar/aux/port
- name = "Port Bow Auxiliary Solar Array"
- icon_state = "panelsA"
-
-/area/solar/aux/starboard
- name = "Starboard Bow Auxiliary Solar Array"
- icon_state = "panelsA"
-
-/area/solar/starboard
- name = "Starboard Solar Array"
- icon_state = "panelsS"
-
-/area/solar/starboard/aft
- name = "Starboard Quarter Solar Array"
- icon_state = "panelsAS"
-
-/area/solar/starboard/fore
- name = "Starboard Bow Solar Array"
- icon_state = "panelsFS"
-
-/area/solar/port
- name = "Port Solar Array"
- icon_state = "panelsP"
-
-/area/solar/port/aft
- name = "Port Quarter Solar Array"
- icon_state = "panelsAP"
-
-/area/solar/port/fore
- name = "Port Bow Solar Array"
- icon_state = "panelsFP"
-
-/area/solar/aisat
- name = "AI Satellite Solars"
- icon_state = "yellow"
-
-
-//Solar Maint
-
-/area/maintenance/solars
- name = "Solar Maintenance"
- icon_state = "yellow"
-
-/area/maintenance/solars/port
- name = "Port Solar Maintenance"
- icon_state = "SolarcontrolP"
-
-/area/maintenance/solars/port/aft
- name = "Port Quarter Solar Maintenance"
- icon_state = "SolarcontrolAP"
-
-/area/maintenance/solars/port/fore
- name = "Port Bow Solar Maintenance"
- icon_state = "SolarcontrolFP"
-
-/area/maintenance/solars/starboard
- name = "Starboard Solar Maintenance"
- icon_state = "SolarcontrolS"
-
-/area/maintenance/solars/starboard/aft
- name = "Starboard Quarter Solar Maintenance"
- icon_state = "SolarcontrolAS"
-
-/area/maintenance/solars/starboard/fore
- name = "Starboard Bow Solar Maintenance"
- icon_state = "SolarcontrolFS"
-
-//Teleporter
-
-/area/teleporter
- name = "Teleporter Room"
- icon_state = "teleporter"
- ambientsounds = ENGINEERING
-
-/area/gateway
- name = "Gateway"
- icon_state = "gateway"
- ambientsounds = ENGINEERING
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-//MedBay
-
-/area/medical
- name = "Medical"
- icon_state = "medbay3"
- ambientsounds = MEDICAL
- lighting_colour_tube = "#e7f8ff"
- lighting_colour_bulb = "#d5f2ff"
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/medical/abandoned
- name = "Abandoned Medbay"
- icon_state = "medbay3"
- ambientsounds = list('sound/ambience/signal.ogg')
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/medical/medbay/central
- name = "Medbay Central"
- icon_state = "medbay"
-
-/area/medical/medbay/lobby
- name = "Medbay Lobby"
- icon_state = "medbay"
-
- //Medbay is a large area, these additional areas help level out APC load.
-
-/area/medical/medbay/zone2
- name = "Medbay"
- icon_state = "medbay2"
-
-/area/medical/medbay/aft
- name = "Medbay Aft"
- icon_state = "medbay3"
-
-/area/medical/storage
- name = "Medbay Storage"
- icon_state = "medbay2"
-
-/area/medical/paramedic
- name = "Paramedic Dispatch"
- icon_state = "medbay2"
-
-/area/medical/office
- name = "Medical Office"
- icon_state = "medoffice"
-
-/area/medical/surgery/room_c
- name = "Surgery C"
- icon_state = "surgery"
-
-/area/medical/surgery/room_d
- name = "Surgery D"
- icon_state = "surgery"
-
-/area/medical/break_room
- name = "Medical Break Room"
- icon_state = "medbay2"
-
-/area/medical/coldroom
- name = "Medical Cold Room"
- icon_state = "kitchen_cold"
-
-/area/medical/patients_rooms
- name = "Patients' Rooms"
- icon_state = "patients"
- sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
-
-/area/medical/patients_rooms/room_a
- name = "Patient Room A"
- icon_state = "patients"
-
-/area/medical/patients_rooms/room_b
- name = "Patient Room B"
- icon_state = "patients"
-
-/area/medical/virology
- name = "Virology"
- icon_state = "virology"
- flags_1 = CULT_PERMITTED_1
-
-/area/medical/morgue
- name = "Morgue"
- icon_state = "morgue"
- ambientsounds = SPOOKY
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/medical/chemistry
- name = "Chemistry"
- icon_state = "chem"
-
-/area/medical/pharmacy
- name = "Pharmacy"
- icon_state = "pharmacy"
-
-/area/medical/surgery
- name = "Surgery"
- icon_state = "surgery"
-
-/area/medical/surgery/room_b
- name = "Surgery B"
- icon_state = "surgery"
-
-/area/medical/cryo
- name = "Cryogenics"
- icon_state = "cryo"
-
-/area/medical/exam_room
- name = "Exam Room"
- icon_state = "exam_room"
-
-/area/medical/genetics
- name = "Genetics Lab"
- icon_state = "genetics"
-
-/area/medical/sleeper
- name = "Medbay Treatment Center"
- icon_state = "exam_room"
-
-/area/medical/psychology
- name = "Psychology Office"
- icon_state = "psychology"
- mood_bonus = 3
- mood_message = "I feel at ease here.\n"
- ambientsounds = list('sound/ambience/aurora_caelus_short.ogg')
-
-//Security
-
-/area/security
- name = "Security"
- icon_state = "security"
- ambientsounds = HIGHSEC
- lighting_colour_tube = "#ffeee2"
- lighting_colour_bulb = "#ffdfca"
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/security/main
- name = "Security Office"
- icon_state = "security"
-
-/area/security/brig
- name = "Brig"
- icon_state = "brig"
-
-/area/security/brig/upper
- name = "Brig Overlook"
-
-/area/security/courtroom
- name = "Courtroom"
- icon_state = "courtroom"
- sound_environment = SOUND_AREA_LARGE_ENCLOSED
-
-/area/security/prison
- name = "Prison Wing"
- icon_state = "sec_prison"
-
-/area/security/prison/toilet //radproof
- name = "Prison Toilet"
- icon_state = "sec_prison_safe"
-
-/area/security/prison/safe //radproof
- name = "Prison Wing Cells"
- icon_state = "sec_prison_safe"
-
-/area/security/prison/upper
- name = "Upper Prison Wing"
- icon_state = "prison_upper"
-
-/area/security/prison/visit
- name = "Prison Visitation Area"
- icon_state = "prison_visit"
-
-/area/security/prison/rec
- name = "Prison Rec Room"
- icon_state = "prison_rec"
-
-/area/security/prison/mess
- name = "Prison Mess Hall"
- icon_state = "prison_mess"
-
-/area/security/prison/work
- name = "Prison Work Room"
- icon_state = "prison_work"
-
-/area/security/prison/shower
- name = "Prison Shower"
- icon_state = "prison_shower"
-
-/area/security/prison/workout
- name = "Prison Gym"
- icon_state = "prison_workout"
-
-/area/security/prison/garden
- name = "Prison Garden"
- icon_state = "prison_garden"
-
-/area/security/processing
- name = "Labor Shuttle Dock"
- icon_state = "sec_prison"
-
-/area/security/processing/cremation
- name = "Security Crematorium"
- icon_state = "sec_prison"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/security/warden
- name = "Brig Control"
- icon_state = "Warden"
- sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
-
-/area/security/detectives_office
- name = "Detective's Office"
- icon_state = "detective"
- ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg')
-
-/area/security/detectives_office/private_investigators_office
- name = "Private Investigator's Office"
- icon_state = "detective"
- sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
-
-/area/security/range
- name = "Firing Range"
- icon_state = "firingrange"
-
-/area/security/execution
- icon_state = "execution_room"
-
-/area/security/execution/transfer
- name = "Transfer Centre"
-
-/area/security/execution/education
- name = "Prisoner Education Chamber"
-
-/area/security/nuke_storage
- name = "Vault"
- icon_state = "nuke_storage"
-
-/area/ai_monitored/nuke_storage
- name = "Vault"
- icon_state = "nuke_storage"
-
-/area/security/checkpoint
- name = "Security Checkpoint"
- icon_state = "checkpoint1"
-
-/area/security/checkpoint/auxiliary
- icon_state = "checkpoint_aux"
-
-/area/security/checkpoint/escape
- icon_state = "checkpoint_esc"
-
-/area/security/checkpoint/supply
- name = "Security Post - Cargo Bay"
- icon_state = "checkpoint_supp"
-
-/area/security/checkpoint/engineering
- name = "Security Post - Engineering"
- icon_state = "checkpoint_engi"
-
-/area/security/checkpoint/medical
- name = "Security Post - Medbay"
- icon_state = "checkpoint_med"
-
-/area/security/checkpoint/science
- name = "Security Post - Science"
- icon_state = "checkpoint_sci"
-
-/area/security/checkpoint/science/research
- name = "Security Post - Research Division"
- icon_state = "checkpoint_res"
-
-/area/security/checkpoint/customs
- name = "Customs"
- icon_state = "customs_point"
-
-/area/security/checkpoint/customs/auxiliary
- icon_state = "customs_point_aux"
-
-
-//Service
-
-/area/quartermaster
- name = "Quartermasters"
- icon_state = "quart"
- lighting_colour_tube = "#ffe3cc"
- lighting_colour_bulb = "#ffdbb8"
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/quartermaster/sorting
- name = "Delivery Office"
- icon_state = "cargo_delivery"
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/quartermaster/warehouse
- name = "Warehouse"
- icon_state = "cargo_warehouse"
- sound_environment = SOUND_AREA_LARGE_ENCLOSED
-
-/area/quartermaster/warehouse/upper
- name = "Upper Warehouse"
-
-/area/quartermaster/office
- name = "Cargo Office"
- icon_state = "quartoffice"
-
-/area/quartermaster/storage
- name = "Cargo Bay"
- icon_state = "cargo_bay"
- sound_environment = SOUND_AREA_LARGE_ENCLOSED
-
-/area/quartermaster/qm
- name = "Quartermaster's Office"
- icon_state = "quart"
-
-/area/quartermaster/qm/perch
- name = "Quartermaster's Perch"
- icon_state = "quartperch"
-
-/area/quartermaster/miningdock
- name = "Mining Dock"
- icon_state = "mining"
-
-/area/quartermaster/miningoffice
- name = "Mining Office"
- icon_state = "mining"
-
-/area/janitor
- name = "Custodial Closet"
- icon_state = "janitor"
- flags_1 = CULT_PERMITTED_1
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/hydroponics
- name = "Hydroponics"
- icon_state = "hydro"
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/hydroponics/upper
- name = "Upper Hydroponics"
- icon_state = "hydro"
-
-/area/hydroponics/garden
- name = "Garden"
- icon_state = "garden"
-
-/area/hydroponics/garden/abandoned
- name = "Abandoned Garden"
- icon_state = "abandoned_garden"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/hydroponics/garden/monastery
- name = "Monastery Garden"
- icon_state = "hydro"
-
-
-//Science
-
-/area/science
- name = "Science Division"
- icon_state = "toxlab"
- lighting_colour_tube = "#f0fbff"
- lighting_colour_bulb = "#e4f7ff"
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/science/lab
- name = "Research and Development"
- icon_state = "toxlab"
-
-/area/science/xenobiology
- name = "Xenobiology Lab"
- icon_state = "toxlab"
-
-/area/science/storage
- name = "Toxins Storage"
- icon_state = "toxstorage"
-
-/area/science/test_area
- name = "Toxins Test Area"
- icon_state = "toxtest"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA
-
-/area/science/mixing
- name = "Toxins Mixing Lab"
- icon_state = "toxmix"
-
-/area/science/mixing/chamber
- name = "Toxins Mixing Chamber"
- icon_state = "toxmix"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA
-
-/area/science/misc_lab
- name = "Testing Lab"
- icon_state = "toxmisc"
-
-/area/science/misc_lab/range
- name = "Research Testing Range"
- icon_state = "toxmisc"
-
-/area/science/server
- name = "Research Division Server Room"
- icon_state = "server"
-
-/area/science/explab
- name = "Experimentation Lab"
- icon_state = "toxmisc"
-
-/area/science/robotics
- name = "Robotics"
- icon_state = "medresearch"
-
-/area/science/robotics/mechbay
- name = "Mech Bay"
- icon_state = "mechbay"
-
-/area/science/robotics/lab
- name = "Robotics Lab"
- icon_state = "ass_line"
-
-/area/science/research
- name = "Research Division"
- icon_state = "medresearch"
-
-/area/science/research/abandoned
- name = "Abandoned Research Lab"
- icon_state = "medresearch"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/science/nanite
- name = "Nanite Lab"
- icon_state = "toxmisc"
-
-//Storage
-/area/storage
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/storage/tools
- name = "Auxiliary Tool Storage"
- icon_state = "storage"
-
-/area/storage/primary
- name = "Primary Tool Storage"
- icon_state = "primarystorage"
-
-/area/storage/art
- name = "Art Supply Storage"
- icon_state = "storage"
-
-/area/storage/tcom
- name = "Telecomms Storage"
- icon_state = "green"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA
-
-/area/storage/eva
- name = "EVA Storage"
- icon_state = "eva"
-
-/area/storage/emergency/starboard
- name = "Starboard Emergency Storage"
- icon_state = "emergencystorage"
-
-/area/storage/emergency/port
- name = "Port Emergency Storage"
- icon_state = "emergencystorage"
-
-/area/storage/tech
- name = "Technical Storage"
- icon_state = "auxstorage"
-
-//Construction
-
-/area/construction
- name = "Construction Area"
- icon_state = "yellow"
- ambientsounds = ENGINEERING
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/construction/mining/aux_base
- name = "Auxiliary Base Construction"
- icon_state = "aux_base_construction"
- sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
-
-/area/construction/storage_wing
- name = "Storage Wing"
- icon_state = "storage_wing"
-
-// Vacant Rooms
-/area/vacant_room
- name = "Vacant Room"
- icon_state = "vacant_room"
- ambientsounds = MAINTENANCE
-
-/area/vacant_room/office
- name = "Vacant Office"
- icon_state = "vacant_office"
-
-/area/vacant_room/commissary
- name = "Vacant Commissary"
- icon_state = "vacant_commissary"
-
-//AI
-
-/area/ai_monitored
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/ai_monitored/security/armory
- name = "Armory"
- icon_state = "armory"
- ambientsounds = HIGHSEC
-
-/area/ai_monitored/security/armory/upper
- name = "Upper Armory"
-
-/area/ai_monitored/storage/eva
- name = "EVA Storage"
- icon_state = "eva"
- ambientsounds = HIGHSEC
-
-/area/ai_monitored/storage/eva/upper
- name = "Upper EVA Storage"
-
-/area/ai_monitored/storage/satellite
- name = "AI Satellite Maint"
- icon_state = "storage"
- ambientsounds = HIGHSEC
-
- //Turret_protected
-
-/area/ai_monitored/turret_protected
- ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg')
-
-/area/ai_monitored/turret_protected/ai_upload
- name = "AI Upload Chamber"
- icon_state = "ai_upload"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/ai_monitored/turret_protected/ai_upload_foyer
- name = "AI Upload Access"
- icon_state = "ai_foyer"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/ai_monitored/turret_protected/ai
- name = "AI Chamber"
- icon_state = "ai_chamber"
-
-/area/ai_monitored/turret_protected/aisat
- name = "AI Satellite"
- icon_state = "ai"
- sound_environment = SOUND_ENVIRONMENT_ROOM
-
-/area/ai_monitored/turret_protected/aisat/atmos
- name = "AI Satellite Atmos"
- icon_state = "ai"
-
-/area/ai_monitored/turret_protected/aisat/foyer
- name = "AI Satellite Foyer"
- icon_state = "ai"
-
-/area/ai_monitored/turret_protected/aisat/service
- name = "AI Satellite Service"
- icon_state = "ai"
-
-/area/ai_monitored/turret_protected/aisat/hallway
- name = "AI Satellite Hallway"
- icon_state = "ai"
-
-/area/aisat
- name = "AI Satellite Exterior"
- icon_state = "yellow"
-
-/area/ai_monitored/turret_protected/aisat_interior
- name = "AI Satellite Antechamber"
- icon_state = "ai"
- sound_environment = SOUND_AREA_LARGE_ENCLOSED
-
-/area/ai_monitored/turret_protected/AIsatextAS
- name = "AI Sat Ext"
- icon_state = "storage"
-
-/area/ai_monitored/turret_protected/AIsatextAP
- name = "AI Sat Ext"
- icon_state = "storage"
-
-
-// Telecommunications Satellite
-
-/area/tcommsat
- ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg', 'sound/ambience/ambitech.ogg',\
- 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg', 'sound/ambience/ambimystery.ogg')
-
-/area/tcommsat/computer
- name = "Telecomms Control Room"
- icon_state = "tcomsatcomp"
- sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
-
-/area/tcommsat/server
- name = "Telecomms Server Room"
- icon_state = "tcomsatcham"
-
-/area/tcommsat/server/upper
- name = "Upper Telecomms Server Room"
-
-//External Hull Access
-/area/maintenance/external
- name = "External Hull Access"
- icon_state = "amaint"
-
-/area/maintenance/external/aft
- name = "Aft External Hull Access"
-
-/area/maintenance/external/port
- name = "Port External Hull Access"
-
-/area/maintenance/external/port/bow
- name = "Port Bow External Hull Access"
-
-Shiptest End */
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index e8bdb66c189..b5949ac16f9 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -13,7 +13,7 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
invisibility = INVISIBILITY_LIGHTING
- var/area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA
+ var/area_flags = VALID_TERRITORY | UNIQUE_AREA
var/fire = null
///Whether there is an atmos alarm in this area
@@ -66,9 +66,6 @@
///Boolean to limit the areas (subtypes included) that atoms in this area can smooth with. Used for shuttles.
var/area_limited_icon_smoothing = FALSE
- ///WS Addition - Color on minimaps, if it's null (which is default) it makes one at random.
- var/minimap_color
-
var/list/power_usage
var/lighting_colour_tube = "#FFF6ED"
@@ -110,7 +107,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
/proc/process_teleport_locs()
for(var/V in GLOB.sortedAreas)
var/area/AR = V
- if(istype(AR, /area/shuttle) || AR.area_flags & NOTELEPORT)
+ if(AR.area_flags & NOTELEPORT)
continue
if(GLOB.teleportlocs[AR.name])
continue
@@ -128,14 +125,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
* Adds the item to the GLOB.areas_by_type list based on area type
*/
/area/New()
- if(!minimap_color) // goes in New() because otherwise it doesn't fucking work
- // generate one using the icon_state
- if(icon_state && icon_state != "unknown")
- var/icon/I = new(icon, icon_state, dir)
- I.Scale(1,1)
- minimap_color = I.GetPixel(1,1)
- else // no icon state? use random.
- minimap_color = rgb(rand(50,70),rand(50,70),rand(50,70))
// This interacts with the map loader, so it needs to be set immediately
// rather than waiting for atoms to initialize.
if (area_flags & UNIQUE_AREA)
@@ -633,7 +622,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
power_environ = FALSE
always_unpowered = FALSE
area_flags &= ~VALID_TERRITORY
- area_flags &= ~BLOBS_ALLOWED
addSorted()
/**
* Set the area size of the area
diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm
index 53ccc590c72..5f0db1fc93b 100644
--- a/code/game/area/areas/away_content.dm
+++ b/code/game/area/areas/away_content.dm
@@ -1,33 +1,5 @@
-/*
-Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
-*/
-
-
-// Away Missions
-/area/awaymission
- name = "Strange Location"
- icon_state = "away"
- has_gravity = STANDARD_GRAVITY
- ambientsounds = AWAY_MISSION
- sound_environment = SOUND_ENVIRONMENT_ROOM
-
-/area/awaymission/beach
- name = "Beach"
- icon_state = "away"
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
- requires_power = FALSE
- has_gravity = STANDARD_GRAVITY
- ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambinice.ogg')
-
-/area/awaymission/errorroom
+/area/errorroom
name = "Super Secret Room"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
has_gravity = STANDARD_GRAVITY
-/area/awaymission/vr
- name = "Virtual Reality"
- icon_state = "awaycontent1"
- requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
- var/pacifist = TRUE // if when you enter this zone, you become a pacifist or not
- var/death = FALSE // if when you enter this zone, you die
diff --git a/code/game/area/areas/outpost.dm b/code/game/area/areas/outpost.dm
index f50b7655a11..d7dd9068823 100644
--- a/code/game/area/areas/outpost.dm
+++ b/code/game/area/areas/outpost.dm
@@ -3,7 +3,7 @@
/area/outpost
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
has_gravity = STANDARD_GRAVITY
- area_flags = VALID_TERRITORY | BLOBS_ALLOWED | NOTELEPORT // not unique, in case multiple outposts get loaded. all derivatives should also be NOTELEPORT
+ area_flags = VALID_TERRITORY | NOTELEPORT // not unique, in case multiple outposts get loaded. all derivatives should also be NOTELEPORT
flags_1 = CAN_BE_DIRTY_1
sound_environment = SOUND_AREA_STANDARD_STATION
lighting_colour_tube = "#ffce99"
diff --git a/code/game/area/areas/ruins/_ruins.dm b/code/game/area/areas/ruins/_ruins.dm
index 1ba5d0e18ec..766ec66392b 100644
--- a/code/game/area/areas/ruins/_ruins.dm
+++ b/code/game/area/areas/ruins/_ruins.dm
@@ -4,7 +4,7 @@
name = "unexplored location"
icon_state = "away"
has_gravity = STANDARD_GRAVITY
- area_flags = HIDDEN_AREA | BLOBS_ALLOWED
+ area_flags = HIDDEN_AREA
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
ambientsounds = RUINS
flags_1 = CAN_BE_DIRTY_1
diff --git a/code/game/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm
index 8e614c8a0e7..8f7acc3a0c1 100644
--- a/code/game/area/areas/ruins/icemoon.dm
+++ b/code/game/area/areas/ruins/icemoon.dm
@@ -24,3 +24,86 @@
/area/ruin/unpowered/crashed_holemaker
name = "NTSV Holemaker II" // In honor of the kugelblitz shenanigan of all time
icon_state = "green"
+
+// Ice Lodge
+
+/area/ruin/powered/icemoon/lodge/mainhall
+ name = "Main Hall"
+ icon_state = "bridge_hallway"
+
+/area/ruin/powered/icemoon/lodge/cellar
+ name = "Cellar"
+ icon_state = "yellow"
+
+/area/ruin/powered/icemoon/lodge/montagne_office
+ name = "Montagne's Office"
+ icon_state = "bridge"
+
+/area/ruin/powered/icemoon/lodge/residential
+ name = "Residential Quarters"
+ icon_state = "crew_quarters"
+
+/area/ruin/powered/icemoon/lodge/gear_room
+ name = "Gear Room"
+ icon_state = "security"
+
+// teslalab
+
+/area/ruin/icemoon/tesla_lab
+ name = "CLIP Lab Complex"
+ icon_state = "hallC"
+
+/area/ruin/icemoon/tesla_lab/lab_a
+ name = "Lab Zone One"
+ icon_state = "yellow"
+
+/area/ruin/icemoon/tesla_lab/containment
+ name = "Specimen Containment"
+ icon_state = "purple"
+
+/area/ruin/icemoon/tesla_lab/engineering
+ name = "Engineering"
+ icon_state = "engine"
+
+/area/ruin/icemoon/tesla_lab/cargo
+ name = "Cargo Warehouse"
+ icon_state = "storage"
+
+/area/ruin/icemoon/tesla_lab/lobby
+ name = "Lobby"
+ icon_state = "green"
+
+/area/ruin/icemoon/tesla_lab/dorms
+ name = "Dormitories"
+ icon_state = "crew_quarters"
+
+/area/ruin/icemoon/tesla_lab/office
+ name = "Office"
+ icon_state = "bridge"
+
+/area/ruin/icemoon/tesla_lab/haymaker
+ name = "Haymaker Pod"
+ icon_state = "shuttle"
+
+/area/ruin/icemoon/tesla_lab/medbay
+ name = "Medical Bay"
+
+/area/ruin/icemoon/tesla_lab/office_two
+ name = "Director Office"
+
+/area/ruin/icemoon/tesla_lab/central_hall
+ name = "Central Halls"
+
+/area/ruin/icemoon/tesla_lab/lab_halls
+ name = "Lab Zone Hallway"
+
+/area/ruin/icemoon/tesla_lab/cargo_hall
+ name = "Cargo Access Hall"
+
+/area/ruin/icemoon/tesla_lab/turrets
+ name = "Turret Lean-To"
+ icon_state = "security"
+
+/area/ruin/icemoon/tesla_lab/armory
+ name = "Armory"
+ icon_state = "armory"
diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm
index f7cbb414bc0..298f996ea43 100644
--- a/code/game/area/areas/ruins/lavaland.dm
+++ b/code/game/area/areas/ruins/lavaland.dm
@@ -27,17 +27,6 @@
name = "Hierophant's Arena"
icon_state = "dk_yellow"
-
-//Elephant Graveyard
-
-/area/ruin/unpowered/elephant_graveyard
- name = "Elephant Graveyard"
- icon_state = "dk_yellow"
-
-/area/ruin/powered/graveyard_shuttle
- name = "Elephant Graveyard"
- icon_state = "green"
-
//Lava Canyon
/area/ruin/unpowered/scorched_hut
@@ -85,3 +74,24 @@
/area/ruin/unpowered/crashed_starwalker
name = "Crashed Pirate Ship"
+// Abandoned Listening Post
+
+/area/ruin/unpowered/listening_post
+ name = "Listening Post Lobby"
+ icon_state = "yellow"
+
+/area/ruin/unpowered/listening_post/commons
+ name = "Listening Post Commons"
+ icon_state = "green"
+
+/area/ruin/unpowered/listening_post/canteen
+ name = "Listening Post Canteen"
+ icon_state = "purple"
+
+/area/ruin/unpowered/listening_post/operations
+ name = "Listening Post Operations"
+ icon_state = "hallC"
+
+/area/ruin/unpowered/listening_post/engineering
+ name = "Listening Post Engineering"
+ icon_state = "dk_yellow"
diff --git a/code/game/area/areas/ruins/rockplanet.dm b/code/game/area/areas/ruins/rockplanet.dm
index 43516a72376..e1116172d85 100644
--- a/code/game/area/areas/ruins/rockplanet.dm
+++ b/code/game/area/areas/ruins/rockplanet.dm
@@ -32,3 +32,68 @@
name = "Abandoned Crash Site"
always_unpowered = FALSE
icon_state = "red"
+
+//distillery
+
+/area/ruin/rockplanet/distillery
+ name = "Distillery"
+ icon_state = "red"
+
+/area/ruin/rockplanet/distillery/saloon
+ name = "Saloon"
+ icon_state = "bar"
+
+/area/ruin/rockplanet/distillery/shuttle
+ name = "Frontiersman Pod"
+ icon_state = "shuttle"
+
+/area/ruin/rockplanet/distillery/crew
+ name = "Crew Area"
+ icon_state = "crew_quarters"
+
+/area/ruin/rockplanet/distillery/engineering
+ name = "Engineering"
+ icon_state = "engine"
+
+/area/ruin/rockplanet/distillery/office
+ name = "Office"
+ icon_state = "vacant_office"
+
+//N+S Mining Base
+
+/area/ruin/rockplanet/mining_base
+ name = "Mining Base"
+
+/area/ruin/rockplanet/mining_base/canteen
+ name = "Canteen Dome"
+ icon_state = "bar"
+
+/area/ruin/rockplanet/mining_base/office
+ name = "Coordinator's Office"
+ icon_state = "shuttle"
+
+/area/ruin/rockplanet/mining_base/crew
+ name = "Barracks Dome"
+ icon_state = "crew_quarters"
+
+/area/ruin/rockplanet/mining_base/med
+ name = "Medical Dome"
+ icon_state = "blue"
+
+/area/ruin/rockplanet/mining_base/engineering
+ name = "Engineering Complex"
+ icon_state = "engine"
+
+/area/ruin/rockplanet/mining_base/refinery
+ name = "Refinery Complex"
+ icon_state = "storage"
+
+/area/ruin/rockplanet/mining_base/armory
+ name = "Armory Dome"
+ icon_state = "armory"
+
+/area/ruin/rockplanet/mining_base/rig_one
+ name = "Mining Platform #1"
+
+/area/ruin/rockplanet/mining_base/rig_two
+ name = "Mining Platform #2"
diff --git a/code/game/area/areas/ruins/sandplanet.dm b/code/game/area/areas/ruins/sandplanet.dm
index e3a93b58e06..3dd26e96787 100644
--- a/code/game/area/areas/ruins/sandplanet.dm
+++ b/code/game/area/areas/ruins/sandplanet.dm
@@ -2,10 +2,12 @@
//whitesands surface camp saloon
+//saloon ruin
/area/ruin/whitesands/saloon
name = "Hermit Saloon"
icon_state = "green"
+//the pubby slop crash
/area/ruin/whitesands/pubbycrash
name = "Pubby-Class Wreckage"
icon_state = "bluenew"
@@ -17,3 +19,35 @@
/area/ruin/whitesands/pubbycrash/split
name = "Pubby-Class Chunk"
icon_state = "red"
+
+//e-11 manufactory
+/area/ruin/whitesands/e11manufactory
+ name = "Eoehoma Firearms Assembly Line"
+ icon_state = "mining_production"
+
+/area/ruin/whitesands/e11manufactory/warehouse
+ name = "Eoehoma Firearms Warehouse"
+ icon_state = "storage"
+
+/area/ruin/whitesands/e11manufactory/mats
+ name = "Eoehoma Firearms Material Storage"
+ icon_state = "auxstorage"
+
+/area/ruin/whitesands/e11manufactory/security
+ name = "Eoehoma Firearms Security Office"
+ icon_state = "security"
+
+/area/ruin/whitesands/e11manufactory/barracks
+ name = "Eoehoma Firearms Worker Barracks"
+ icon_state = "crew_quarters"
+
+/area/ruin/whitesands/e11manufactory/office
+ name = "Eoehoma Firearms Management Offices"
+ icon_state = "quartoffice"
+
+//cave base
+/area/ruin/whitesands/cave_base
+ name = "Abandoned Facility"
+ icon_state = "bluenew"
+
+/area/ruin/whitesands/cave_base/engi
diff --git a/code/game/area/areas/ruins/wasteplanet.dm b/code/game/area/areas/ruins/wasteplanet.dm
index 4b1e69b456d..6744e36f20c 100644
--- a/code/game/area/areas/ruins/wasteplanet.dm
+++ b/code/game/area/areas/ruins/wasteplanet.dm
@@ -3,31 +3,31 @@
//Abandoned Mechbay Ruin
/area/ruin/wasteplanet/abandoned_mechbay/mainhall
- name = "Abandoned Mechbay Main Corridor"
+ name = "Abandoned Exosuit Bay Main Corridor"
icon_state = "hallC"
/area/ruin/wasteplanet/abandoned_mechbay/commandcontrol
- name = "Abandoned Mechbay Command and Control"
+ name = "Abandoned Exosuit Bay Command and Control"
icon_state = "bridge"
/area/ruin/wasteplanet/abandoned_mechbay/bay1
- name = "Abandoned Mechbay Upper Hangar"
+ name = "Abandoned Exosuit Bay Upper Hangar"
icon_state = "mechbay"
/area/ruin/wasteplanet/abandoned_mechbay/bay2
- name = "Abandoned Mechbay Lower Hangar"
+ name = "Abandoned Exosuit Bay Lower Hangar"
icon_state = "mechbay"
/area/ruin/wasteplanet/abandoned_mechbay/crewquarters
- name = "Abandoned Mechbay Crew Quarters"
+ name = "Abandoned Exosuit Bay Crew Quarters"
icon_state = "green"
/area/ruin/wasteplanet/abandoned_mechbay/mechlab
- name = "Abandoned Mech Lab"
+ name = "Abandoned Exosuit Lab"
icon_state = "mechbay"
/area/ruin/wasteplanet/abandoned_mechbay/engineering
- name = "Abandoned Mechbay Engineering"
+ name = "Abandoned Exosuit Bay Engineering"
icon_state = "engine"
//Abandoned Waste Site
@@ -43,3 +43,39 @@
/area/ruin/wasteplanet/wasteplanet_radiation/containment
name = "Abandoned Waste Containment Vault"
icon_state = "disposal"
+
+//Wasteplanet_Tradepost
+
+/area/ruin/wasteplanet/tradepost/barracks
+ name = "Abandoned Barracks"
+ icon_state = "red"
+
+/area/ruin/wasteplanet/tradepost/center
+ name = "Abandoned Dome"
+ icon_state = "bridge"
+
+/area/ruin/wasteplanet/tradepost/warehouse
+ name = "Abandoned Warehouse"
+ icon_state = "dk_yellow"
+
+//Abandonded shipbreaking yard
+
+/area/ruin/wasteplanet/wasteplanet_shipbreaking
+ name = "Abandoned Shipbreaking Yard"
+ icon_state = "green"
+
+/area/ruin/wasteplanet/wasteplanet_shipbreaking/bay
+ name = "Miskilamo Shipbreaking Yard Bay"
+ icon_state = "engine"
+
+/area/ruin/wasteplanet/wasteplanet_shipbreaking/canteen
+ name = "Miskilamo Shipbreaking Yard Canteen"
+ icon_state = "hallC"
+
+/area/ruin/wasteplanet/wasteplanet_shipbreaking/dorms
+ name = "Miskilamo Shipbreaking Yard Dormatory"
+ icon_state = "bridge"
+
+/area/ruin/wasteplanet/wasteplanet_shipbreaking/ship
+ name = "Abandoned Shipbreaking Yard"
+ icon_state = "red"
diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm
deleted file mode 100644
index 6060367ca51..00000000000
--- a/code/game/area/areas/shuttles.dm
+++ /dev/null
@@ -1,191 +0,0 @@
-
-//These are shuttle areas; all subtypes are only used as teleportation markers, they have no actual function beyond that.
-//Multi area shuttles are a thing now, use subtypes! ~ninjanomnom
-
-/area/shuttle
- name = "Shuttle"
- requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_FORCED
- has_gravity = STANDARD_GRAVITY
- always_unpowered = FALSE
- // Loading the same shuttle map at a different time will produce distinct area instances.
- area_flags = NONE
- icon_state = "shuttle"
- flags_1 = CAN_BE_DIRTY_1
- lighting_colour_tube = "#fff0dd"
- lighting_colour_bulb = "#ffe1c1"
- area_limited_icon_smoothing = TRUE
- sound_environment = SOUND_ENVIRONMENT_ROOM
- //The mobile port attached to this area
- var/obj/docking_port/mobile/mobile_port
-
-
-/area/shuttle/Destroy()
- mobile_port = null
- . = ..()
-
-/area/shuttle/PlaceOnTopReact(turf/T, list/new_baseturfs, turf/fake_turf_type, flags)
- . = ..()
- if(length(new_baseturfs) > 1 || fake_turf_type)
- return // More complicated larger changes indicate this isn't a player
- if(ispath(new_baseturfs[1], /turf/open/floor/plating) && !(/turf/baseturf_skipover/shuttle in new_baseturfs))
- new_baseturfs.Insert(1, /turf/baseturf_skipover/shuttle)
-
-/area/shuttle/proc/link_to_shuttle(obj/docking_port/mobile/M)
- mobile_port = M
-
-////////////////////////////Multi-area shuttles////////////////////////////
-
-////////////////////////////Syndicate infiltrator////////////////////////////
-
-/area/shuttle/syndicate
- name = "Syndicate Infiltrator"
- ambientsounds = HIGHSEC
-
-/area/shuttle/syndicate/bridge
- name = "Syndicate Infiltrator Control"
-
-/area/shuttle/syndicate/medical
- name = "Syndicate Infiltrator Medbay"
-
-/area/shuttle/syndicate/armory
- name = "Syndicate Infiltrator Armory"
-
-/area/shuttle/syndicate/eva
- name = "Syndicate Infiltrator EVA"
-
-/area/shuttle/syndicate/hallway
-
-/area/shuttle/syndicate/airlock
- name = "Syndicate Infiltrator Airlock"
-
-////////////////////////////Pirate Shuttle////////////////////////////
-
-/area/shuttle/pirate
- name = "Pirate Shuttle"
- requires_power = TRUE
-
-////////////////////////////Bounty Hunter Shuttles////////////////////////////
-
-/area/shuttle/hunter
- name = "Hunter Shuttle"
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-
-////////////////////////////White Ship////////////////////////////
-
-/area/shuttle/abandoned
- name = "Abandoned Ship"
- requires_power = TRUE
-
-/area/shuttle/abandoned/bridge
- name = "Abandoned Ship Bridge"
-
-/area/shuttle/abandoned/engine
- name = "Abandoned Ship Engine"
-
-/area/shuttle/abandoned/bar
- name = "Abandoned Ship Bar"
-
-/area/shuttle/abandoned/crew
- name = "Abandoned Ship Crew Quarters"
-
-/area/shuttle/abandoned/cargo
- name = "Abandoned Ship Cargo Bay"
-
-/area/shuttle/abandoned/medbay
- name = "Abandoned Ship Medbay"
-
-/area/shuttle/abandoned/pod
- name = "Abandoned Ship Pod"
-
-/area/shuttle/abandoned/atmospherics
- name = "Abandoned Ship atmospherics"//WS station edit
-
-/area/shuttle/abandoned/coridor
- name = "Abandoned Ship coridor"//WS station edit
-////////////////////////////Single-area shuttles////////////////////////////
-
-/area/shuttle/transit
- name = "Hyperspace"
- desc = "Weeeeee"
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-
-/area/shuttle/custom
- name = "Custom player shuttle"
- area_flags = BLOBS_ALLOWED
- flags_1 = CAN_BE_DIRTY_1
-
-/area/shuttle/custom/powered
- name = "Custom Powered player shuttle"
- requires_power = FALSE
-
-/area/shuttle/arrival
- name = "Arrival Shuttle"
- area_flags = UNIQUE_AREA// SSjob refers to this area for latejoiners
-
-/area/shuttle/pod_1
- name = "Escape Pod One"
- area_flags = BLOBS_ALLOWED
-
-/area/shuttle/pod_2
- name = "Escape Pod Two"
- area_flags = BLOBS_ALLOWED
-
-/area/shuttle/pod_3
- name = "Escape Pod Three"
- area_flags = BLOBS_ALLOWED
-
-/area/shuttle/pod_4
- name = "Escape Pod Four"
- area_flags = BLOBS_ALLOWED
-
-/area/shuttle/mining
- name = "Mining Shuttle"
-
-/area/shuttle/mining/large
- name = "Mining Shuttle"
- requires_power = TRUE
-
-/area/shuttle/labor
- name = "Labor Camp Shuttle"
-
-/area/shuttle/supply
- name = "Supply Shuttle"
- area_flags = NOTELEPORT
-
-/area/shuttle/escape
- name = "Emergency Shuttle"
- area_flags = BLOBS_ALLOWED
- flags_1 = CAN_BE_DIRTY_1
-
-/area/shuttle/escape/backup
- name = "Backup Emergency Shuttle"
-
-/area/shuttle/escape/luxury
- name = "Luxurious Emergency Shuttle"
- area_flags = NOTELEPORT
-
-/area/shuttle/escape/arena
- name = "The Arena"
- area_flags = NOTELEPORT
-
-/area/shuttle/escape/meteor
- name = "\proper a meteor with engines strapped to it"
-
-/area/shuttle/transport
- name = "Transport Shuttle"
-
-/area/shuttle/sbc_starfury
- name = "SBC Starfury"
-
-/area/shuttle/sbc_fighter1
- name = "SBC Fighter 1"
-
-/area/shuttle/sbc_fighter2
- name = "SBC Fighter 2"
-
-/area/shuttle/sbc_corvette
- name = "SBC corvette"
-
-/area/shuttle/syndicate_scout
- name = "Syndicate Scout"
diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm
index 9fab6e35b3c..e0b6d27df4c 100644
--- a/code/game/area/ship_areas.dm
+++ b/code/game/area/ship_areas.dm
@@ -46,6 +46,20 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Test Room"
icon_state = "storage"
+/area/hyperspace
+ icon_state = "space"
+ requires_power = TRUE
+ always_unpowered = TRUE
+ dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+ power_light = FALSE
+ power_equip = FALSE
+ power_environ = FALSE
+ area_flags = UNIQUE_AREA | CAVES_ALLOWED | MOB_SPAWN_ALLOWED
+ outdoors = TRUE
+ ambientsounds = SPACE
+ flags_1 = CAN_BE_DIRTY_1
+ sound_environment = SOUND_AREA_SPACE
+
//EXTRA
/area/asteroid
@@ -69,7 +83,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/ship
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
always_unpowered = FALSE
- area_flags = VALID_TERRITORY | BLOBS_ALLOWED // Loading the same shuttle map at a different time will produce distinct area instances.
+ area_flags = VALID_TERRITORY // Loading the same shuttle map at a different time will produce distinct area instances.
icon_state = "shuttle"
flags_1 = CAN_BE_DIRTY_1
lighting_colour_tube = "#fff0dd"
@@ -149,6 +163,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/ship/crew/crewfive
name = "Crew Quarters 5"
+/area/ship/crew/specialized
+ name = "???"
+
+/area/ship/crew/specialized/medical
+ name = "Medical Specialist's Quarters"
+
+/area/ship/crew/specialized/security
+ name = "Security Specialist's Quarters"
+
+/area/ship/crew/specialized/engineering
+ name = "Engineering Specialist's Quarters"
+
+/area/ship/crew/specialized/cargo
+ name = "Cargo Specialist's Quarters"
+
/area/ship/crew/cryo
name = "Cryopod Room"
icon_state = "cryo"
@@ -292,6 +321,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "ai_chamber"
ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg')
+/area/ship/science/workshop
+ name = "Workshop"
+ icon_state = "workshop"
+
/// Engineering ///
/area/ship/engineering
name = "Engineering"
@@ -324,6 +357,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
lighting_colour_tube = "#e2feff"
lighting_colour_bulb = "#d5fcff"
+/area/ship/engineering/communications/room
+ name = "Communications Room"
+
/area/ship/engineering/engine
name = "Engine Room"
icon_state = "engine_sm"
@@ -464,10 +500,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "storage"
sound_environment = SOUND_AREA_STANDARD_STATION
+/area/ship/storage/port
+ name = "Port Storage Bay"
+
+/area/ship/storage/starboard
+ name = "Starboard Storage Bay"
+
/area/ship/storage/eva
name = "EVA Storage"
icon_state = "eva"
+/area/ship/storage/equip
+ name = "Equipment Room"
+
/// External Areas ///
/area/ship/external
name = "External"
diff --git a/code/game/atom/atom_orbit.dm b/code/game/atom/atom_orbit.dm
new file mode 100644
index 00000000000..2294293bd8b
--- /dev/null
+++ b/code/game/atom/atom_orbit.dm
@@ -0,0 +1,33 @@
+/atom
+ ///Reference to atom being orbited
+ var/atom/orbit_target
+ ///The orbiter component, if there's anything orbiting this atom
+ var/datum/component/orbiter/orbiters
+
+/**
+ * Recursive getter method to return a list of all ghosts orbitting this atom
+ *
+ * This will work fine without manually passing arguments.
+ * * processed - The list of atoms we've already convered
+ * * source - Is this the atom for who we're counting up all the orbiters?
+ * * ignored_stealthed_admins - If TRUE, don't count admins who are stealthmoded and orbiting this
+ */
+/atom/proc/get_all_orbiters(list/processed, source = TRUE, ignore_stealthed_admins = TRUE)
+ var/list/output = list()
+ if(!processed)
+ processed = list()
+ else if(src in processed)
+ return output
+
+ if(!source)
+ output += src
+
+ processed += src
+ for(var/atom/atom_orbiter as anything in orbiters?.orbiters)
+ output += atom_orbiter.get_all_orbiters(processed, source = FALSE)
+ return output
+
+/mob/get_all_orbiters(list/processed, source = TRUE, ignore_stealthed_admins = TRUE)
+ if(!source && ignore_stealthed_admins && client?.holder?.fakekey)
+ return list()
+ return ..()
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 7ffa3255ada..6f1a0069e5c 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -44,6 +44,14 @@
*/
var/list/atom_colours
+ /// Lazylist of all images (hopefully attached to us) to update when we change z levels
+ /// You will need to manage adding/removing from this yourself, but I'll do the updating for you
+ var/list/image/update_on_z
+
+ /// Lazylist of all overlays attached to us to update when we change z levels
+ /// You will need to manage adding/removing from this yourself, but I'll do the updating for you
+ /// Oh and note, if order of addition is important this WILL break that. so mind yourself
+ var/list/image/update_overlays_on_z
/// a very temporary list of overlays to remove
var/list/remove_overlays
@@ -67,9 +75,6 @@
///Economy cost of item in premium vendor
var/custom_premium_price
- //List of datums orbiting this atom
- var/datum/component/orbiter/orbiters
-
/// Radiation insulation types
var/rad_insulation = RAD_NO_INSULATION
@@ -146,8 +151,6 @@
/// The current connector overlay appearance. Saved so that it can be cut when necessary.
var/connector_overlay
- ///Reference to atom being orbited
- var/atom/orbit_target
///Default X pixel offset
var/base_pixel_x
///Default Y pixel offset
@@ -350,66 +353,6 @@
return TRUE
return !density
-/**
- * Is this atom currently located on centcom
- *
- * Specifically, is it on the z level and within the centcom areas
- *
- * You can also be in a shuttleshuttle during endgame transit
- *
- * Used in gamemode to identify mobs who have escaped and for some other areas of the code
- * who don't want atoms where they shouldn't be
- */
-/atom/proc/onCentCom()
- var/turf/T = get_turf(src)
- if(!T)
- return FALSE
-
- if(is_reserved_level(T))
- for(var/A in SSshuttle.mobile)
- var/obj/docking_port/mobile/M = A
- if(M.launch_status == ENDGAME_TRANSIT)
- for(var/place in M.shuttle_areas)
- var/area/shuttle/shuttle_area = place
- if(T in shuttle_area)
- return TRUE
-
- if(!is_centcom_level(T))//if not, don't bother
- return FALSE
-
- //Check for centcom itself
- if(istype(T.loc, /area/centcom))
- return TRUE
-
- //Check for centcom shuttles
- for(var/A in SSshuttle.mobile)
- var/obj/docking_port/mobile/M = A
- if(M.launch_status == ENDGAME_LAUNCHED)
- for(var/place in M.shuttle_areas)
- var/area/shuttle/shuttle_area = place
- if(T in shuttle_area)
- return TRUE
-
-/**
- * Is the atom in any of the centcom syndicate areas
- *
- * Either in the syndie base on centcom, or any of their shuttles
- *
- * Also used in gamemode code for win conditions
- */
-/atom/proc/onSyndieBase()
- var/turf/T = get_turf(src)
- if(!T)
- return FALSE
-
- if(!is_centcom_level(T))//if not, don't bother
- return FALSE
-
- if(istype(T.loc, /area/shuttle/syndicate) || istype(T.loc, /area/syndicate_mothership))
- return TRUE
-
- return FALSE
-
/**
* Is the atom in an away mission
*
@@ -779,15 +722,6 @@
contents_explosion(severity, target)
SEND_SIGNAL(src, COMSIG_ATOM_EX_ACT, severity, target)
-/**
- * React to a hit by a blob objecd
- *
- * default behaviour is to send the [COMSIG_ATOM_BLOB_ACT] signal
- */
-/atom/proc/blob_act(obj/structure/blob/B)
- SEND_SIGNAL(src, COMSIG_ATOM_BLOB_ACT, B)
- return
-
/atom/proc/fire_act(exposed_temperature, exposed_volume)
SEND_SIGNAL(src, COMSIG_ATOM_FIRE_ACT, exposed_temperature, exposed_volume)
return
@@ -977,7 +911,7 @@
return TRUE
///Get the best place to dump the items contained in the source storage item?
-/atom/proc/get_dumping_location(obj/item/storage/source,mob/user)
+/atom/proc/get_dumping_location()
return null
/**
@@ -1133,6 +1067,7 @@
VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EXPLOSION, "Explosion")
VV_DROPDOWN_OPTION(VV_HK_RADIATE, "Radiate")
VV_DROPDOWN_OPTION(VV_HK_EDIT_FILTERS, "Edit Filters")
+ VV_DROPDOWN_OPTION(VV_HK_SELL, "Export Item")
/atom/vv_do_topic(list/href_list)
. = ..()
@@ -1204,6 +1139,9 @@
var/client/C = usr.client
C?.open_filter_editor(src)
+ if(href_list[VV_HK_SELL] && check_rights(R_ADMIN|R_DEBUG) && check_rights(R_VAREDIT))
+ export_item_and_contents(src, allowed_categories = ALL, apply_elastic = FALSE)
+
/atom/vv_get_header()
. = ..()
var/refid = REF(src)
@@ -1265,25 +1203,73 @@
* Must return parent proc ..() in the end if overridden
*/
/atom/proc/tool_act(mob/living/user, obj/item/I, tool_type)
+ var/signal_result
+
+ var/list/processing_recipes = list() //List of recipes that can be mutated by sending the signal
+ signal_result = SEND_SIGNAL(src, COMSIG_ATOM_TOOL_ACT(tool_type), user, I, processing_recipes)
+ if(processing_recipes.len)
+ process_recipes(user, I, processing_recipes)
+ if(QDELETED(I))
+ return TRUE
switch(tool_type)
if(TOOL_CROWBAR)
- . |= crowbar_act(user, I)
+ . = crowbar_act(user, I)
if(TOOL_MULTITOOL)
- . |= multitool_act(user, I)
+ . = multitool_act(user, I)
if(TOOL_SCREWDRIVER)
- . |= screwdriver_act(user, I)
+ . = screwdriver_act(user, I)
if(TOOL_WRENCH)
- . |= wrench_act(user, I)
+ . = wrench_act(user, I)
if(TOOL_WIRECUTTER)
- . |= wirecutter_act(user, I)
+ . = wirecutter_act(user, I)
if(TOOL_WELDER)
- . |= welder_act(user, I)
+ . = welder_act(user, I)
if(TOOL_ANALYZER)
- . |= analyzer_act(user, I)
- if(. & COMPONENT_BLOCK_TOOL_ATTACK)
+ . = analyzer_act(user, I)
+ if(TOOL_DECONSTRUCT)
+ . |= deconstruct_act(user, I)
+ if(. || signal_result & COMPONENT_BLOCK_TOOL_ATTACK) //Either the proc or the signal handled the tool's events in some way.
return TRUE
-//! Tool-specific behavior procs. They send signals, so try to call ..()
+/atom/proc/process_recipes(mob/living/user, obj/item/I, list/processing_recipes)
+ //Only one recipe? use the first
+ if(processing_recipes.len == 1)
+ StartProcessingAtom(user, I, processing_recipes[1])
+ return
+ //Otherwise, select one with a radial
+ ShowProcessingGui(user, I, processing_recipes)
+
+///Creates the radial and processes the selected option
+/atom/proc/ShowProcessingGui(mob/living/user, obj/item/I, list/possible_options)
+ var/list/choices_to_options = list() //Dict of object name | dict of object processing settings
+ var/list/choices = list()
+
+ for(var/i in possible_options)
+ var/list/current_option = i
+ var/atom/current_option_type = current_option[TOOL_PROCESSING_RESULT]
+ choices_to_options[initial(current_option_type.name)] = current_option
+ var/image/option_image = image(icon = initial(current_option_type.icon), icon_state = initial(current_option_type.icon_state))
+ choices += list("[initial(current_option_type.name)]" = option_image)
+
+ var/pick = show_radial_menu(user, src, choices, radius = 36, require_near = TRUE)
+
+ StartProcessingAtom(user, I, choices_to_options[pick])
+
+
+/atom/proc/StartProcessingAtom(mob/living/user, obj/item/I, list/chosen_option)
+ to_chat(user, "You start working on [src]")
+ if(I.use_tool(src, user, chosen_option[TOOL_PROCESSING_TIME], volume=50))
+ var/atom/atom_to_create = chosen_option[TOOL_PROCESSING_RESULT]
+ for(var/i = 1 to chosen_option[TOOL_PROCESSING_AMOUNT])
+ new atom_to_create(loc)
+ to_chat(user, "You manage to create [chosen_option[TOOL_PROCESSING_AMOUNT]] [initial(atom_to_create.name)] from [src]")
+ qdel(src)
+ return
+
+/atom/proc/OnCreatedFromProcessing(mob/living/user, obj/item/I, list/chosen_option, atom/original_atom)
+ return
+
+//! Tool-specific behavior procs.
///
///Crowbar act
@@ -1322,6 +1308,10 @@
/atom/proc/analyzer_act(mob/living/user, obj/item/I)
return SEND_SIGNAL(src, COMSIG_ATOM_ANALYSER_ACT, user, I)
+///Deconstruct act
+/atom/proc/deconstruct_act(mob/living/user, obj/item/I)
+ return SEND_SIGNAL(src, COMSIG_ATOM_DECONSTRUCT_ACT, user, I)
+
///Generate a tag for this atom
/atom/proc/GenerateTag()
return
@@ -1330,9 +1320,6 @@
/atom/proc/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
return
-/atom/proc/disconnect_from_shuttle(obj/docking_port/mobile/port)
- return
-
/// Generic logging helper
/atom/proc/log_message(message, message_type, color=null, log_globally=TRUE)
if(!log_globally)
@@ -1587,6 +1574,15 @@
if(istype(ship))
var/obj/docking_port/mobile/shuttle = ship.mobile_port
if(shuttle)
+ if(istype(shuttle.docked, /obj/docking_port/stationary))
+ var/obj/docking_port/stationary/shipfinder = shuttle.docked
+ if(shipfinder.owner_ship)
+ for(var/datum/weakref/weakref as anything in shipfinder.owner_ship.gravgen_list)
+ var/obj/machinery/power/ship_gravity/SG = weakref.resolve()
+ if(!SG)
+ shipfinder.owner_ship.gravgen_list -= weakref
+ continue
+ max_grav = max(SG.active,max_grav)
for(var/datum/weakref/weakref as anything in shuttle.gravgen_list)
var/obj/machinery/power/ship_gravity/SG = weakref.resolve()
if(!SG)
@@ -1604,10 +1600,9 @@
* Produces a signal [COMSIG_PARENT_EXAMINE_MORE]
*/
/atom/proc/examine_more(mob/user)
+ SHOULD_CALL_PARENT(TRUE)
. = list()
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE_MORE, user, .)
- if(!LAZYLEN(.)) // lol ..length
- return list("You examine [src] closer, but find nothing of interest...")
///Passes Stat Browser Panel clicks to the game and calls client click on an atom
/atom/Topic(href, list/href_list)
@@ -1678,7 +1673,20 @@
/// Returns the atom name that should be used on screentip
/atom/proc/get_screentip_name(client/hovering_client)
- return name
+ if(ishuman(src))
+ var/mob/living/carbon/human/guy = src
+ var/mob/client_mob = hovering_client.mob
+ var/datum/guestbook/guestbook = client_mob.mind?.guestbook
+ if(guestbook)
+ var/known_name = guestbook.get_known_name(client_mob, guy)
+ if(known_name)
+ return known_name
+ else
+ return guy.get_visible_name()
+ else
+ return guy.real_name
+ else
+ return name
///Called whenever a player is spawned on the same turf as this atom.
/atom/proc/join_player_here(mob/M)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index beb7cef2718..73629ea1484 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -540,7 +540,7 @@
var/previous_virtual_z = OldLoc?.virtual_z() || 0
var/current_virtual_z = virtual_z()
- if(current_virtual_z && current_virtual_z != previous_virtual_z)
+ if(current_virtual_z != previous_virtual_z)
on_virtual_z_change(current_virtual_z, previous_virtual_z)
SEND_SIGNAL(src, COMSIG_MOVABLE_MOVED, OldLoc, Dir, Forced, old_locs)
@@ -772,6 +772,44 @@
. = movement_type
movement_type = newval
+/**
+ * Called when a movable changes z-levels.
+ *
+ * Arguments:
+ * * old_turf - The previous turf they were on before.
+ * * new_turf - The turf they have now entered.
+ * * same_z_layer - If their old and new z levels are on the same level of plane offsets or not
+ * * notify_contents - Whether or not to notify the movable's contents that their z-level has changed. NOTE, IF YOU SET THIS, YOU NEED TO MANUALLY SET PLANE OF THE CONTENTS LATER
+ */
+/atom/movable/proc/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents = TRUE)
+ SHOULD_CALL_PARENT(TRUE)
+ SEND_SIGNAL(src, COMSIG_MOVABLE_Z_CHANGED, old_turf, new_turf, same_z_layer)
+
+ // If our turfs are on different z "layers", recalc our planes
+ if(!same_z_layer && !QDELETED(src))
+ SET_PLANE(src, PLANE_TO_TRUE(src.plane), new_turf)
+ // a TON of overlays use planes, and thus require offsets
+ // so we do this. sucks to suck
+ update_appearance()
+
+ if(update_on_z)
+ // I so much wish this could be somewhere else. alas, no.
+ for(var/image/update in update_on_z)
+ SET_PLANE(update, PLANE_TO_TRUE(update.plane), new_turf)
+ if(update_overlays_on_z)
+ // This EVEN more so
+ cut_overlay(update_overlays_on_z)
+ // This even more so
+ for(var/mutable_appearance/update in update_overlays_on_z)
+ SET_PLANE(update, PLANE_TO_TRUE(update.plane), new_turf)
+ add_overlay(update_overlays_on_z)
+
+ if(!notify_contents)
+ return
+
+ for (var/atom/movable/content as anything in src) // Notify contents of Z-transition.
+ content.on_changed_z_level(old_turf, new_turf, same_z_layer)
+
/**
* Called whenever an object moves and by mobs when they attempt to move themselves through space
* And when an object or action applies a force on src, see [newtonian_move][/atom/movable/proc/newtonian_move]
@@ -784,6 +822,9 @@
* * movement_dir - 0 when stopping or any dir when trying to move
*/
/atom/movable/proc/Process_Spacemove(movement_dir = 0)
+ if(SEND_SIGNAL(src, COMSIG_MOVABLE_SPACEMOVE, movement_dir) & COMSIG_MOVABLE_STOP_SPACEMOVE)
+ return TRUE
+
if(has_gravity(src))
return 1
@@ -1180,7 +1221,7 @@
//Returns an atom's power cell, if it has one. Overload for individual items.
/atom/movable/proc/get_cell()
- return
+ return null
/atom/movable/proc/can_be_pulled(user, grab_state, force)
if(src == user || !isturf(loc))
diff --git a/code/game/communications.dm b/code/game/communications.dm
index 94afdbf364f..e3b1acc230d 100644
--- a/code/game/communications.dm
+++ b/code/game/communications.dm
@@ -92,36 +92,30 @@ GLOBAL_LIST_EMPTY(all_radios)
GLOBAL_LIST_INIT(radiochannels, list(
RADIO_CHANNEL_COMMON = FREQ_COMMON,
- RADIO_CHANNEL_COMMAND = FREQ_COMMAND,
+ RADIO_CHANNEL_EMERGENCY = FREQ_EMERGENCY,
RADIO_CHANNEL_CENTCOM = FREQ_CENTCOM,
- RADIO_CHANNEL_SOLGOV = FREQ_SOLGOV, //WS Edit - SolGov Rep
- RADIO_CHANNEL_WIDEBAND = FREQ_WIDEBAND, //WS Edit - Overmap
+ RADIO_CHANNEL_SOLGOV = FREQ_SOLGOV,
+ RADIO_CHANNEL_WIDEBAND = FREQ_WIDEBAND,
RADIO_CHANNEL_SYNDICATE = FREQ_SYNDICATE,
RADIO_CHANNEL_NANOTRASEN = FREQ_NANOTRASEN,
RADIO_CHANNEL_MINUTEMEN = FREQ_MINUTEMEN,
RADIO_CHANNEL_PGF = FREQ_PGF,
RADIO_CHANNEL_INTEQ = FREQ_INTEQ,
RADIO_CHANNEL_PIRATE = FREQ_PIRATE,
- RADIO_CHANNEL_AI_PRIVATE = FREQ_AI_PRIVATE,
- RADIO_CHANNEL_CTF_RED = FREQ_CTF_RED,
- RADIO_CHANNEL_CTF_BLUE = FREQ_CTF_BLUE
))
GLOBAL_LIST_INIT(reverseradiochannels, list(
"[FREQ_COMMON]" = RADIO_CHANNEL_COMMON,
- "[FREQ_COMMAND]" = RADIO_CHANNEL_COMMAND,
+ "[FREQ_EMERGENCY]" = RADIO_CHANNEL_EMERGENCY,
"[FREQ_CENTCOM]" = RADIO_CHANNEL_CENTCOM,
- "[FREQ_SOLGOV]" = RADIO_CHANNEL_SOLGOV, //WS Edit - SolGov Rep
- "[FREQ_WIDEBAND]" = RADIO_CHANNEL_WIDEBAND, //WS Edit - SolGov Rep
+ "[FREQ_SOLGOV]" = RADIO_CHANNEL_SOLGOV,
+ "[FREQ_WIDEBAND]" = RADIO_CHANNEL_WIDEBAND,
"[FREQ_SYNDICATE]" = RADIO_CHANNEL_SYNDICATE,
"[FREQ_NANOTRASEN]" = RADIO_CHANNEL_NANOTRASEN,
"[FREQ_MINUTEMEN]" = RADIO_CHANNEL_MINUTEMEN,
"[FREQ_PGF]" = RADIO_CHANNEL_PGF,
"[FREQ_INTEQ]" = RADIO_CHANNEL_INTEQ,
"[FREQ_PIRATE]" = RADIO_CHANNEL_PIRATE,
- "[FREQ_AI_PRIVATE]" = RADIO_CHANNEL_AI_PRIVATE,
- "[FREQ_CTF_RED]" = RADIO_CHANNEL_CTF_RED,
- "[FREQ_CTF_BLUE]" = RADIO_CHANNEL_CTF_BLUE
))
/datum/radio_frequency
diff --git a/code/game/gamemodes/clown_ops/bananium_bomb.dm b/code/game/gamemodes/clown_ops/bananium_bomb.dm
index 01c27089536..74178f24843 100644
--- a/code/game/gamemodes/clown_ops/bananium_bomb.dm
+++ b/code/game/gamemodes/clown_ops/bananium_bomb.dm
@@ -43,11 +43,6 @@
ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
H.equip_to_slot_or_del(C, ITEM_SLOT_ICLOTHING)
- if(!H.shoes || H.dropItemToGround(H.shoes))
- C = new /obj/item/clothing/shoes/clown_shoes(H)
- ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
- H.equip_to_slot_or_del(C, ITEM_SLOT_FEET)
-
if(!H.wear_mask || H.dropItemToGround(H.wear_mask))
C = new /obj/item/clothing/mask/gas/clown_hat(H)
ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
diff --git a/code/game/gamemodes/clown_ops/clown_ops.dm b/code/game/gamemodes/clown_ops/clown_ops.dm
index 74e391ef551..e3f7eea12c5 100644
--- a/code/game/gamemodes/clown_ops/clown_ops.dm
+++ b/code/game/gamemodes/clown_ops/clown_ops.dm
@@ -29,16 +29,14 @@
/datum/outfit/syndicate/clownop
name = "Clown Operative - Basic"
uniform = /obj/item/clothing/under/syndicate
- shoes = /obj/item/clothing/shoes/clown_shoes/combat
mask = /obj/item/clothing/mask/gas/clown_hat
gloves = /obj/item/clothing/gloves/combat
- back = /obj/item/storage/backpack/clown
ears = /obj/item/radio/headset/syndicate/alt
l_pocket = /obj/item/pinpointer/nuke/syndicate
r_pocket = /obj/item/bikehorn
id = /obj/item/card/id/syndicate
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
- /obj/item/kitchen/knife/combat/survival,
+ /obj/item/melee/knife/survival,
/obj/item/dnainjector/clumsymut, //in case you want to be clumsy for the memes
/obj/item/reagent_containers/spray/waterflower/lube)
implants = list(/obj/item/implant/sad_trombone)
diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm
index 3064a52a48a..1721c1242e5 100644
--- a/code/game/gamemodes/clown_ops/clown_weapons.dm
+++ b/code/game/gamemodes/clown_ops/clown_weapons.dm
@@ -10,104 +10,61 @@
volume = 30
list_reagents = list(/datum/reagent/lube = 30)
-//COMBAT CLOWN SHOES
-//Clown shoes with combat stats and noslip. Of course they still squeak.
-/obj/item/clothing/shoes/clown_shoes/combat
- name = "combat clown shoes"
- desc = "advanced clown shoes that protect the wearer and render them nearly immune to slipping on their own peels. They also squeak at 100% capacity."
- clothing_flags = NOSLIP
- slowdown = SHOES_SLOWDOWN
- armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50)
- strip_delay = 70
- resistance_flags = NONE
- permeability_coefficient = 0.05
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
-
-//The super annoying version
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat
- name = "mk-honk combat shoes"
- desc = "The culmination of years of clown combat research, these shoes leave a trail of chaos in their wake. They will slowly recharge themselves over time, or can be manually charged with bananium."
- slowdown = SHOES_SLOWDOWN
- armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50)
- strip_delay = 70
- resistance_flags = NONE
- permeability_coefficient = 0.05
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
- always_noslip = TRUE
- var/max_recharge = 3000 //30 peels worth
- var/recharge_rate = 34 //about 1/3 of a peel per tick
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/Initialize()
- . = ..()
- var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
- bananium.insert_amount_mat(max_recharge, /datum/material/hellstone)
- START_PROCESSING(SSobj, src)
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/process()
- var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
- var/bananium_amount = bananium.get_material_amount(/datum/material/hellstone)
- if(bananium_amount < max_recharge)
- bananium.insert_amount_mat(min(recharge_rate, max_recharge - bananium_amount), /datum/material/hellstone)
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/attack_self(mob/user)
- ui_action_click(user)
-
//BANANIUM SWORD
-/obj/item/melee/transforming/energy/sword/bananium
+/obj/item/melee/energy/sword/bananium
name = "bananium sword"
desc = "An elegant weapon, for a more civilized age."
force = 0
throwforce = 0
- force_on = 0
- throwforce_on = 0
+ active_force = 0
+ active_throwforce = 0
hitsound = null
attack_verb_on = list("slipped")
- clumsy_check = FALSE
sharpness = IS_BLUNT
sword_color = "yellow"
heat = 0
light_color = COLOR_YELLOW
var/next_trombone_allowed = 0
-/obj/item/melee/transforming/energy/sword/bananium/Initialize()
+/obj/item/melee/energy/sword/bananium/Initialize()
. = ..()
adjust_slipperiness()
/* Adds or removes a slippery component, depending on whether the sword
* is active or not.
*/
-/obj/item/melee/transforming/energy/sword/proc/adjust_slipperiness()
- if(active)
+/obj/item/melee/energy/sword/proc/adjust_slipperiness()
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
AddComponent(/datum/component/slippery, 60, GALOSHES_DONT_HELP)
else
qdel(GetComponent(/datum/component/slippery))
-/obj/item/melee/transforming/energy/sword/bananium/attack(mob/living/M, mob/living/user)
+/obj/item/melee/energy/sword/bananium/attack(mob/living/M, mob/living/user)
..()
- if(active)
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
slipper.Slip(src, M)
-/obj/item/melee/transforming/energy/sword/bananium/throw_impact(atom/hit_atom, throwingdatum)
+/obj/item/melee/energy/sword/bananium/throw_impact(atom/hit_atom, throwingdatum)
. = ..()
- if(active)
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
slipper.Slip(src, hit_atom)
-/obj/item/melee/transforming/energy/sword/bananium/attackby(obj/item/I, mob/living/user, params)
- if((world.time > next_trombone_allowed) && istype(I, /obj/item/melee/transforming/energy/sword/bananium))
+/obj/item/melee/energy/sword/bananium/attackby(obj/item/I, mob/living/user, params)
+ if((world.time > next_trombone_allowed) && istype(I, /obj/item/melee/energy/sword/bananium))
next_trombone_allowed = world.time + 50
to_chat(user, "You slap the two swords together. Sadly, they do not seem to fit!")
playsound(src, 'sound/misc/sadtrombone.ogg', 50)
return TRUE
return ..()
-/obj/item/melee/transforming/energy/sword/bananium/transform_weapon(mob/living/user, supress_message_text)
+/obj/item/melee/energy/sword/bananium/on_transform(obj/item/source, mob/user, active)
. = ..()
adjust_slipperiness()
-/obj/item/melee/transforming/energy/sword/bananium/ignition_effect(atom/A, mob/user)
+/obj/item/melee/energy/sword/bananium/ignition_effect(atom/A, mob/user)
return ""
//BANANIUM SHIELD
@@ -221,72 +178,3 @@
/obj/item/clothing/mask/fakemoustache/sticky/proc/unstick()
REMOVE_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT)
-
-//DARK H.O.N.K. AND CLOWN MECH WEAPONS
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana
- name = "bombanana mortar"
- desc = "Equipment for clown exosuits. Launches exploding banana peels."
- icon_state = "mecha_bananamrtr"
- projectile = /obj/item/grown/bananapeel/bombanana
- projectiles = 8
- projectile_energy_cost = 1000
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana/can_attach(obj/mecha/combat/honker/M)
- if(..())
- if(istype(M))
- return TRUE
- return FALSE
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache
- name = "\improper HONKeR-6 grenade launcher"
- desc = "A weapon for combat exosuits. Launches primed tear-stache grenades."
- icon_state = "mecha_grenadelnchr"
- projectile = /obj/item/grenade/chem_grenade/teargas/moustache
- fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg'
- projectiles = 6
- missile_speed = 1.5
- projectile_energy_cost = 800
- equip_cooldown = 60
- det_time = 20
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache/can_attach(obj/mecha/combat/honker/M)
- if(..())
- if(istype(M))
- return TRUE
- return FALSE
-
-/obj/mecha/combat/honker/dark
- desc = "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. This one has been painted black for maximum fun. HONK!"
- name = "\improper Dark H.O.N.K"
- icon_state = "darkhonker"
- max_integrity = 300
- deflect_chance = 15
- armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
- max_temperature = 35000
- operation_req_access = list(ACCESS_SYNDICATE)
- internals_req_access = list(ACCESS_SYNDICATE)
- wreckage = /obj/structure/mecha_wreckage/honker/dark
- max_equip = 4
-
-/obj/mecha/combat/honker/dark/add_cell(obj/item/stock_parts/cell/C)
- if(C)
- C.forceMove(src)
- cell = C
- return
- cell = new /obj/item/stock_parts/cell/hyper(src)
-
-/obj/mecha/combat/honker/dark/loaded/Initialize()
- . = ..()
- var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/thrusters/ion(src)
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker()
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana()//Needed more offensive weapons.
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache()//The mousetrap mortar was not up-to-snuff.
- ME.attach(src)
-
-/obj/structure/mecha_wreckage/honker/dark
- name = "\improper Dark H.O.N.K wreckage"
- icon_state = "darkhonker-broken"
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
deleted file mode 100644
index f7ce7b036eb..00000000000
--- a/code/game/gamemodes/cult/cult.dm
+++ /dev/null
@@ -1,182 +0,0 @@
-#define CULT_SCALING_COEFFICIENT 9.3 //Roughly one new cultist at roundstart per this many players
-
-/datum/game_mode
- var/list/datum/mind/cult = list()
-
-/proc/iscultist(mob/living/M)
- return M.mind?.has_antag_datum(/datum/antagonist/cult)
-
-/datum/team/cult/proc/is_sacrifice_target(datum/mind/mind)
- for(var/datum/objective/sacrifice/sac_objective in objectives)
- if(mind == sac_objective.target)
- return TRUE
- return FALSE
-
-/proc/is_convertable_to_cult(mob/living/M,datum/team/cult/specific_cult)
- if(!istype(M))
- return FALSE
- if(M.mind)
- if(specific_cult && specific_cult.is_sacrifice_target(M.mind))
- return FALSE
- if(M.mind.enslaved_to && !iscultist(M.mind.enslaved_to))
- return FALSE
- if(M.mind.unconvertable)
- return FALSE
- else
- return FALSE
- if(HAS_TRAIT(M, TRAIT_MINDSHIELD) || issilicon(M) || isbot(M) || isdrone(M) || !M.client)
- return FALSE //can't convert machines, shielded, or braindead
- return TRUE
-
-/datum/game_mode/cult
- name = "cult"
- config_tag = "cult"
- report_type = "cult"
- antag_flag = ROLE_CULTIST
- false_report_weight = 10
- restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician", "SolGov Representative", "Prisoner") //WS edit - Brig Physicians, SolGov Rep
- protected_jobs = list()
- required_players = 29
- required_enemies = 4
- recommended_enemies = 4
- enemy_minimum_age = 14
-
- announce_span = "cult"
- announce_text = "Some crew members are trying to start a cult to Nar'Sie!\n\
- Cultists: Carry out Nar'Sie's will.\n\
- Crew: Prevent the cult from expanding and drive it out."
-
- title_icon = "cult"
-
- var/finished = 0
-
- var/acolytes_needed = 10 //for the survive objective
- var/acolytes_survived = 0
-
- var/list/cultists_to_cult = list() //the cultists we'll convert
-
- var/datum/team/cult/main_cult
-
-
-/datum/game_mode/cult/pre_setup()
- if(CONFIG_GET(flag/protect_roles_from_antagonist))
- restricted_jobs += protected_jobs
-
- if(CONFIG_GET(flag/protect_assistant_from_antagonist))
- restricted_jobs += "Assistant"
-
- //cult scaling goes here
- recommended_enemies = 1 + round(num_players()/CULT_SCALING_COEFFICIENT)
- var/remaining = (num_players() % CULT_SCALING_COEFFICIENT) * 10 //Basically the % of how close the population is toward adding another cultis
- if(prob(remaining))
- recommended_enemies++
-
-
- for(var/cultists_number = 1 to recommended_enemies)
- if(!antag_candidates.len)
- break
- var/datum/mind/cultist = antag_pick(antag_candidates)
- antag_candidates -= cultist
- cultists_to_cult += cultist
- cultist.special_role = ROLE_CULTIST
- cultist.restricted_roles = restricted_jobs
- log_game("[key_name(cultist)] has been selected as a cultist")
-
- if(cultists_to_cult.len>=required_enemies)
- for(var/antag in cultists_to_cult)
- GLOB.pre_setup_antags += antag
- return TRUE
- else
- setup_error = "Not enough cultist candidates"
- return FALSE
-
-
-/datum/game_mode/cult/post_setup()
- main_cult = new
-
- for(var/datum/mind/cult_mind in cultists_to_cult)
- add_cultist(cult_mind, 0, equip=TRUE, cult_team = main_cult)
- GLOB.pre_setup_antags -= cult_mind
-
- main_cult.setup_objectives() //Wait until all cultists are assigned to make sure none will be chosen as sacrifice.
-
- . = ..()
-
-/datum/game_mode/proc/add_cultist(datum/mind/cult_mind, stun , equip = FALSE, datum/team/cult/cult_team = null)
- if (!istype(cult_mind))
- return FALSE
-
- var/datum/antagonist/cult/new_cultist = new()
- new_cultist.give_equipment = equip
-
- if(cult_mind.add_antag_datum(new_cultist,cult_team))
- if(stun)
- cult_mind.current.Unconscious(100)
- return TRUE
-
-/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, silent, stun)
- if(cult_mind.current)
- var/datum/antagonist/cult/cult_datum = cult_mind.has_antag_datum(/datum/antagonist/cult)
- if(!cult_datum)
- return FALSE
- cult_datum.silent = silent
- cult_mind.remove_antag_datum(cult_datum)
- if(stun)
- cult_mind.current.Unconscious(100)
- return TRUE
-
-/datum/game_mode/cult/proc/check_cult_victory()
- return main_cult.check_cult_victory()
-
-
-/datum/game_mode/cult/set_round_result()
- ..()
- if(check_cult_victory())
- SSticker.mode_result = "win - cult win"
- SSticker.news_report = CULT_SUMMON
- else
- SSticker.mode_result = "loss - staff stopped the cult"
- SSticker.news_report = CULT_FAILURE
-
-/datum/game_mode/cult/proc/check_survive()
- var/acolytes_survived = 0
- for(var/datum/mind/cult_mind in cult)
- if (cult_mind.current && cult_mind.current.stat != DEAD)
- if(cult_mind.current.onCentCom() || cult_mind.current.onSyndieBase())
- acolytes_survived++
- if(acolytes_survived>=acolytes_needed)
- return 0
- else
- return 1
-
-
-/datum/game_mode/cult/generate_report()
- return "Some stations in your sector have reported evidence of blood sacrifice and strange magic. Ties to the Wizards' Federation have been proven not to exist, and many employees \
- have disappeared; even Central Command employees light-years away have felt strange presences and at times hysterical compulsions. Interrogations point towards this being the work of \
- the cult of Nar'Sie. If evidence of this cult is discovered aboard your station, extreme caution and extreme vigilance must be taken going forward, and all resources should be \
- devoted to stopping this cult. Note that holy water seems to weaken and eventually return the minds of cultists that ingest it, and mindshield implants will prevent conversion \
- altogether."
-
-
-
-/datum/game_mode/cult/generate_credit_text()
- var/list/round_credits = list()
- var/len_before_addition
-
- round_credits += "
The cultists have learned the danger of eldritch magic!
", "
They all disappeared!
")
- round_credits += " "
-
- round_credits += ..()
- return round_credits
-
-#undef CULT_SCALING_COEFFICIENT
diff --git a/code/game/gamemodes/devil/devil_agent/devil_agent.dm b/code/game/gamemodes/devil/devil_agent/devil_agent.dm
deleted file mode 100644
index c8fb62faba0..00000000000
--- a/code/game/gamemodes/devil/devil_agent/devil_agent.dm
+++ /dev/null
@@ -1,44 +0,0 @@
-/datum/game_mode/devil/devil_agents
- name = "Devil Agents"
- config_tag = "devil_agents"
- required_players = 25
- required_enemies = 3
- recommended_enemies = 8
- reroll_friendly = 0
-
- traitors_possible = 10 //hard limit on traitors if scaling is turned off
- num_modifier = 4
- objective_count = 2
-
- var/list/devil_target_list = list() //will update to be a child of internal affairs when bothered
- var/list/devil_late_joining_list = list()
- minimum_devils = 3
-
- announce_text = "There are devil agents onboard the station, trying to outbid each other!\n\
- + Devils: Purchase souls and interfere with your rivals!\n\
- + Crew: Resist the lure of sin and remain pure!"
-
-/datum/game_mode/devil/devil_agents/post_setup()
- var/i = 0
- for(var/datum/mind/devil in devils)
- i++
- if(i + 1 > devils.len)
- i = 0
- devil_target_list[devil] = devils[i + 1]
- ..()
-
-/datum/game_mode/devil/devil_agents/add_devil_objectives(datum/mind/devil_mind, quantity)
- ..(devil_mind, quantity - give_outsell_objective(devil_mind))
-
-/datum/game_mode/devil/devil_agents/proc/give_outsell_objective(datum/mind/devil)
- //If you override this method, have it return the number of objectives added.
- if(devil_target_list.len && devil_target_list[devil]) // Is a double agent
- var/datum/mind/target_mind = devil_target_list[devil]
- var/datum/antagonist/devil/D = target_mind.has_antag_datum(/datum/antagonist/devil)
- var/datum/objective/devil/outsell/outsellobjective = new
- outsellobjective.owner = devil
- outsellobjective.target = target_mind
- outsellobjective.update_explanation_text()
- D.objectives += outsellobjective
- return 1
- return 0
diff --git a/code/game/gamemodes/devil/devil_game_mode.dm b/code/game/gamemodes/devil/devil_game_mode.dm
deleted file mode 100644
index 9d002f4a029..00000000000
--- a/code/game/gamemodes/devil/devil_game_mode.dm
+++ /dev/null
@@ -1,106 +0,0 @@
-/datum/game_mode/devil
- name = "devil"
- config_tag = "devil"
- report_type = "devil"
- antag_flag = ROLE_DEVIL
- false_report_weight = 1
- protected_jobs = list("Prisoner", "Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI")
- required_players = 0
- required_enemies = 1
- recommended_enemies = 4
- reroll_friendly = 1
- enemy_minimum_age = 0
- title_icon = "devil"
-
- var/traitors_possible = 4 //hard limit on devils if scaling is turned off
- var/num_modifier = 0 // Used for gamemodes, that are a child of traitor, that need more than the usual.
- var/objective_count = 2
- var/minimum_devils = 1
-
- announce_text = "There are devils onboard the station!\n\
- + Devils: Purchase souls and tempt the crew to sin!\n\
- + Crew: Resist the lure of sin and remain pure!"
-
-/datum/game_mode/devil/pre_setup()
- if(CONFIG_GET(flag/protect_roles_from_antagonist))
- restricted_jobs += protected_jobs
- if(CONFIG_GET(flag/protect_assistant_from_antagonist))
- restricted_jobs += "Assistant"
-
- var/num_devils = 1
-
- var/tsc = CONFIG_GET(number/traitor_scaling_coeff)
- if(tsc)
- num_devils = max(minimum_devils, min(round(num_players() / (tsc * 3))+ 2 + num_modifier, round(num_players() / (tsc * 1.5)) + num_modifier))
- else
- num_devils = max(minimum_devils, min(num_players(), traitors_possible))
-
- for(var/j = 0, j < num_devils, j++)
- if (!antag_candidates.len)
- break
- var/datum/mind/devil = antag_pick(antag_candidates)
- devils += devil
- devil.special_role = traitor_name
- devil.restricted_roles = restricted_jobs
-
- log_game("[key_name(devil)] has been selected as a [traitor_name]")
- antag_candidates.Remove(devil)
-
- if(devils.len < required_enemies)
- setup_error = "Not enough devil candidates"
- return FALSE
- for(var/antag in devils)
- GLOB.pre_setup_antags += antag
- return TRUE
-
-
-/datum/game_mode/devil/post_setup()
- for(var/datum/mind/devil in devils)
- post_setup_finalize(devil)
- ..()
- return TRUE
-
-/datum/game_mode/devil/generate_report()
- return "Infernal creatures have been seen nearby offering great boons in exchange for souls. This is considered theft against Nanotrasen, as all employment contracts contain a lien on the \
- employee's soul. If anyone sells their soul in error, contact an attorney to overrule the sale. Be warned that if the devil purchases enough souls, a gateway to hell may open."
-
-/datum/game_mode/devil/proc/post_setup_finalize(datum/mind/devil)
- add_devil(devil.current, ascendable = TRUE) //Devil gamemode devils are ascendable.
- GLOB.pre_setup_antags -= devil
- add_devil_objectives(devil,2)
-
-/proc/is_devil(mob/living/M)
- return M.mind?.has_antag_datum(/datum/antagonist/devil)
-
-/proc/add_devil(mob/living/L, ascendable = FALSE)
- if(!L || !L.mind)
- return FALSE
- var/datum/antagonist/devil/devil_datum = L.mind.add_antag_datum(/datum/antagonist/devil)
- devil_datum.ascendable = ascendable
- return devil_datum
-
-/proc/remove_devil(mob/living/L)
- if(!L || !L.mind)
- return FALSE
- var/datum/antagonist/devil_datum = L.mind.has_antag_datum(/datum/antagonist/devil)
- devil_datum.on_removal()
- return TRUE
-
-/datum/game_mode/devil/generate_credit_text()
- var/list/round_credits = list()
- var/len_before_addition
-
- round_credits += "
The Tempting Devils:
"
- len_before_addition = round_credits.len
- var/datum/antagonist/devil/devil_info
- for(var/datum/mind/devil in devils)
- devil_info = devil.has_antag_datum(/datum/antagonist/devil)
- if(devil_info) // This should never fail, but better to be sure
- round_credits += "
"
for(var/i = 1, mytape.storedinfo.len >= i, i++)
t1 += "[mytape.storedinfo[i]] "
transcript_paper.add_raw_text(t1)
@@ -231,6 +278,32 @@
canprint = FALSE
addtimer(VARSET_CALLBACK(src, canprint, TRUE), 30 SECONDS)
+/obj/item/taperecorder/AltClick(mob/user)
+ . = ..()
+ if (recording)
+ stop()
+ else
+ record()
+
+/obj/item/taperecorder/proc/update_available_icons()
+ icons_available = list()
+
+ if(recording)
+ icons_available += list("Stop Recording" = image(icon = icon_directory, icon_state = "record_stop"))
+ else
+ if(!playing)
+ icons_available += list("Record" = image(icon = icon_directory, icon_state = "record"))
+
+ if(playing)
+ icons_available += list("Pause" = image(icon = icon_directory, icon_state = "pause"))
+ else
+ if(!recording)
+ icons_available += list("Play" = image(icon = icon_directory, icon_state = "play"))
+
+ if(canprint && !recording && !playing)
+ icons_available += list("Print Transcript" = image(icon = icon_directory, icon_state = "print"))
+ if(mytape)
+ icons_available += list("Eject" = image(icon = icon_directory, icon_state = "eject"))
//empty tape recorders
/obj/item/taperecorder/empty
@@ -245,7 +318,7 @@
item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=20, /datum/material/glass=5)
force = 1
throwforce = 0
@@ -255,34 +328,36 @@
var/list/timestamp = list()
var/ruined = 0
+/obj/item/tape/Initialize()
+ . = ..()
+ if(ruined)
+ add_overlay("ribbonoverlay")
+
/obj/item/tape/fire_act(exposed_temperature, exposed_volume)
- ruin()
+ if(!ruined)
+ ruin()
..()
/obj/item/tape/attack_self(mob/user)
if(!ruined)
- to_chat(user, "You pull out all the tape!")
- ruin()
-
+ if(do_after(user, 30, src))
+ to_chat(user, span_notice("You pull out all the tape!"))
+ ruin()
/obj/item/tape/proc/ruin()
- //Lets not add infinite amounts of overlays when our fireact is called
- //repeatedly
- if(!ruined)
- add_overlay("ribbonoverlay")
+ add_overlay("ribbonoverlay")
ruined = 1
-
/obj/item/tape/proc/fix()
cut_overlay("ribbonoverlay")
ruined = 0
/obj/item/tape/attackby(obj/item/I, mob/user, params)
- if(ruined && I.tool_behaviour == TOOL_SCREWDRIVER || istype(I, /obj/item/pen))
- to_chat(user, "You start winding the tape back in...")
+ if(ruined && (I.tool_behaviour == TOOL_SCREWDRIVER || istype(I, /obj/item/pen)))
+ to_chat(user, span_notice("You start winding the tape back in..."))
if(I.use_tool(src, user, 120))
- to_chat(user, "You wound the tape back in.")
+ to_chat(user, span_notice("You wound the tape back in."))
fix()
//Random colour tapes
@@ -292,3 +367,12 @@
/obj/item/tape/random/Initialize()
. = ..()
icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
+
+//How 2 set custom recorded tapes:
+//create a list of lines to populate stored_info. Each line should follow a format like "[timestamp] [speaker] [speaking verb] ["what they're saying"]"
+//create a list of timestamps. Each one should correspond to how long the recorder should wait before saying the line associated with the timestamp.
+//e.g. "[00:00] Recording started." timestamp = 0
+//"[00:15] [span_name("berry fox")] says "wow. I love eating berries so much"" timestamp = 15
+//set used capacity to how many 'seconds' used by the prerecorded message
+//optional: set max capacity to used capacity
+//optional: set ruined var (you can fix this with a pen)
diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index a1153959580..3e082376152 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -1,7 +1,7 @@
/obj/item/dnainjector
name = "\improper DNA injector"
desc = "This injects the person with DNA."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "dnainjector"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
@@ -247,30 +247,6 @@
name = "\improper DNA injector (Anti-Unintelligible)"
remove_mutations = list(UNINTELLIGIBLE)
-/obj/item/dnainjector/swedishmut
- name = "\improper DNA injector (Swedish)"
- add_mutations = list(SWEDISH)
-
-/obj/item/dnainjector/antiswedish
- name = "\improper DNA injector (Anti-Swedish)"
- remove_mutations = list(SWEDISH)
-
-/obj/item/dnainjector/chavmut
- name = "\improper DNA injector (Chav)"
- add_mutations = list(CHAV)
-
-/obj/item/dnainjector/antichav
- name = "\improper DNA injector (Anti-Chav)"
- remove_mutations = list(CHAV)
-
-/obj/item/dnainjector/elvismut
- name = "\improper DNA injector (Elvis)"
- add_mutations = list(ELVIS)
-
-/obj/item/dnainjector/antielvis
- name = "\improper DNA injector (Anti-Elvis)"
- remove_mutations = list(ELVIS)
-
/obj/item/dnainjector/lasereyesmut
name = "\improper DNA injector (Laser Eyes)"
add_mutations = list(LASEREYES)
diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm
index 51c17ff4290..a0bd4614835 100644
--- a/code/game/objects/items/documents.dm
+++ b/code/game/objects/items/documents.dm
@@ -5,7 +5,7 @@
icon_state = "docs_generic"
item_state = "paper"
throwforce = 0
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_NORMAL
throw_range = 1
throw_speed = 1
layer = MOB_LAYER
@@ -27,6 +27,15 @@
/obj/item/documents/syndicate
desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence."
+/obj/item/documents/syndicate/cybersun
+ name = "classified Cybersun documents"
+ desc = "\"Top Secret\" documents detailing sensitive Cybersun Virtual Solutions operational intelligence. These documents are verified with a red wax seal."
+ icon_state = "docs_red"
+
+/obj/item/documents/syndicate/cybersun/biodynamics
+ desc = "\"Top Secret\" Cybersun Biodynamics documents, filled with patient lists and unfinished designs. These documents are verified with a teal wax seal."
+ icon_state = "docs_teal"
+
/obj/item/documents/syndicate/red
name = "red secret documents"
desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence. These documents are verified with a red wax seal."
@@ -40,6 +49,15 @@
/obj/item/documents/syndicate/mining
desc = "\"Top Secret\" documents detailing Syndicate plasma mining operations."
+/obj/item/documents/syndicate/ngr
+ name = "Second Battlegroup secret documents"
+ desc = "\"Top Secret\" documents belonging to the Second Battlegroup of New Gorlex Republic. They are filled with sensitive operational intelligence. These documents are verified with a red wax seal."
+ icon_state = "docs_red"
+
+/obj/item/documents/eoehoma // For use in Eoehoma-related ruins.
+ desc = "\"Top Secret\" Eoehoma Firearms documents. Filled with weapon blueprints and eviction notices."
+ icon_state = "docs_blue"
+
/obj/item/documents/photocopy
desc = "A copy of some top-secret documents. Nobody will notice they aren't the originals... right?"
var/forgedseal = 0
diff --git a/code/game/objects/items/door_seal.dm b/code/game/objects/items/door_seal.dm
index 64f7ca4fd92..76b406f3c9a 100644
--- a/code/game/objects/items/door_seal.dm
+++ b/code/game/objects/items/door_seal.dm
@@ -1,7 +1,7 @@
/obj/item/door_seal
name = "pneumatic seal"
desc = "A brace used to seal and reinforce an airlock. Useful for making areas inaccessible to those without opposable thumbs."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "pneumatic_seal"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm
index 1396521aaf9..b721393e85e 100644
--- a/code/game/objects/items/eightball.dm
+++ b/code/game/objects/items/eightball.dm
@@ -136,10 +136,10 @@
become_hearing_sensitive(ROUNDSTART_TRAIT)
for (var/answer in haunted_answers)
votes[answer] = 0
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
/obj/item/toy/eightball/haunted/Destroy()
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
. = ..()
/obj/item/toy/eightball/haunted/MakeHaunted()
diff --git a/code/game/objects/items/etherealdiscoball.dm b/code/game/objects/items/etherealdiscoball.dm
index 94f1ae2a606..75084c239e5 100644
--- a/code/game/objects/items/etherealdiscoball.dm
+++ b/code/game/objects/items/etherealdiscoball.dm
@@ -1,18 +1,18 @@
/obj/item/etherealballdeployer
- name = "Portable Ethereal Disco Ball"
- desc = "Press the button for a deployment of slightly-unethical PARTY!"
+ name = "Portable Animatronic Disco Ball"
+ desc = "Press the button for a deployment of a copyright free PARTY!"
icon = 'icons/obj/device.dmi'
icon_state = "ethdisco"
/obj/item/etherealballdeployer/attack_self(mob/living/carbon/user)
.=..()
- to_chat(user, "You deploy the Ethereal Disco Ball.")
+ to_chat(user, span_notice("You deploy the Ethereal Disco Ball."))
new /obj/structure/etherealball(user.loc)
qdel(src)
/obj/structure/etherealball
- name = "Ethereal Disco Ball"
- desc = "The ethics of this discoball are questionable."
+ name = "Animatronic Disco Ball"
+ desc = "A discoball with an animatronic head inside, seemingly in the likeness of a famous elzousza muscisian. A disclaimer on the side says any resemblence to living persons is entirely coincidental."
icon = 'icons/obj/device.dmi'
icon_state = "ethdisco_head_0"
anchored = TRUE
@@ -31,15 +31,15 @@
. = ..()
if(TurnedOn)
TurnOff()
- to_chat(user, "You turn the disco ball off!")
+ to_chat(user, span_notice("You turn the disco ball off!"))
else
TurnOn()
- to_chat(user, "You turn the disco ball on!")
+ to_chat(user, span_notice("You turn the disco ball on!"))
/obj/structure/etherealball/AltClick(mob/living/carbon/human/user)
. = ..()
set_anchored(!anchored)
- to_chat(user, "You [anchored ? null : "un"]lock the disco ball.")
+ to_chat(user, span_notice("You [anchored ? null : "un"]lock the disco ball."))
/obj/structure/etherealball/proc/TurnOn()
TurnedOn = TRUE //Same
diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm
deleted file mode 100644
index b2e5534a92b..00000000000
--- a/code/game/objects/items/fireaxe.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Fireaxe
- */
-/obj/item/fireaxe // DEM AXES MAN, marker -Agouri
- icon_state = "fireaxe0"
- base_icon_state = "fireaxe"
- lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/axes_righthand.dmi'
- name = "fire axe"
- desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
- force = 5
- throwforce = 15
- w_class = WEIGHT_CLASS_BULKY
- slot_flags = ITEM_SLOT_BACK
- attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
- resistance_flags = FIRE_PROOF
- species_exception = list(/datum/species/kepori)
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/fireaxe/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
-
-/obj/item/fireaxe/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/butchering, 100, 80, 0 , hitsound) //axes are not known for being precision butchering tools
- AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=24, icon_wielded="[base_icon_state]1")
-
-/// triggered on wield of two handed item
-/obj/item/fireaxe/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/fireaxe/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
-/obj/item/fireaxe/update_icon_state()
- icon_state = "[base_icon_state]0"
- return ..()
-
-/obj/item/fireaxe/afterattack(atom/A, mob/user, proximity)
- . = ..()
- if(!proximity)
- return
- if(wielded) //destroys windows and grilles in one hit
- if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille))
- var/obj/structure/W = A
- W.obj_destruction("fireaxe")
-
-/*
- * Bone Axe
- */
-/obj/item/fireaxe/boneaxe // Blatant imitation of the fireaxe, but made out of bone.
- icon_state = "bone_axe0"
- base_icon_state = "bone_axe"
- name = "bone axe"
- desc = "A large, vicious axe crafted out of several sharpened bone plates and crudely tied together. Made of monsters, by killing monsters, for killing monsters."
- icon = 'icons/obj/items_and_weapons.dmi'
-
-/obj/item/fireaxe/boneaxe/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=23, icon_wielded="[base_icon_state]1")
-
diff --git a/code/game/objects/items/food/_food.dm b/code/game/objects/items/food/_food.dm
new file mode 100644
index 00000000000..b8233e0ecc7
--- /dev/null
+++ b/code/game/objects/items/food/_food.dm
@@ -0,0 +1,67 @@
+///Abstract class to allow us to easily create all the generic "normal" food without too much copy pasta of adding more components
+/obj/item/food
+ name = "food"
+ desc = "you eat this"
+ resistance_flags = FLAMMABLE
+ w_class = WEIGHT_CLASS_SMALL
+ icon = 'icons/obj/food/food.dmi'
+ icon_state = null
+ lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
+ ///List of reagents this food gets on creation
+ var/list/food_reagents
+ ///Extra flags for things such as if the food is in a container or not
+ var/food_flags
+ ///Bitflag of the types of food this food is
+ var/foodtypes
+ ///Amount of volume the food can contain
+ var/max_volume
+ ///How long it will take to eat this food without any other modifiers
+ var/eat_time
+ ///Tastes to describe this food
+ var/list/tastes
+ ///Verbs used when eating this food in the to_chat messages
+ var/list/eatverbs
+ ///How much reagents per bite
+ var/bite_consumption
+ ///What you get if you microwave the food, this should be replaced once I fully re-work cooking.
+ var/microwaved_type
+ ///Type of atom thats spawned after eating this item
+ var/trash_type
+
+/obj/item/food/Initialize()
+ . = ..()
+ if(food_reagents)
+ food_reagents = string_assoc_list(food_reagents)
+ if(tastes)
+ tastes = string_assoc_list(tastes)
+ if(eatverbs)
+ eatverbs = string_list(eatverbs)
+ make_edible()
+ make_processable()
+ make_leave_trash()
+
+///This proc adds the edible component, overwrite this if you for some reason want to change some specific args like callbacks.
+/obj/item/food/proc/make_edible()
+ AddComponent(/datum/component/edible,\
+ initial_reagents = food_reagents,\
+ food_flags = food_flags,\
+ foodtypes = foodtypes,\
+ volume = max_volume,\
+ eat_time = eat_time,\
+ tastes = tastes,\
+ eatverbs = eatverbs,\
+ bite_consumption = bite_consumption,\
+ microwaved_type = microwaved_type,\
+ )
+
+
+///This proc handles processable elements, overwrite this if you want to add behavior such as slicing, forking, spooning, whatever, to turn the item into something else
+/obj/item/food/proc/make_processable()
+ return
+
+///This proc handles trash components, overwrite this if you want the object to spawn trash
+/obj/item/food/proc/make_leave_trash()
+ if(trash_type)
+ AddElement(/datum/element/food_trash, trash_type)
+ return
diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm
new file mode 100644
index 00000000000..609315a9ea1
--- /dev/null
+++ b/code/game/objects/items/food/bread.dm
@@ -0,0 +1,378 @@
+
+/obj/item/food/bread
+ name = "bread?"
+ desc = "This shouldn't exist, report to codermonkeys"
+ icon = 'icons/obj/food/burgerbread.dmi'
+ max_volume = 80
+ tastes = list("bread" = 10)
+ foodtypes = GRAIN
+ eat_time = 3 SECONDS
+ /// type is spawned 5 at a time and replaces this bread loaf when processed by cutting tool
+ var/obj/item/food/breadslice/slice_type
+ /// so that the yield can change if it isnt 5
+ var/yield = 5
+
+/obj/item/food/bread/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/dunkable, 10)
+ AddComponent(/datum/component/food_storage)
+
+/obj/item/food/bread/make_processable()
+ if (slice_type)
+ AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, yield, 3 SECONDS, table_required = TRUE)
+ AddElement(/datum/element/processable, TOOL_SAW, slice_type, yield, 4 SECONDS, table_required = TRUE)
+
+/obj/item/food/breadslice
+ name = "breadslice?"
+ desc = "This shouldn't exist, report to codermonkeys"
+ icon = 'icons/obj/food/burgerbread.dmi'
+ foodtypes = GRAIN
+ food_flags = FOOD_FINGER_FOOD
+ eat_time = 0.5 SECONDS
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/breadslice/Initialize()
+ . = ..()
+ AddElement(/datum/element/dunkable, 10)
+
+/obj/item/food/bread/plain
+ name = "bread"
+ desc = "Some plain old earthen bread."
+ icon_state = "bread"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 10
+ )
+ tastes = list("bread" = 10)
+ foodtypes = GRAIN
+ w_class = WEIGHT_CLASS_SMALL
+ slice_type = /obj/item/food/breadslice/plain
+
+/obj/item/food/breadslice/plain
+ name = "bread slice"
+ desc = "A slice of home."
+ icon_state = "breadslice"
+ foodtypes = GRAIN
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 2
+ )
+
+/obj/item/food/breadslice/moldy
+ name = "moldy bread slice"
+ desc = "Entire stations have been ripped apart over arguing whether this is still good to eat."
+ icon_state = "moldybreadslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 2,
+ /datum/reagent/consumable/mold = 10,
+ )
+ tastes = list("decaying fungus" = 1)
+ foodtypes = GROSS
+
+/obj/item/food/bread/meat
+ name = "meatbread loaf"
+ desc = "The culinary base of every self-respecting eloquen/tg/entleman."
+ icon_state = "meatbread"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("bread" = 10, "meat" = 10)
+ foodtypes = GRAIN | MEAT
+ slice_type = /obj/item/food/breadslice/meat
+
+/obj/item/food/breadslice/meat
+ name = "meatbread slice"
+ desc = "A slice of delicious meatbread."
+ icon_state = "meatbreadslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("bread" = 1, "meat" = 1)
+ foodtypes = GRAIN | MEAT
+
+/obj/item/food/bread/xenomeat
+ name = "xenomeatbread loaf"
+ desc = "Extra Heretical."
+ icon_state = "xenomeatbread"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("bread" = 10, "acid" = 10)
+ foodtypes = GRAIN | MEAT
+ slice_type = /obj/item/food/breadslice/xenomeat
+
+/obj/item/food/breadslice/xenomeat
+ name = "xenomeatbread slice"
+ desc = "A slice of delicious meatbread. Extra Heretical."
+ icon_state = "xenobreadslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("bread" = 10, "acid" = 10)
+ foodtypes = GRAIN | MEAT
+
+/obj/item/food/bread/spidermeat
+ name = "spider meat loaf"
+ desc = "Reassuringly green meatloaf made from spider meat."
+ icon_state = "spidermeatbread"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/toxin = 15,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("bread" = 10, "cobwebs" = 5)
+ foodtypes = GRAIN | MEAT | TOXIC
+ slice_type = /obj/item/food/breadslice/spidermeat
+
+/obj/item/food/breadslice/spidermeat
+ name = "spider meat bread slice"
+ desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
+ icon_state = "xenobreadslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 3,
+ /datum/reagent/toxin = 3,
+ /datum/reagent/consumable/nutriment/vitamin = 1
+ )
+ tastes = list("bread" = 10, "cobwebs" = 5)
+ foodtypes = GRAIN | MEAT | TOXIC
+
+/obj/item/food/bread/banana
+ name = "banana-nut bread"
+ desc = "A heavenly and filling treat."
+ icon_state = "bananabread"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/banana = 20
+ )
+ tastes = list("bread" = 10) // bananjuice will also flavour
+ foodtypes = GRAIN | FRUIT
+ slice_type = /obj/item/food/breadslice/banana
+
+/obj/item/food/breadslice/banana
+ name = "banana-nut bread slice"
+ desc = "A slice of delicious banana bread."
+ icon_state = "bananabreadslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/banana = 4
+ )
+ tastes = list("bread" = 10)
+ foodtypes = GRAIN | FRUIT
+
+/obj/item/food/bread/tofu
+ name = "Tofubread"
+ desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
+ icon_state = "tofubread"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("bread" = 10, "tofu" = 10)
+ foodtypes = GRAIN | VEGETABLES
+ slice_type = /obj/item/food/breadslice/tofu
+
+/obj/item/food/breadslice/tofu
+ name = "tofubread slice"
+ desc = "A slice of delicious tofubread."
+ icon_state = "tofubreadslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("bread" = 10, "tofu" = 10)
+ foodtypes = GRAIN | VEGETABLES
+
+/obj/item/food/bread/creamcheese
+ name = "cream cheese bread"
+ desc = "Just a schmear."
+ icon_state = "creamcheesebread"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("bread" = 10, "cheese" = 10)
+ foodtypes = GRAIN | DAIRY
+ slice_type = /obj/item/food/breadslice/creamcheese
+
+/obj/item/food/breadslice/creamcheese
+ name = "cream cheese bread slice"
+ desc = "A slice of Brotherly love!"
+ icon_state = "creamcheesebreadslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 3,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ tastes = list("bread" = 10, "cheese" = 10)
+ foodtypes = GRAIN | DAIRY
+
+/obj/item/food/bread/mimana
+ name = "mimana bread"
+ desc = "Best eaten in silence."
+ icon_state = "mimanabread"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/toxin/mutetoxin = 10,
+ /datum/reagent/consumable/nothing = 10,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("bread" = 10, "silence" = 10)
+ foodtypes = GRAIN | FRUIT
+ slice_type = /obj/item/food/breadslice/mimana
+
+/obj/item/food/breadslice/mimana
+ name = "mimana bread slice"
+ desc = "A slice of silence!"
+ icon_state = "mimanabreadslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/toxin/mutetoxin = 2,
+ /datum/reagent/consumable/nothing = 2,
+ /datum/reagent/consumable/nutriment/vitamin = 2
+ )
+ foodtypes = GRAIN | FRUIT
+
+/obj/item/food/breadslice/custom
+ name = "bread slice"
+ icon_state = "tofubreadslice"
+ foodtypes = GRAIN
+
+/obj/item/food/baguette
+ name = "baguette"
+ desc = "Bon appetit!"
+ icon = 'icons/obj/food/burgerbread.dmi'
+ icon_state = "baguette"
+ item_state = null
+ mob_overlay_state = "baguette"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 8,
+ /datum/reagent/consumable/nutriment/vitamin = 3
+ )
+ bite_consumption = 3
+ w_class = WEIGHT_CLASS_NORMAL
+ slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
+ attack_verb = list("touche")
+ tastes = list("bread" = 1)
+ foodtypes = GRAIN
+
+/obj/item/food/garlicbread
+ name = "garlic bread"
+ desc = "Alas, it is limited."
+ icon = 'icons/obj/food/burgerbread.dmi'
+ icon_state = "garlicbread"
+ item_state = null
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 10,
+ /datum/reagent/consumable/nutriment/vitamin = 6,
+ /datum/reagent/consumable/garlic = 2
+ )
+ bite_consumption = 3
+ tastes = list("bread" = 1, "garlic" = 1, "butter" = 1)
+ foodtypes = GRAIN
+
+/obj/item/food/deepfryholder
+ name = "Deep Fried Foods Holder Obj"
+ desc = "If you can see this description the code for the deep fryer fucked up."
+ icon = 'icons/obj/food/food.dmi'
+ icon_state = ""
+ bite_consumption = 2
+
+/obj/item/food/deepfryholder/make_edible()
+ AddComponent(/datum/component/edible,\
+ initial_reagents = food_reagents,\
+ food_flags = food_flags,\
+ foodtypes = foodtypes,\
+ volume = max_volume,\
+ eat_time = eat_time,\
+ tastes = tastes,\
+ eatverbs = eatverbs,\
+ bite_consumption = bite_consumption,\
+ on_consume = CALLBACK(src, PROC_REF(On_Consume)))
+
+
+/obj/item/food/deepfryholder/Initialize(mapload, obj/item/fried)
+ . = ..()
+ name = fried.name //We'll determine the other stuff when it's actually removed
+ appearance = fried.appearance
+ layer = initial(layer)
+ plane = initial(plane)
+ lefthand_file = fried.lefthand_file
+ righthand_file = fried.righthand_file
+ mob_overlay_state = fried.mob_overlay_state
+ desc = fried.desc
+ w_class = fried.w_class
+ slowdown = fried.slowdown
+ equip_delay_self = fried.equip_delay_self
+ equip_delay_other = fried.equip_delay_other
+ strip_delay = fried.strip_delay
+ species_exception = fried.species_exception
+ item_flags = fried.item_flags
+ obj_flags = fried.obj_flags
+ inhand_x_dimension = fried.inhand_x_dimension
+ inhand_y_dimension = fried.inhand_y_dimension
+
+ if(!(SEND_SIGNAL(fried, COMSIG_ITEM_FRIED, src) & COMSIG_FRYING_HANDLED)) //If frying is handled by signal don't do the defaault behavior.
+ fried.forceMove(src)
+
+
+/obj/item/food/deepfryholder/Destroy()
+ if(contents)
+ QDEL_LIST(contents)
+ return ..()
+
+/obj/item/food/deepfryholder/proc/On_Consume(eater, feeder)
+ if(contents)
+ QDEL_LIST(contents)
+
+
+/obj/item/food/deepfryholder/proc/fry(cook_time = 30)
+ switch(cook_time)
+ if(0 to 15)
+ add_atom_colour(rgb(166,103,54), FIXED_COLOUR_PRIORITY)
+ name = "lightly-fried [name]"
+ desc = "[desc] It's been lightly fried in a deep fryer."
+ if(16 to 49)
+ add_atom_colour(rgb(103,63,24), FIXED_COLOUR_PRIORITY)
+ name = "fried [name]"
+ desc = "[desc] It's been fried, increasing its tastiness value by [rand(1, 75)]%."
+ if(50 to 59)
+ add_atom_colour(rgb(63,23,4), FIXED_COLOUR_PRIORITY)
+ name = "deep-fried [name]"
+ desc = "[desc] Deep-fried to perfection."
+ if(60 to INFINITY)
+ add_atom_colour(rgb(33,19,9), FIXED_COLOUR_PRIORITY)
+ name = "\proper the physical manifestation of the very concept of fried foods"
+ desc = "A heavily-fried... something. Who can tell anymore?"
+ foodtypes |= FRIED
+
+/obj/item/food/butterbiscuit
+ name = "butter biscuit"
+ desc = "Well butter my biscuit!"
+ icon = 'icons/obj/food/food.dmi'
+ icon_state = "butterbiscuit"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 6,
+ /datum/reagent/consumable/nutriment/vitamin = 1
+ )
+ tastes = list("butter" = 1, "biscuit" = 1)
+ foodtypes = GRAIN | BREAKFAST
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/butterdog
+ name = "butterdog"
+ desc = "Made from exotic butters."
+ icon = 'icons/obj/food/food.dmi'
+ icon_state = "butterdog"
+ bite_consumption = 1
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 6,
+ /datum/reagent/consumable/nutriment/vitamin = 1
+ )
+ tastes = list("butter" = 1, "exotic butter" = 1)
+ foodtypes = GRAIN | DAIRY
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/butterdog/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/slippery, 8 SECONDS)
diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm
new file mode 100644
index 00000000000..12445d50d8f
--- /dev/null
+++ b/code/game/objects/items/food/cake.dm
@@ -0,0 +1,530 @@
+/obj/item/food/cake
+ icon = 'icons/obj/food/piecake.dmi'
+ bite_consumption = 3
+ max_volume = 80
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 5
+ )
+ tastes = list("cake" = 1)
+ foodtypes = GRAIN | DAIRY
+ /// type is spawned 5 at a time and replaces this cake when processed by cutting tool
+ var/obj/item/food/cakeslice/slice_type
+ /// changes yield of sliced cake, default for cake is 5
+ var/yield = 5
+
+/obj/item/food/cake/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/food_storage)
+
+/obj/item/food/cake/make_processable()
+ if (slice_type)
+ AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, yield, 3 SECONDS, table_required = TRUE)
+
+/obj/item/food/cakeslice
+ icon = 'icons/obj/food/piecake.dmi'
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 1
+ )
+ tastes = list("cake" = 1)
+ foodtypes = GRAIN | DAIRY
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/cake/plain
+ name = "plain cake"
+ desc = "A plain cake, not a lie." //Many of the cakes seem to follow this desc scheme, so I am going to try and put either a hint about its contents, or a fun fact. Lets try to follow this.
+ icon_state = "plaincake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 30,
+ /datum/reagent/consumable/nutriment/vitamin = 7
+ )
+ tastes = list("sweetness" = 2, "cake" = 5)
+ foodtypes = GRAIN | DAIRY | SUGAR
+ slice_type = /obj/item/food/cakeslice/plain
+
+/obj/item/food/cakeslice/plain
+ name = "plain cake slice"
+ desc = "Just a slice of cake, it is enough for everyone."
+ icon_state = "plaincake_slice"
+ tastes = list("sweetness" = 2,"cake" = 5)
+ foodtypes = GRAIN | DAIRY | SUGAR
+
+/obj/item/food/cake/carrot
+ name = "carrot cake"
+ desc = "Scientifically proven to improve eyesight! Not a lie."
+ icon_state = "carrotcake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/medicine/oculine = 10,
+ /datum/reagent/consumable/nutriment/vitamin = 5
+ )
+ tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
+ foodtypes = GRAIN | DAIRY | VEGETABLES | SUGAR
+ slice_type = /obj/item/food/cakeslice/carrot
+
+/obj/item/food/cakeslice/carrot
+ name = "carrot cake slice"
+ desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
+ icon_state = "carrotcake_slice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/medicine/oculine = 2,
+ /datum/reagent/consumable/nutriment/vitamin = 1
+ )
+ tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
+ foodtypes = GRAIN | DAIRY | VEGETABLES | SUGAR
+
+/obj/item/food/cake/brain
+ name = "brain cake"
+ desc = "Yeah... its actually made out of brain. I wish it were a lie."
+ icon_state = "braincake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 15,
+ /datum/reagent/medicine/mannitol = 10,
+ /datum/reagent/consumable/nutriment/vitamin = 5
+ )
+ tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
+ foodtypes = GRAIN | DAIRY | MEAT | GROSS | SUGAR
+ slice_type = /obj/item/food/cakeslice/brain
+
+/obj/item/food/cakeslice/brain
+ name = "brain cake slice"
+ desc = "Lemme tell you something about prions. THEY'RE DELICIOUS. A terrifying not-lie."
+ icon_state = "braincakeslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/medicine/mannitol = 2,
+ /datum/reagent/consumable/nutriment/vitamin = 1
+ )
+ tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
+ foodtypes = GRAIN | DAIRY | MEAT | GROSS | SUGAR
+
+/obj/item/food/cake/cheese
+ name = "cheese cake"
+ desc = "DANGEROUSLY cheesy."
+ icon_state = "cheesecake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 8
+ )
+ tastes = list("cake" = 4, "cream cheese" = 3)
+ foodtypes = GRAIN | DAIRY
+ slice_type = /obj/item/food/cakeslice/cheese
+
+/obj/item/food/cakeslice/cheese
+ name = "cheese cake slice"
+ desc = "Slice of pure cheestisfaction."
+ icon_state = "cheesecake_slice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 1.3
+ )
+ tastes = list("cake" = 4, "cream cheese" = 3)
+ foodtypes = GRAIN | DAIRY
+
+/obj/item/food/cake/orange
+ name = "orange cake"
+ desc = "A cake with added orange."
+ icon_state = "orangecake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+ slice_type = /obj/item/food/cakeslice/orange
+
+/obj/item/food/cakeslice/orange
+ name = "orange cake slice"
+ desc = "Just a slice of cake, it is enough for everyone."
+ icon_state = "orangecake_slice"
+ tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/food/cake/lime
+ name = "lime cake"
+ desc = "A cake with added lime."
+ icon_state = "limecake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+ slice_type = /obj/item/food/cakeslice/lime
+
+/obj/item/food/cakeslice/lime
+ name = "lime cake slice"
+ desc = "Just a slice of cake, it is enough for everyone."
+ icon_state = "limecake_slice"
+ tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/food/cake/lemon
+ name = "lemon cake"
+ desc = "A cake with added lemon."
+ icon_state = "lemoncake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("cake" = 5, "sweetness" = 3, "sourness" = 1) //lemon cake is never as sour as it is sweet, have you ever actually eaten it?
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+ slice_type = /obj/item/food/cakeslice/lemon
+
+/obj/item/food/cakeslice/lemon
+ name = "lemon cake slice"
+ desc = "Just a slice of cake, it is enough for everyone."
+ icon_state = "lemoncake_slice"
+ tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/food/cake/chocolate
+ name = "chocolate cake"
+ desc = "A cake with added chocolate."
+ icon_state = "chocolatecake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
+ foodtypes = GRAIN | DAIRY | JUNKFOOD | SUGAR
+ slice_type = /obj/item/food/cakeslice/chocolate
+
+/obj/item/food/cakeslice/chocolate
+ name = "chocolate cake slice"
+ desc = "Just a slice of cake, it is enough for everyone."
+ icon_state = "chocolatecake_slice"
+ tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
+ foodtypes = GRAIN | DAIRY | JUNKFOOD | SUGAR
+
+/obj/item/food/cake/birthday
+ name = "birthday cake"
+ desc = "Happy Birthday little clown..."
+ icon_state = "birthdaycake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/sprinkles = 10,
+ /datum/reagent/consumable/nutriment/vitamin = 5
+ )
+ tastes = list("cake" = 5, "sweetness" = 1)
+ foodtypes = GRAIN | DAIRY | JUNKFOOD | SUGAR
+ slice_type = /obj/item/food/cakeslice/birthday
+
+/obj/item/food/cakeslice/birthday
+ name = "birthday cake slice"
+ desc = "A slice of your birthday."
+ icon_state = "birthdaycakeslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/sprinkles = 2,
+ /datum/reagent/consumable/nutriment/vitamin = 1
+ )
+ tastes = list("cake" = 5, "sweetness" = 1)
+ foodtypes = GRAIN | DAIRY | JUNKFOOD | SUGAR
+
+/obj/item/food/cake/birthday/energy
+ name = "energy cake"
+ desc = "Just enough calories for a whole nuclear operative squad."
+ icon_state = "energycake"
+ force = 5
+ hitsound = 'sound/weapons/blade1.ogg'
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 10,
+ /datum/reagent/consumable/sprinkles = 10,
+ /datum/reagent/consumable/nutriment/vitamin = 5,
+ /datum/reagent/consumable/pacfuel = 10,
+ /datum/reagent/consumable/liquidelectricity = 10
+ )
+ tastes = list("cake" = 3, "a Vlad's Salad" = 1)
+ slice_type = /obj/item/food/cakeslice/birthday/energy
+
+/obj/item/food/cake/birthday/energy/proc/energy_bite(mob/living/user)
+ to_chat(user, "As you eat the cake, you accidentally hurt yourself on the embedded energy sword!")
+ user.apply_damage(30, BURN, BODY_ZONE_HEAD) // ITs an ENERGY sword, so it burns, duh
+ playsound(user, 'sound/weapons/blade1.ogg', 5, TRUE)
+
+/obj/item/food/cake/birthday/energy/attack(mob/living/target_mob, mob/living/user)
+ . = ..()
+ if(HAS_TRAIT(user, TRAIT_PACIFISM) && target_mob != user) //Prevents pacifists from attacking others directly
+ return
+ energy_bite(target_mob, user)
+
+/obj/item/food/cakeslice/birthday/energy
+ name = "energy cake slice"
+ desc = "For the traitor on the go."
+ icon_state = "energycakeslice"
+ force = 2
+ hitsound = 'sound/weapons/blade1.ogg'
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/sprinkles = 2,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/consumable/pacfuel = 2,
+ /datum/reagent/consumable/liquidelectricity = 2
+ )
+ tastes = list("cake" = 3, "a Vlad's Salad" = 1)
+
+/obj/item/food/cakeslice/birthday/energy/proc/energy_bite(mob/living/user)
+ to_chat(user, "As you eat the cake slice, you accidentally hurt yourself on the embedded energy dagger!")
+ user.apply_damage(18, BURN, BODY_ZONE_HEAD)
+ playsound(user, 'sound/weapons/blade1.ogg', 5, TRUE)
+
+/obj/item/food/cakeslice/birthday/energy/attack(mob/living/target_mob, mob/living/user)
+ . = ..()
+ if(HAS_TRAIT(user, TRAIT_PACIFISM) && target_mob != user) //Prevents pacifists from attacking others directly
+ return
+ energy_bite(target_mob, user)
+
+/obj/item/food/cake/apple
+ name = "apple cake"
+ desc = "A cake centred with Apple."
+ icon_state = "applecake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 10
+ )
+ tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+ slice_type = /obj/item/food/cakeslice/apple
+
+/obj/item/food/cakeslice/apple
+ name = "apple cake slice"
+ desc = "A slice of heavenly cake."
+ icon_state = "applecakeslice"
+ tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/food/cake/slimecake
+ name = "Slime cake"
+ desc = "A cake made of slimes. Probably not electrified."
+ icon_state = "slimecake"
+ tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
+ foodtypes = GRAIN | DAIRY | SUGAR
+ slice_type = /obj/item/food/cakeslice/slimecake
+
+/obj/item/food/cakeslice/slimecake
+ name = "slime cake slice"
+ desc = "A slice of slime cake."
+ icon_state = "slimecake_slice"
+ tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
+ foodtypes = GRAIN | DAIRY | SUGAR
+
+/obj/item/food/cake/pumpkinspice
+ name = "pumpkin spice cake"
+ desc = "A hollow cake with real pumpkin."
+ icon_state = "pumpkinspicecake"
+ tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
+ foodtypes = GRAIN | DAIRY | VEGETABLES | SUGAR
+ slice_type = /obj/item/food/cakeslice/pumpkinspice
+
+/obj/item/food/cakeslice/pumpkinspice
+ name = "pumpkin spice cake slice"
+ desc = "A spicy slice of pumpkin goodness."
+ icon_state = "pumpkinspicecakeslice"
+ tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
+ foodtypes = GRAIN | DAIRY | VEGETABLES | SUGAR
+
+/obj/item/food/cake/bsvc // blackberry strawberries vanilla cake
+ name = "blackberry and strawberry vanilla cake"
+ desc = "A plain cake, filled with assortment of blackberries and strawberries!"
+ icon_state = "blackbarry_strawberries_cake_vanilla_cake"
+ tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+ slice_type = /obj/item/food/cakeslice/bsvc
+
+/obj/item/food/cakeslice/bsvc
+ name = "blackberry and strawberry vanilla cake slice"
+ desc = "Just a slice of cake filled with assortment of blackberries and strawberries!"
+ icon_state = "blackbarry_strawberries_cake_vanilla_slice"
+ tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2,"cake" = 3)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/food/cake/bscc // blackbarry strawberries chocolate cake
+ name = "blackberry and strawberry chocolate cake"
+ desc = "A chocolate cake, filled with assortment of blackberries and strawberries!"
+ icon_state = "blackbarry_strawberries_cake_coco_cake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 5,
+ /datum/reagent/consumable/coco = 5
+ )
+ tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 4, "sweetness" = 2,"cake" = 3)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+ slice_type = /obj/item/food/cakeslice/bscc
+
+/obj/item/food/cakeslice/bscc
+ name = "blackberry and strawberry chocolate cake slice"
+ desc = "Just a slice of cake filled with assortment of blackberries and strawberries!"
+ icon_state = "blackbarry_strawberries_cake_coco_slice"
+ tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 4, "sweetness" = 2,"cake" = 3)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/food/cake/holy_cake
+ name = "angel food cake"
+ desc = "A cake made for angels and chaplains alike! Contains holy water."
+ icon_state = "holy_cake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 1,
+ /datum/reagent/consumable/nutriment/vitamin = 3,
+ /datum/reagent/water/holywater = 10
+ )
+ tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
+ foodtypes = GRAIN | DAIRY | SUGAR
+ slice_type = /obj/item/food/cakeslice/holy_cake_slice
+
+/obj/item/food/cakeslice/holy_cake_slice
+ name = "angel food cake slice"
+ desc = "A slice of heavenly cake."
+ icon_state = "holy_cake_slice"
+ tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
+ foodtypes = GRAIN | DAIRY | SUGAR
+
+/obj/item/food/cake/pound_cake
+ name = "pound cake"
+ desc = "A condensed cake made for filling people up quickly."
+ icon_state = "pound_cake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 60,
+ /datum/reagent/consumable/nutriment/vitamin = 5
+ )
+ tastes = list("cake" = 5, "sweetness" = 1, "batter" = 1)
+ foodtypes = GRAIN | DAIRY | SUGAR | JUNKFOOD
+ slice_type = /obj/item/food/cakeslice/pound_cake_slice
+ yield = 10 //cause its so damn THICC (seriously these things are fucking huge a pound of each ingredient are you kidding)
+
+/obj/item/food/cakeslice/pound_cake_slice
+ name = "pound cake slice"
+ desc = "A slice of condensed cake made for filling people up quickly."
+ icon_state = "pound_cake_slice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 9,
+ /datum/reagent/consumable/nutriment/vitamin = 0.5
+ )
+ tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
+ foodtypes = GRAIN | DAIRY | SUGAR | JUNKFOOD
+
+/obj/item/food/cake/hardware_cake
+ name = "hardware cake"
+ desc = "A quote on quote cake that is made with electronic boards and leaks acid..."
+ icon_state = "hardware_cake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 5,
+ /datum/reagent/toxin/acid = 15,
+ /datum/reagent/fuel/oil = 15
+ )
+ tastes = list("acid" = 3, "metal" = 4, "glass" = 5)
+ foodtypes = GRAIN | GROSS
+ slice_type = /obj/item/food/cakeslice/hardware_cake_slice
+
+/obj/item/food/cakeslice/hardware_cake_slice
+ name = "hardware cake slice"
+ desc = "A slice of electronic boards and some acid."
+ icon_state = "hardware_cake_slice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/toxin/acid = 3,
+ /datum/reagent/fuel/oil = 3
+ )
+ tastes = list("acid" = 3, "metal" = 4, "glass" = 5)
+ foodtypes = GRAIN | GROSS
+
+/obj/item/food/cake/vanilla_cake
+ name = "vanilla cake"
+ desc = "A vanilla frosted cake."
+ icon_state = "vanillacake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 5,
+ /datum/reagent/consumable/sugar = 15,
+ /datum/reagent/consumable/vanilla = 15
+ )
+ tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
+ foodtypes = GRAIN | SUGAR | DAIRY
+ slice_type = /obj/item/food/cakeslice/vanilla_slice
+
+/obj/item/food/cakeslice/vanilla_slice
+ name = "vanilla cake slice"
+ desc = "A slice of vanilla frosted cake."
+ icon_state = "vanillacake_slice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/consumable/sugar = 3,
+ /datum/reagent/consumable/vanilla = 3
+ )
+ tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
+ foodtypes = GRAIN | SUGAR | DAIRY
+
+/obj/item/food/cake/clown_cake
+ name = "clown cake"
+ desc = "A funny cake with a clown face on it."
+ icon_state = "clowncake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 5,
+ /datum/reagent/consumable/banana = 15
+ )
+ tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
+ foodtypes = GRAIN | SUGAR | DAIRY
+ slice_type = /obj/item/food/cakeslice/clown_slice
+
+/obj/item/food/cakeslice/clown_slice
+ name = "clown cake slice"
+ desc = "A slice of bad jokes, and silly props."
+ icon_state = "clowncake_slice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/consumable/banana = 3
+ )
+ tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
+ foodtypes = GRAIN | SUGAR | DAIRY
+
+/obj/item/food/cake/trumpet
+ name = "spaceman's cake"
+ desc = "A spaceman's trumpet frosted cake."
+ icon_state = "trumpetcake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 20,
+ /datum/reagent/consumable/nutriment/vitamin = 5,
+ /datum/reagent/medicine/polypyr = 15,
+ /datum/reagent/consumable/cream = 5,
+ /datum/reagent/consumable/nutriment/vitamin = 5,
+ /datum/reagent/consumable/berryjuice = 5
+ )
+ tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+ slice_type = /obj/item/food/cakeslice/trumpet
+
+/obj/item/food/cakeslice/trumpet
+ name = "spaceman's cake"
+ desc = "A spaceman's trumpet frosted cake."
+ icon_state = "trumpetcakeslice"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/medicine/polypyr = 3,
+ /datum/reagent/consumable/cream = 1,
+ /datum/reagent/consumable/nutriment/vitamin = 1,
+ /datum/reagent/consumable/berryjuice = 1
+ )
+ tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
+ foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/food/cake/brioche
+ name = "brioche cake"
+ desc = "A ring of sweet, glazed buns."
+ icon_state = "briochecake"
+ tastes = list("cake" = 4, "butter" = 2, "cream" = 1)
+ foodtypes = GRAIN | DAIRY | SUGAR
+ slice_type = /obj/item/food/cakeslice/brioche
+ yield = 6
+
+/obj/item/food/cakeslice/brioche
+ name = "brioche cake slice"
+ desc = "Delicious sweet-bread. Who needs anything else?"
+ icon_state = "briochecake_slice"
diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm
new file mode 100644
index 00000000000..5c104a1a747
--- /dev/null
+++ b/code/game/objects/items/food/spaghetti.dm
@@ -0,0 +1,98 @@
+
+/obj/item/food/spaghetti
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
+ food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+ foodtypes = GRAIN
+
+/obj/item/food/spaghetti/Initialize()
+ . = ..()
+ if(!microwaved_type) // This isn't cooked, why would you put uncooked spaghetti in your pocket?
+ var/list/display_message = list(
+ "Something wet falls out of their pocket and hits the ground. Is that... [name]?",
+ "Oh shit! All your pocket [name] fell out!")
+ AddComponent(/datum/component/spill, display_message, 'sound/effects/splat.ogg')
+
+/obj/item/food/spaghetti/raw
+ name = "spaghetti"
+ desc = "Now that's a nic'e pasta!"
+ icon_state = "spaghetti"
+ tastes = list("pasta" = 1)
+ microwaved_type = /obj/item/food/spaghetti/boiledspaghetti
+
+/obj/item/food/spaghetti/boiledspaghetti
+ name = "boiled spaghetti"
+ desc = "A plain dish of noodles, this needs more ingredients."
+ icon_state = "spaghettiboiled"
+ trash_type = /obj/item/trash/plate
+ food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
+ microwaved_type = null
+
+/obj/item/food/spaghetti/pastatomato
+ name = "spaghetti"
+ desc = "Spaghetti and crushed tomatoes, almost as tangled as Miskilamo's wiring!"
+ icon_state = "pastatomato"
+ trash_type = /obj/item/trash/plate
+ bite_consumption = 4
+ food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
+ microwaved_type = null
+ tastes = list("pasta" = 1, "tomato" = 1)
+ foodtypes = GRAIN | FRUIT
+
+/obj/item/food/spaghetti/copypasta
+ name = "copypasta"
+ desc = "You probably shouldn't try this, you always hear people talking about how bad it is..."
+ icon_state = "copypasta"
+ trash_type = /obj/item/trash/plate
+ bite_consumption = 4
+ food_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/tomatojuice = 20, /datum/reagent/consumable/nutriment/vitamin = 8)
+ microwaved_type = null
+ tastes = list("pasta" = 1, "tomato" = 1)
+ foodtypes = GRAIN | VEGETABLES
+
+/obj/item/food/spaghetti/meatballspaghetti
+ name = "spaghetti and meatballs"
+ desc = "Now that's a nic'e meatball!"
+ icon_state = "meatballspaghetti"
+ trash_type = /obj/item/trash/plate
+ food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
+ microwaved_type = null
+ tastes = list("pasta" = 1, "meat" = 1)
+ foodtypes = GRAIN | MEAT
+
+/obj/item/food/spaghetti/spesslaw
+ name = "spesslaw"
+ desc = "A lawyers favourite."
+ icon_state = "spesslaw"
+ trash_type = /obj/item/trash/plate
+ food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 3)
+ microwaved_type = null
+ tastes = list("pasta" = 1, "meat" = 1)
+
+/obj/item/food/spaghetti/chowmein
+ name = "chow mein"
+ desc = "A nice mix of noodles and fried vegetables."
+ icon_state = "chowmein"
+ trash_type = /obj/item/trash/plate
+ food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
+ microwaved_type = null
+ tastes = list("noodle" = 1, "tomato" = 1)
+
+/obj/item/food/spaghetti/beefnoodle
+ name = "beef noodle"
+ desc = "Nutritious, beefy and noodly."
+ icon_state = "beefnoodle"
+ trash_type = /obj/item/reagent_containers/glass/bowl
+ food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/liquidgibs = 3)
+ microwaved_type = null
+ tastes = list("noodle" = 1, "meat" = 1)
+ foodtypes = GRAIN | MEAT
+
+/obj/item/food/spaghetti/butternoodles
+ name = "butter noodles"
+ desc = "Noodles covered in savory butter. Simple and slippery, but delicious."
+ icon_state = "butternoodles"
+ trash_type = /obj/item/trash/plate
+ food_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 2)
+ microwaved_type = null
+ tastes = list("noodle" = 1, "butter" = 1)
+ foodtypes = GRAIN | DAIRY
diff --git a/code/game/objects/items/gear_packs.dm b/code/game/objects/items/gear_packs.dm
new file mode 100644
index 00000000000..65db4ffa28c
--- /dev/null
+++ b/code/game/objects/items/gear_packs.dm
@@ -0,0 +1,285 @@
+/obj/item/gear_pack
+ name = "gear pack"
+ desc = "A large backpack that usually holds things"
+ icon = 'icons/obj/hydroponics/equipment.dmi'
+ icon_state = "waterbackpack"
+ item_state = "waterbackpack"
+ lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
+ w_class = WEIGHT_CLASS_HUGE
+ slot_flags = ITEM_SLOT_BACK
+ item_flags = SLOWS_WHILE_IN_HAND
+ max_integrity = 300
+ slowdown = 1
+ drag_slowdown = 1
+ actions_types = list(/datum/action/item_action/toggle_gear_handle)
+ max_integrity = 200
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+ resistance_flags = FIRE_PROOF
+ var/on = FALSE
+ var/obj/item/stock_parts/cell/cell
+ var/preload_cell_type = /obj/item/stock_parts/cell/high
+ var/powered = FALSE
+ var/activate_sound = "sparks"
+ var/obj/item/gear_handle/gear_handle_type = /obj/item/gear_handle
+ var/obj/item/gear_handle/gear_handle
+
+/obj/item/gear_pack/get_cell()
+ return cell
+
+/obj/item/gear_pack/Initialize()
+ . = ..()
+ drag_slowdown = slowdown
+ gear_handle = new gear_handle_type(src)
+ cell = new preload_cell_type(src)
+ update_power()
+ return
+
+/obj/item/gear_pack/examine(mob/user)
+ . = ..()
+ . += "It is [ on ? "currently" : "not"] active."
+ if(cell)
+ . += "A small readout reports [PERCENT(cell.charge / cell.maxcharge)]% charge."
+
+/obj/item/gear_pack/fire_act(exposed_temperature, exposed_volume)
+ . = ..()
+ if(gear_handle?.loc == src)
+ gear_handle.fire_act(exposed_temperature, exposed_volume)
+
+/obj/item/gear_pack/extinguish()
+ . = ..()
+ if(gear_handle?.loc == src)
+ gear_handle.extinguish()
+
+/obj/item/gear_pack/proc/update_power()
+ if(!QDELETED(cell))
+ if(QDELETED(gear_handle) || cell.charge < gear_handle.usecost)
+ powered = FALSE
+ else
+ powered = TRUE
+ else
+ powered = FALSE
+ update_icon()
+
+/obj/item/gear_pack/update_overlays()
+ . = ..()
+
+ if(powered)
+ . += "[initial(icon_state)]-powered"
+ if(!QDELETED(cell))
+ var/ratio = cell.charge / cell.maxcharge
+ ratio = CEILING(ratio*4, 1) * 25
+ . += "[initial(icon_state)]-charge[ratio]"
+ if(!cell)
+ . += "[initial(icon_state)]-nocell"
+ if(!on)
+ . += "[initial(icon_state)]-attachment"
+
+/obj/item/gear_pack/CheckParts(list/parts_list)
+ ..()
+ cell = locate(/obj/item/stock_parts/cell) in contents
+ update_power()
+
+/obj/item/gear_pack/ui_action_click()
+ toggle_gear_handle()
+
+//ATTACK HAND IGNORING PARENT RETURN VALUE
+/obj/item/gear_pack/attack_hand(mob/user)
+ if(loc == user)
+ if(slot_flags == ITEM_SLOT_BACK)
+ if(user.get_item_by_slot(ITEM_SLOT_BACK) == src)
+ ui_action_click()
+ else
+ to_chat(user, "Put the [src] on your back first!")
+
+ else if(slot_flags == ITEM_SLOT_BELT)
+ if(user.get_item_by_slot(ITEM_SLOT_BELT) == src)
+ ui_action_click()
+ else
+ to_chat(user, "Strap the [src]'s belt on first!")
+ return
+ return ..()
+
+/obj/item/gear_pack/MouseDrop(obj/over_object)
+ . = ..()
+ if(ismob(loc))
+ var/mob/M = loc
+ if(!M.incapacitated() && istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
+ M.putItemFromInventoryInHandIfPossible(src, H.held_index)
+
+/obj/item/gear_pack/attackby(obj/item/W, mob/user, params)
+ if(W == gear_handle)
+ toggle_gear_handle()
+ else if(istype(W, /obj/item/stock_parts/cell))
+ var/obj/item/stock_parts/cell/C = W
+ if(cell)
+ to_chat(user, "[src] already has a cell!")
+ else
+ if(C.maxcharge < gear_handle.usecost)
+ to_chat(user, "[src] requires a higher capacity cell.")
+ return
+ if(!user.transferItemToLoc(W, src))
+ return
+ cell = W
+ to_chat(user, "You install a cell in [src].")
+ update_power()
+
+ else if(W.tool_behaviour == TOOL_SCREWDRIVER)
+ if(cell)
+ cell.update_icon()
+ cell.forceMove(get_turf(src))
+ cell = null
+ to_chat(user, "You remove the cell from [src].")
+ update_power()
+ else
+ return ..()
+
+/obj/item/gear_pack/emp_act(severity)
+ . = ..()
+ if(cell && !(. & EMP_PROTECT_CONTENTS))
+ deductcharge(1000 / severity)
+ if(. & EMP_PROTECT_SELF)
+ return
+ update_power()
+
+/obj/item/gear_pack/proc/toggle_gear_handle()
+ set name = "Toggle gear_handle"
+ set category = "Object"
+ on = !on
+
+ var/mob/living/carbon/user = usr
+ if(on)
+ //Detach the gear_handle into the user's hands
+ playsound(src, 'sound/items/handling/multitool_pickup.ogg', 100)
+ if(!usr.put_in_hands(gear_handle))
+ on = FALSE
+ to_chat(user, "You need a free hand to hold the [gear_handle]!")
+ update_power()
+ return
+ else
+ //Remove from their hands and back onto the gear pack
+ remove_gear_handle(user)
+
+ update_power()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
+
+
+/obj/item/gear_pack/equipped(mob/user, slot)
+ ..()
+ if((slot_flags == ITEM_SLOT_BACK && slot != ITEM_SLOT_BACK) || (slot_flags == ITEM_SLOT_BELT && slot != ITEM_SLOT_BELT))
+ remove_gear_handle(user)
+ update_power()
+
+/obj/item/gear_pack/item_action_slot_check(slot, mob/user)
+ if(slot == user.getBackSlot())
+ return 1
+
+/obj/item/gear_pack/proc/remove_gear_handle(mob/user)
+ if(ismob(gear_handle.loc))
+ var/mob/M = gear_handle.loc
+ M.dropItemToGround(gear_handle, TRUE)
+ return
+
+/obj/item/gear_pack/Destroy()
+ if(on)
+ var/M = get(gear_handle, /mob)
+ remove_gear_handle(M)
+ QDEL_NULL(gear_handle)
+ QDEL_NULL(cell)
+ return ..()
+
+/obj/item/gear_pack/proc/deductcharge(chrgdeductamt)
+ if(cell)
+ if(cell.charge < (gear_handle.usecost+chrgdeductamt))
+ powered = FALSE
+ update_power()
+ if(cell.use(chrgdeductamt))
+ update_power()
+ return TRUE
+ else
+ return FALSE
+
+/obj/item/gear_handle
+
+ name = "gear handle"
+ desc = "handles the gear."
+ icon = 'icons/obj/hydroponics/equipment.dmi'
+ icon_state = "mister"
+ item_state = "mister"
+ lefthand_file = 'icons/mob/inhands/equipment/mister_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/mister_righthand.dmi'
+
+ force = 0
+ throwforce = 6
+ w_class = WEIGHT_CLASS_BULKY
+ resistance_flags = INDESTRUCTIBLE
+ base_icon_state = "mister"
+
+ var/req_pack = TRUE
+ var/usecost = 1000
+ var/obj/item/gear_pack/pack
+
+/obj/item/gear_handle/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NO_STORAGE_INSERT, GENERIC_ITEM_TRAIT)
+ if (!loc || !istype(loc, /obj/item/gear_pack))
+ return INITIALIZE_HINT_QDEL
+ if(!req_pack)
+ return
+ pack = loc
+ update_icon()
+
+/obj/item/gear_handle/Destroy()
+ pack = null
+ return ..()
+
+/obj/item/gear_handle/equipped(mob/user, slot)
+ . = ..()
+ if(!req_pack)
+ return
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(check_range))
+
+/obj/item/gear_handle/Moved()
+ . = ..()
+ check_range()
+
+
+/obj/item/gear_handle/fire_act(exposed_temperature, exposed_volume)
+ . = ..()
+ if((req_pack && pack) && loc != pack)
+ pack.fire_act(exposed_temperature, exposed_volume)
+
+/obj/item/gear_handle/proc/check_range()
+ SIGNAL_HANDLER
+
+ if(!req_pack ||!pack)
+ return
+ if(!in_range(src,pack))
+ var/mob/living/L = loc
+ if(istype(L))
+ to_chat(L, "[pack]'s [src] overextends and comes out of your hands!")
+ else
+ visible_message("[src] snaps back into [pack].")
+ snap_back()
+
+/obj/item/gear_handle/dropped(mob/user)
+ . = ..()
+ if(!req_pack)
+ return ..()
+ if(user)
+ UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
+ if(user != loc)
+ to_chat(user, "[src] snap back into the main unit.")
+ snap_back()
+ return
+
+/obj/item/gear_handle/proc/snap_back()
+ if(!pack)
+ return
+ playsound()
+ pack.on = FALSE
+ forceMove(pack)
+ pack.update_power()
diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm
index 8ec4353d1ca..592a4f6364f 100644
--- a/code/game/objects/items/gift.dm
+++ b/code/game/objects/items/gift.dm
@@ -47,8 +47,7 @@ GLOBAL_LIST_EMPTY(possible_gifts)
I.add_fingerprint(M)
/obj/item/a_gift/proc/get_gift_type()
- var/gift_type_list = list(/obj/item/sord,
- /obj/item/storage/wallet,
+ var/gift_type_list = list(/obj/item/storage/wallet,
/obj/item/storage/photo_album,
/obj/item/storage/box/snappops,
/obj/item/storage/crayons,
@@ -67,7 +66,6 @@ GLOBAL_LIST_EMPTY(possible_gifts)
/obj/item/bikehorn,
/obj/item/toy/beach_ball,
/obj/item/toy/beach_ball/holoball,
- /obj/item/banhammer,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
/obj/item/paicard,
@@ -76,10 +74,6 @@ GLOBAL_LIST_EMPTY(possible_gifts)
/obj/item/storage/belt/utility/full,
/obj/item/clothing/neck/tie/horrible,
/obj/item/clothing/suit/jacket/leather,
- /obj/item/clothing/suit/jacket/leather/overcoat,
- /obj/item/clothing/suit/poncho,
- /obj/item/clothing/suit/poncho/green,
- /obj/item/clothing/suit/poncho/red,
/obj/item/clothing/suit/snowman,
/obj/item/clothing/head/snowman,
/obj/item/stack/sheet/mineral/coal)
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index 50da920b06f..2e5c9275d8d 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -332,7 +332,7 @@
/obj/item/book/granter/spell/random/Initialize()
. = ..()
- var/static/banned_spells = list(/obj/item/book/granter/spell/mimery_blockade, /obj/item/book/granter/spell/mimery_guns)
+ var/static/banned_spells = list(/obj/item/book/granter/spell/mimery_blockade)
var/real_type = pick(subtypesof(/obj/item/book/granter/spell) - banned_spells)
new real_type(loc)
return INITIALIZE_HINT_QDEL
@@ -446,10 +446,8 @@
name = "Cooking Desserts 101"
desc = "A cook book that teaches you some more of the newest desserts. AI approved, and a best seller on Honkplanet."
crafting_recipe_types = list(
- /datum/crafting_recipe/food/mimetart,
/datum/crafting_recipe/food/berrytart,
/datum/crafting_recipe/food/cocolavatart,
- /datum/crafting_recipe/food/clowncake,
/datum/crafting_recipe/food/vanillacake
)
icon_state = "cooking_learing_sweets"
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index b675a001215..58fd68157f0 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -207,7 +207,7 @@
desc = "A custom made large grenade. Larger splash range and increased ignition temperature compared to basic grenades. Fits exotic and bluespace based containers."
casedesc = "This casing affects a larger area than the basic model and can fit exotic containers, including slime cores and bluespace beakers. Heats contents by 25°K upon ignition."
icon_state = "large_grenade"
- allowed_containers = list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/condiment, /obj/item/reagent_containers/food/drinks)
+ allowed_containers = list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/condiment, /obj/item/reagent_containers/food/drinks)
banned_containers = list()
affected_area = 5
ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades.
@@ -217,36 +217,8 @@
if(stage != GRENADE_READY)
return
- for(var/obj/item/slime_extract/S in beakers)
- if(S.Uses)
- for(var/obj/item/reagent_containers/glass/G in beakers)
- G.reagents.trans_to(S, G.reagents.total_volume)
-
- //If there is still a core (sometimes it's used up)
- //and there are reagents left, behave normally,
- //otherwise drop it on the ground for timed reactions like gold.
-
- if(S)
- if(S.reagents && S.reagents.total_volume)
- for(var/obj/item/reagent_containers/glass/G in beakers)
- S.reagents.trans_to(G, S.reagents.total_volume)
- else
- S.forceMove(get_turf(src))
- no_splash = TRUE
..()
- //I tried to just put it in the allowed_containers list but
- //if you do that it must have reagents. If you're going to
- //make a special case you might as well do it explicitly. -Sayu
-/obj/item/grenade/chem_grenade/large/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/slime_extract) && stage == GRENADE_WIRED)
- if(!user.transferItemToLoc(I, src))
- return
- to_chat(user, "You add [I] to the [initial(name)] assembly.")
- beakers += I
- else
- return ..()
-
/obj/item/grenade/chem_grenade/cryo // Intended for rare cryogenic mixes. Cools the area moderately upon detonation.
name = "cryo grenade"
desc = "A custom made cryogenic grenade. Rapidly cools contents upon ignition."
diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm
index 5326b303d97..b9ad8730b65 100644
--- a/code/game/objects/items/grenades/clusterbuster.dm
+++ b/code/game/objects/items/grenades/clusterbuster.dm
@@ -79,36 +79,7 @@
var/obj/item/grenade/P = new type(loc)
if(istype(P))
P.active = TRUE
- addtimer(CALLBACK(P, TYPE_PROC_REF(/obj/item/grenade, prime)), rand(15,60))
- var/steps = rand(1,4)
- for(var/i in 1 to steps)
- step_away(src,loc)
-
-/obj/effect/payload_spawner/random_slime
- var/volatile = FALSE
-
-/obj/effect/payload_spawner/random_slime/volatile
- volatile = TRUE
-
-/obj/item/slime_extract/proc/activate_slime()
- var/list/slime_chems = src.activate_reagents
- if(!QDELETED(src))
- var/chem = pick(slime_chems)
- var/amount = 5
- if(chem == "lesser plasma") //In the rare case we get another rainbow.
- chem = /datum/reagent/toxin/plasma
- amount = 4
- if(chem == "holy water and uranium")
- chem = /datum/reagent/uranium
- reagents.add_reagent(/datum/reagent/water/holywater)
- reagents.add_reagent(chem,amount)
-
-/obj/effect/payload_spawner/random_slime/spawn_payload(type, numspawned)
- for(var/loop = numspawned ,loop > 0, loop--)
- var/chosen = pick(subtypesof(/obj/item/slime_extract))
- var/obj/item/slime_extract/P = new chosen(loc)
- if(volatile)
- addtimer(CALLBACK(P, TYPE_PROC_REF(/obj/item/slime_extract, activate_slime)), rand(15,60))
+ P.preprime(delayoverride = P.det_time + rand(1.5 SECONDS, 6 SECONDS))
var/steps = rand(1,4)
for(var/i in 1 to steps)
step_away(src,loc)
@@ -180,14 +151,3 @@
var/real_type = pick(subtypesof(/obj/item/grenade/clusterbuster))
new real_type(loc)
return INITIALIZE_HINT_QDEL
-
-//rainbow slime effect
-/obj/item/grenade/clusterbuster/slime
- name = "Blorble Blorble"
- icon_state = "slimebang"
- base_state = "slimebang"
- payload_spawner = /obj/effect/payload_spawner/random_slime
- prime_sound = 'sound/effects/bubbles.ogg'
-
-/obj/item/grenade/clusterbuster/slime/volatile
- payload_spawner = /obj/effect/payload_spawner/random_slime/volatile
diff --git a/code/game/objects/items/grenades/discogrenade.dm b/code/game/objects/items/grenades/discogrenade.dm
index 84ce765d59d..b8f988f363f 100644
--- a/code/game/objects/items/grenades/discogrenade.dm
+++ b/code/game/objects/items/grenades/discogrenade.dm
@@ -1,5 +1,3 @@
-//Ethereal Disco Grenade for Ethereal traitors
-//Does not affect ethereals.
//Some basic code pieces taken from flashbang, spawner grenade and ethereal disco ball for functionality (basically a combination of the 3).
//////////////////////
@@ -7,8 +5,8 @@
//////////////////////
/obj/item/grenade/discogrenade
- name = "Ethereal Disco Grenade"
- desc = "An unethical micro-party that will make all non-Ethereal beings dance to its beat!"
+ name = "Portable Disco Grenade"
+ desc = "An exotic prototype grenade. Through powerful audiovisual hypnotic cues, victims are afflicted with an unstoppable urge to boogie down. "
icon_state = "disco"
item_state = "flashbang"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
@@ -91,7 +89,7 @@
return
if(target.stat != CONSCIOUS) //Only conscious people can dance
return
- if(!target || iselzuose(target)) //Non humans and non etherals can't dance
+ if(!target) //Non humans and non etherals can't dance
return
var/distance = max(0,get_dist(get_turf(src), target_turf))
@@ -102,27 +100,23 @@
target.say(pick(message_social_anxiety))
if(rand(3) && target.get_ear_protection() == 0)
target.drop_all_held_items()
- target.show_message("You cover your ears, the music is just too loud for you.", 2)
+ target.show_message(span_warning("You cover your ears, the music is just too loud for you."), 2)
return
if(HAS_TRAIT(target, TRAIT_MINDSHIELD))
- target.show_message("You resist your inner urges to break out your best moves.", 2)
+ target.show_message(span_warning("You resist your inner urges to break out your best moves."), 2)
target.set_drugginess(5)
return
- if(istype(target.get_item_by_slot(ITEM_SLOT_HEAD), /obj/item/clothing/head/foilhat))
- to_chat(target, "THOSE GLOW-IN-THE-DARK NANOTRASEN LIGHTBULBS WON'T CORRUPT ME WITH THEIR AGENDA!")
- target.emote("scream")
- return
target.set_drugginess(10)
- target.show_message("You feel a strong rythme and your muscles spasm uncontrollably, you begin dancing and cannot move!", 2)
+ target.show_message(span_warning("You feel a strong rythme and your muscles spasm uncontrollably, you begin dancing and cannot move!"), 2)
target.Immobilize(30)
//Special actions
switch(rand(0, 6))
if(0)
target.Knockdown(4)
- target.show_message("You [pick("mess", "screw")] up your moves and trip!", 2)
+ target.show_message(span_warning("You [pick("mess", "screw")] up your moves and trip!"), 2)
if(1 to 3)
target.emote("spin")
if(3 to 4)
diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm
index 915011b81b1..247ca439c8b 100644
--- a/code/game/objects/items/grenades/ghettobomb.dm
+++ b/code/game/objects/items/grenades/ghettobomb.dm
@@ -25,7 +25,7 @@
add_overlay("improvised_grenade_filled")
add_overlay("improvised_grenade_wired")
times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value]
- det_time = text2num(pickweight(times))
+ det_time = text2num(pick_weight(times))
if(det_time < 0) //checking for 'duds'
range = 1
det_time = rand(30,80)
diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm
index f0198b7f1a0..fb19cfe3170 100644
--- a/code/game/objects/items/grenades/grenade.dm
+++ b/code/game/objects/items/grenades/grenade.dm
@@ -150,7 +150,18 @@
/obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
var/obj/projectile/P = hitby
- if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && prob(15))
+ var/list/valid_hands = list(FALSE, FALSE)
+
+ //checks if the projectile hits an arm holding a grenade
+ if (istype(owner.held_items[1], (/obj/item/grenade)))
+ if (P.def_zone == "l_arm")
+ valid_hands[1] = TRUE
+
+ if (istype(owner.held_items[2], (/obj/item/grenade)))
+ if (P.def_zone == "r_arm")
+ valid_hands[2] = TRUE
+
+ if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && (valid_hands[1] || valid_hands[2]) && prob(5)) //5% chance to go off
owner.visible_message("[attack_text] hits [owner]'s [src], setting it off! What a shot!")
var/turf/T = get_turf(src)
log_game("A projectile ([hitby]) detonated a grenade held by [key_name(owner)] at [COORD(T)]")
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index f3f891bad11..7a21c9129ad 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -52,6 +52,9 @@
target.cut_overlay(plastic_overlay, TRUE)
if(!ismob(target) || full_damage_on_mobs)
target.ex_act(EXPLODE_HEAVY, target)
+ if(iswallturf(target))
+ var/turf/closed/wall/wall = target
+ wall.dismantle_wall(TRUE)
else
location = get_turf(src)
if(location)
@@ -64,7 +67,12 @@
//assembly stuff
/obj/item/grenade/c4/receive_signal()
- prime()
+ if(!active)
+ active = TRUE
+ icon_state = "[item_state]2"
+ balloon_alert_to_viewers("[src] begins ticking!")
+ addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10)
+ return
/obj/item/grenade/c4/attack_self(mob/user)
var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num|null
@@ -122,3 +130,16 @@
item_state = "plasticx4"
directional = TRUE
boom_sizes = list(0, 2, 5)
+
+
+// x-com ufo defense high ex charge 1993
+/obj/item/grenade/c4/satchel_charge
+ name = "\improper satchel charge"
+ desc = "Used to put craters into places without too much hassle. An engineer's favorite."
+ w_class = WEIGHT_CLASS_NORMAL
+ icon_state = "satchel_charge0"
+ item_state = "satchel_charge"
+ throw_range = 3
+ lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
+ boom_sizes = list(0, 3, 5)
diff --git a/code/game/objects/items/grenades/smokebomb.dm b/code/game/objects/items/grenades/smokebomb.dm
index e300c3ef07a..c29a00a8390 100644
--- a/code/game/objects/items/grenades/smokebomb.dm
+++ b/code/game/objects/items/grenades/smokebomb.dm
@@ -1,17 +1,10 @@
/obj/item/grenade/smokebomb
name = "smoke grenade"
- desc = "Real bruh moment if you ever see this. Probably tell a c*der or something."
+ desc = "A smoke grenade pattern, used to screen unit movements, and signal landing zones, widely used by military forces on the frontier and beyond."
icon = 'icons/obj/grenade.dmi'
icon_state = "smokewhite"
item_state = "smoke"
slot_flags = ITEM_SLOT_BELT
- ///It's extremely important to keep this list up to date. It helps to generate the insightful description of the smokebomb. EDIT: honestly fuck you nemvar. go directly to jail and do not collect 200 dollars
- var/static/list/bruh_moment = list("Dank", "Hip", "Lit", "Based", "Robust", "Bruh")
-
-///Here we generate the extremely insightful description.
-/obj/item/grenade/smokebomb/Initialize()
- . = ..()
- desc = "The word '[pick(bruh_moment)]' is scribbled on it in crayon."
///Here we generate some smoke and also damage blobs??? for some reason. Honestly not sure why we do that.
/obj/item/grenade/smokebomb/prime()
@@ -22,7 +15,4 @@
smoke.set_up(4, src)
smoke.start()
qdel(smoke) //And deleted again. Sad really.
- for(var/obj/structure/blob/B in view(8,src))
- var/damage = round(30/(get_dist(B,src)+1))
- B.take_damage(damage, BURN, "melee", 0)
resolve()
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 9fece4feedd..f36c27bb244 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -20,7 +20,7 @@
name = "handcuffs"
desc = "Use this to keep prisoners in line."
gender = PLURAL
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "handcuff"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
@@ -217,7 +217,7 @@
name = "leg cuffs"
desc = "Use this to keep prisoners in line."
gender = PLURAL
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "handcuff"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
@@ -426,6 +426,6 @@
/obj/item/restraints/legcuffs/bola/watcher //tribal bola for tribal lizards
name = "watcher Bola"
desc = "A Bola made from the stretchy sinew of fallen watchers."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "bola_watcher"
breakouttime = 45
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
deleted file mode 100644
index 0affcd107af..00000000000
--- a/code/game/objects/items/holy_weapons.dm
+++ /dev/null
@@ -1,522 +0,0 @@
-// CHAPLAIN CUSTOM ARMORS //
-
-/obj/item/storage/box/holy
- name = "Witchhunter Kit"
-
-/obj/item/storage/box/holy/PopulateContents()
- new /obj/item/clothing/head/witchunter(src)
- new /obj/item/clothing/suit/armor/witchhunter(src)
-
-
-/obj/item/storage/box/holy/follower
- name = "Followers of the Chaplain Kit"
-
-/obj/item/storage/box/holy/follower/PopulateContents()
- new /obj/item/clothing/suit/hooded/chaplain_hoodie/leader(src)
- new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
- new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
- new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
- new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
-
-/obj/item/clothing/suit/hooded/chaplain_hoodie
- name = "follower hoodie"
- desc = "Hoodie made for acolytes of the chaplain."
- icon_state = "chaplain_hoodie"
- item_state = "chaplain_hoodie"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
- hoodtype = /obj/item/clothing/head/hooded/chaplain_hood
-
-/obj/item/clothing/head/hooded/chaplain_hood
- name = "follower hood"
- desc = "Hood made for acolytes of the chaplain."
- icon_state = "chaplain_hood"
- body_parts_covered = HEAD
- flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
-
-/obj/item/clothing/suit/hooded/chaplain_hoodie/leader
- name = "leader hoodie"
- desc = "Now you're ready for some 50 dollar bling water."
- icon_state = "chaplain_hoodie_leader"
- item_state = "chaplain_hoodie_leader"
- hoodtype = /obj/item/clothing/head/hooded/chaplain_hood/leader
-
-/obj/item/clothing/head/hooded/chaplain_hood/leader
- name = "leader hood"
- desc = "I mean, you don't /have/ to seek bling water. I just think you should."
- icon_state = "chaplain_hood_leader"
-
-
-// CHAPLAIN NULLROD AND CUSTOM WEAPONS //
-
-/obj/item/nullrod
- name = "null rod"
- desc = "A rod of pure obsidian; its very presence disrupts and dampens the powers of Nar'Sie's followers."
- icon_state = "nullrod"
- item_state = "nullrod"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- force = 18
- throw_speed = 3
- throw_range = 4
- throwforce = 10
- w_class = WEIGHT_CLASS_TINY
- obj_flags = UNIQUE_RENAME
- var/reskinned = FALSE
- var/chaplain_spawnable = TRUE
-
-/obj/item/nullrod/godhand
- icon_state = "disintegrate"
- item_state = "disintegrate"
- lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
- name = "god hand"
- desc = "This hand of yours glows with an awesome power!"
- item_flags = ABSTRACT | DROPDEL
- w_class = WEIGHT_CLASS_HUGE
- hitsound = 'sound/weapons/sear.ogg'
- damtype = BURN
- attack_verb = list("punched", "cross countered", "pummeled")
-
-/obj/item/nullrod/godhand/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
-
-/obj/item/nullrod/staff
- icon_state = "godstaff-red"
- item_state = "godstaff-red"
- lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
- name = "red holy staff"
- desc = "It has a mysterious, protective aura."
- w_class = WEIGHT_CLASS_HUGE
- force = 5
- slot_flags = ITEM_SLOT_BACK
- block_chance = 40
- var/shield_icon = "shield-red"
-
-/obj/item/nullrod/staff/worn_overlays(isinhands)
- . = list()
- if(isinhands)
- . += mutable_appearance('icons/effects/effects.dmi', shield_icon, MOB_LAYER + 0.01)
-
-/obj/item/nullrod/staff/blue
- name = "blue holy staff"
- icon_state = "godstaff-blue"
- item_state = "godstaff-blue"
- shield_icon = "shield-old"
-
-/obj/item/nullrod/claymore
- icon_state = "claymore_gold"
- item_state = "claymore_gold"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- pickup_sound = 'sound/items/handling/knife2_pickup.ogg'
- drop_sound = 'sound/items/handling/metal_drop.ogg'
- name = "holy claymore"
- desc = "A weapon fit for a crusade!"
- w_class = WEIGHT_CLASS_HUGE
- slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
- block_chance = 30
- sharpness = IS_SHARP
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-
-/obj/item/nullrod/claymore/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(attack_type == PROJECTILE_ATTACK)
- final_block_chance = 0 //Don't bring a sword to a gunfight
- return ..()
-
-/obj/item/nullrod/claymore/darkblade
- icon_state = "cultblade"
- item_state = "cultblade"
- lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
- inhand_x_dimension = 64
- inhand_y_dimension = 64
- name = "dark blade"
- desc = "Spread the glory of the dark gods!"
- slot_flags = ITEM_SLOT_BELT
- hitsound = 'sound/hallucinations/growl1.ogg'
-
-/obj/item/nullrod/claymore/chainsaw_sword
- icon_state = "chainswordon"
- item_state = "chainswordon"
- name = "sacred chainsaw sword"
- desc = "Suffer not a heretic to live."
- slot_flags = ITEM_SLOT_BELT
- attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
- hitsound = 'sound/weapons/chainsawhit.ogg'
- tool_behaviour = TOOL_SAW
- toolspeed = 1.5 //slower than a real saw
-
-/obj/item/nullrod/claymore/glowing
- icon_state = "swordon"
- item_state = "swordon"
- name = "force weapon"
- desc = "The blade glows with the power of faith. Or possibly a battery."
- slot_flags = ITEM_SLOT_BELT
-
-/obj/item/nullrod/claymore/katana
- name = "\improper Hanzo steel"
- desc = "Capable of cutting clean through a holy claymore."
- icon_state = "katana"
- item_state = "katana"
- slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
- supports_variations = VOX_VARIATION
-
-/obj/item/nullrod/claymore/multiverse
- name = "extradimensional blade"
- desc = "Once the harbinger of an interdimensional war, its sharpness fluctuates wildly."
- icon_state = "multiverse"
- item_state = "multiverse"
- slot_flags = ITEM_SLOT_BELT
-
-/obj/item/nullrod/claymore/multiverse/attack(mob/living/carbon/M, mob/living/carbon/user)
- force = rand(1, 30)
- ..()
-
-/obj/item/nullrod/claymore/saber
- name = "light energy sword"
- hitsound = 'sound/weapons/blade1.ogg'
- icon = 'icons/obj/transforming_energy.dmi'
- icon_state = "swordblue"
- item_state = "swordblue"
- desc = "If you strike me down, I shall become more robust than you can possibly imagine."
- slot_flags = ITEM_SLOT_BELT
-
-/obj/item/nullrod/claymore/saber/red
- name = "dark energy sword"
- icon_state = "swordred"
- item_state = "swordred"
- desc = "Woefully ineffective when used on steep terrain."
-
-/obj/item/nullrod/claymore/saber/pirate
- name = "nautical energy sword"
- icon_state = "cutlassred"
- item_state = "cutlassred"
- desc = "Convincing HR that your religion involved piracy was no mean feat."
-
-/obj/item/nullrod/sord
- name = "\improper UNREAL SORD"
- desc = "This thing is so unspeakably HOLY you are having a hard time even holding it."
- icon_state = "sord"
- item_state = "sord"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- slot_flags = ITEM_SLOT_BELT
- force = 4.13
- throwforce = 1
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-
-/obj/item/nullrod/scythe
- icon_state = "scythe1"
- item_state = "scythe1"
- lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
- name = "reaper scythe"
- desc = "Ask not for whom the bell tolls..."
- w_class = WEIGHT_CLASS_BULKY
- armour_penetration = 35
- slot_flags = ITEM_SLOT_BACK
- sharpness = IS_SHARP
- attack_verb = list("chopped", "sliced", "cut", "reaped")
-
-/obj/item/nullrod/scythe/Initialize()
- . = ..()
- AddComponent(/datum/component/butchering, 70, 110) //the harvest gives a high bonus chance
-
-/obj/item/nullrod/scythe/vibro
- icon_state = "hfrequency0"
- item_state = "hfrequency1"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- name = "high frequency blade"
- desc = "Bad references are the DNA of the soul."
- attack_verb = list("chopped", "sliced", "cut", "zandatsu'd")
- hitsound = 'sound/weapons/rapierhit.ogg'
-
-/obj/item/nullrod/scythe/spellblade
- icon_state = "spellblade"
- item_state = "spellblade"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- icon = 'icons/obj/guns/magic.dmi'
- name = "dormant spellblade"
- desc = "The blade grants the wielder nearly limitless power...if they can figure out how to turn it on, that is."
- hitsound = 'sound/weapons/rapierhit.ogg'
-
-/obj/item/nullrod/scythe/talking
- icon_state = "talking_sword"
- item_state = "talking_sword"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- name = "possessed blade"
- desc = "When the world falls into chaos, it's nice to have a friend by your side."
- attack_verb = list("chopped", "sliced", "cut")
- hitsound = 'sound/weapons/rapierhit.ogg'
- var/possessed = FALSE
-
-/obj/item/nullrod/scythe/talking/relaymove(mob/living/user, direction)
- return //stops buckled message spam for the ghost.
-
-/obj/item/nullrod/scythe/talking/attack_self(mob/living/user)
- if(possessed)
- return
-
- to_chat(user, "You attempt to wake the spirit of the blade...")
-
- possessed = TRUE
-
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
-
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- var/mob/living/simple_animal/shade/S = new(src)
- S.ckey = C.ckey
- S.fully_replace_character_name(null, "The spirit of [name]")
- S.status_flags |= GODMODE
- S.copy_languages(user, LANGUAGE_MASTER) //Make sure the sword can understand and communicate with the user.
- S.update_atom_languages()
- grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue
- var/input = sanitize_name(stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN))
-
- if(src && input)
- name = input
- S.fully_replace_character_name(null, "The spirit of [input]")
- else
- to_chat(user, "The blade is dormant. Maybe you can try again later.")
- possessed = FALSE
-
-/obj/item/nullrod/scythe/talking/Destroy()
- for(var/mob/living/simple_animal/shade/S in contents)
- to_chat(S, "You were destroyed!")
- qdel(S)
- return ..()
-
-/obj/item/nullrod/scythe/talking/chainsword
- icon_state = "chainswordon"
- item_state = "chainswordon"
- name = "possessed chainsaw sword"
- desc = "Suffer not a heretic to live."
- chaplain_spawnable = FALSE
- force = 30
- slot_flags = ITEM_SLOT_BELT
- attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
- hitsound = 'sound/weapons/chainsawhit.ogg'
- tool_behaviour = TOOL_SAW
- toolspeed = 0.5 //faster than normal saw
-
-/obj/item/nullrod/scythe/talking/necro
- desc = "An ancient weapon flush with the souls of the fallen. The blood of the necropolis has suffused it over time immemorial, granting a toothy bite."
- force = 35
- block_chance = 35
- hitsound = 'sound/weapons/pierce_slow.ogg'
- armour_penetration = 20// lower ap than the original possessed sword, go figure. The justification is that this has a serrated blade
- chaplain_spawnable = FALSE
- attack_verb = list("gnawed", "munched on", "chewed", "rended", "chomped")
- name = "possessed greatsword"
- var/bleed_stacks_per_hit = 2 //this effect has rapid scaling and is an instant down pretty much, I'll crib it since it can trigger on non-fauna
- resistance_flags = FIRE_PROOF | ACID_PROOF
-
-/obj/item/nullrod/scythe/talking/necro/examine(mob/user)
- . = ..()
- . += "This weapon applies a growing blood curse on attack. Though it slowly fades, fully manifesting it causes your target's blood to violently explode, creating a lethal burst of damage."
-
-/obj/item/nullrod/scythe/talking/necro/attack(mob/living/target)
- ..()
- var/datum/status_effect/stacking/saw_bleed/B = target.has_status_effect(STATUS_EFFECT_SAWBLEED)
- if(!B)
- target.apply_status_effect(STATUS_EFFECT_SAWBLEED,bleed_stacks_per_hit)
- else
- B.add_stacks(bleed_stacks_per_hit)
-
-/obj/item/nullrod/hammmer
- icon_state = "hammeron"
- item_state = "hammeron"
- lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
- name = "relic war hammer"
- desc = "This war hammer cost the chaplain forty thousand space dollars."
- slot_flags = ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_HUGE
- attack_verb = list("smashed", "bashed", "hammered", "crunched")
-
-/obj/item/nullrod/chainsaw
- name = "chainsaw hand"
- desc = "Good? Bad? You're the guy with the chainsaw hand."
- icon_state = "chainsaw_on"
- item_state = "mounted_chainsaw"
- lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
- w_class = WEIGHT_CLASS_HUGE
- item_flags = ABSTRACT
- sharpness = IS_SHARP
- attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
- hitsound = 'sound/weapons/chainsawhit.ogg'
- tool_behaviour = TOOL_SAW
- toolspeed = 2 //slower than a real saw
-
-/obj/item/nullrod/chainsaw/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
- AddComponent(/datum/component/butchering, 30, 100, 0, hitsound)
-
-/obj/item/nullrod/clown
- icon = 'icons/obj/wizard.dmi'
- icon_state = "clownrender"
- item_state = "render"
- name = "clown dagger"
- desc = "Used for absolutely hilarious sacrifices."
- hitsound = 'sound/items/bikehorn.ogg'
- sharpness = IS_SHARP
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-
-/obj/item/nullrod/pride_hammer
- icon_state = "pride"
- name = "Pride-struck Hammer"
- desc = "It resonates an aura of Pride."
- force = 16
- throwforce = 15
- w_class = 4
- slot_flags = ITEM_SLOT_BACK
- attack_verb = list("attacked", "smashed", "crushed", "splattered", "cracked")
- hitsound = 'sound/weapons/blade1.ogg'
-
-/obj/item/nullrod/pride_hammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
- . = ..()
- if(!proximity)
- return
- if(prob(30) && ishuman(A))
- var/mob/living/carbon/human/H = A
- user.reagents.trans_to(H, user.reagents.total_volume, 1, 1, 0, transfered_by = user)
- to_chat(user, "Your pride reflects on [H].")
- to_chat(H, "You feel insecure, taking on [user]'s burden.")
-
-/obj/item/nullrod/whip
- name = "holy whip"
- desc = "What a terrible night to be on Space Station 13."//very classic, it stays
- icon_state = "chain"
- item_state = "chain"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- slot_flags = ITEM_SLOT_BELT
- attack_verb = list("whipped", "lashed")
- hitsound = 'sound/weapons/chainhit.ogg'
-
-/obj/item/nullrod/fedora
- name = "atheist's fedora"
- desc = "The brim of the hat is as sharp as your wit. The edge would hurt almost as much as disproving the existence of God."
- icon_state = "fedora"
- item_state = "fedora"
- slot_flags = ITEM_SLOT_HEAD
- icon = 'icons/obj/clothing/hats.dmi'
- force = 0
- throw_speed = 4
- throw_range = 7
- throwforce = 30
- sharpness = IS_SHARP
- attack_verb = list("enlightened", "redpilled")
-
-/obj/item/nullrod/armblade
- name = "dark blessing"
- desc = "Particularly twisted deities grant gifts of dubious value."
- icon = 'icons/obj/changeling_items.dmi'
- icon_state = "arm_blade"
- item_state = "arm_blade"
- lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
- item_flags = ABSTRACT
- w_class = WEIGHT_CLASS_HUGE
- sharpness = IS_SHARP
-
-/obj/item/nullrod/armblade/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
- AddComponent(/datum/component/butchering, 80, 70)
-
-/obj/item/nullrod/armblade/tentacle
- name = "unholy blessing"
- icon_state = "tentacle"
- item_state = "tentacle"
-
-/obj/item/nullrod/carp
- name = "carp-sie plushie"
- desc = "An adorable stuffed toy that resembles the god of all carp. The teeth look pretty sharp. Activate it to receive the blessing of Carp-Sie."
- icon = 'icons/obj/plushes.dmi'
- icon_state = "carpplush"
- item_state = "carp_plushie"
- lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/items_righthand.dmi'
- force = 15
- attack_verb = list("bitten", "eaten", "fin slapped")
- hitsound = 'sound/weapons/bite.ogg'
- var/used_blessing = FALSE
-
-/obj/item/nullrod/claymore/bostaff //May as well make it a "claymore" and inherit the blocking
- name = "monk's staff"
- desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, it is now used to harass the clown."
- w_class = WEIGHT_CLASS_BULKY
- force = 15
- block_chance = 40
- slot_flags = ITEM_SLOT_BACK
- sharpness = IS_BLUNT
- hitsound = "swing_hit"
- attack_verb = list("smashed", "slammed", "whacked", "thwacked")
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "bostaff0"
- item_state = "bostaff0"
- lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
-
-/obj/item/nullrod/pitchfork
- icon_state = "pitchfork0"
- lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
- name = "unholy pitchfork"
- w_class = WEIGHT_CLASS_NORMAL
- desc = "Holding this makes you look absolutely devilish."
- attack_verb = list("poked", "impaled", "pierced", "jabbed")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
-
-/obj/item/nullrod/egyptian
- name = "egyptian staff"
- desc = "A tutorial in mummification is carved into the staff. You could probably craft the wraps if you had some cloth."
- icon = 'icons/obj/guns/magic.dmi'
- icon_state = "pharoah_sceptre"
- item_state = "pharoah_sceptre"
- lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
- w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("bashes", "smacks", "whacks")
-
-/obj/item/nullrod/hypertool
- icon = 'icons/obj/device.dmi'
- icon_state = "hypertool"
- item_state = "hypertool"
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- slot_flags = ITEM_SLOT_BELT
- name = "hypertool"
- desc = "A tool so powerful even you cannot perfectly use it."
- armour_penetration = 35
- damtype = BRAIN
- attack_verb = list("pulsed", "mended", "cut")
- hitsound = 'sound/effects/sparks4.ogg'
-
-/obj/item/nullrod/spear
- name = "ancient spear"
- desc = "An ancient spear made of brass, I mean gold, I mean bronze."
- icon_state = "ratvarian_spear"
- item_state = "ratvarian_spear"
- lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi'
- icon = 'icons/obj/clockwork_objects.dmi'
- slot_flags = ITEM_SLOT_BELT
- armour_penetration = 10
- sharpness = IS_SHARP_ACCURATE
- w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("stabbed", "poked", "slashed", "clocked")
- hitsound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/game/objects/items/implants/implant_mindshield.dm b/code/game/objects/items/implants/implant_mindshield.dm
index 121fa9f0c23..0a7094fb389 100644
--- a/code/game/objects/items/implants/implant_mindshield.dm
+++ b/code/game/objects/items/implants/implant_mindshield.dm
@@ -28,10 +28,7 @@
deconverted = TRUE
if(!silent)
- if(target.mind in SSticker.mode.cult)
- to_chat(target, "You feel something interfering with your mental conditioning, but you resist it!")
- else
- to_chat(target, "You feel a sense of peace and security. You are now protected from brainwashing.")
+ to_chat(target, "You feel a sense of peace and security. You are now protected from brainwashing.")
ADD_TRAIT(target, TRAIT_MINDSHIELD, "implant")
target.sec_hud_set_implants()
if(deconverted)
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index c4c832209ba..4379003d57a 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -110,6 +110,10 @@
radio.keyslot = new radio_key
radio.recalculateChannels()
+/obj/item/implant/radio/Destroy()
+ QDEL_NULL(radio)
+ return ..()
+
/obj/item/implant/radio/mining
radio_key = /obj/item/encryptionkey
@@ -118,13 +122,6 @@
radio_key = /obj/item/encryptionkey/syndicate
subspace_transmission = TRUE
-/obj/item/implant/radio/slime
- name = "slime radio"
- icon = 'icons/obj/surgery.dmi'
- icon_state = "adamantine_resonator"
- radio_key = /obj/item/encryptionkey
- subspace_transmission = TRUE
-
/obj/item/implant/radio/get_data()
var/dat = {"Implant Specifications: Name: Internal Radio Implant
diff --git a/code/game/objects/items/implants/implant_track.dm b/code/game/objects/items/implants/implant_track.dm
index a83d69c5314..fb4730dadf1 100644
--- a/code/game/objects/items/implants/implant_track.dm
+++ b/code/game/objects/items/implants/implant_track.dm
@@ -9,17 +9,18 @@
///The id of the timer that's qdeleting us
var/timerid
-/obj/item/implant/tracking/c38
+/obj/item/implant/tracking/bullet
name = "TRAC implant"
desc = "A smaller tracking implant that supplies power for only a few minutes."
var/lifespan = 3000 //how many deciseconds does the implant last?
allow_teleport = FALSE
-/obj/item/implant/tracking/c38/Initialize()
+/obj/item/implant/tracking/bullet/Initialize()
. = ..()
timerid = QDEL_IN(src, lifespan)
+ AddComponent(/datum/component/gps/item, "*TRAC")
-/obj/item/implant/tracking/c38/Destroy()
+/obj/item/implant/tracking/bullet/Destroy()
deltimer(timerid)
return ..()
diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm
index 23f7aec9b19..ef8aeefd051 100644
--- a/code/game/objects/items/implants/implantcase.dm
+++ b/code/game/objects/items/implants/implantcase.dm
@@ -1,7 +1,6 @@
/obj/item/implantcase
name = "implant case"
desc = "A glass case containing an implant."
- icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "implantcase-0"
item_state = "implantcase"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm
index 6de461954cb..8f95ef9942d 100644
--- a/code/game/objects/items/implants/implanter.dm
+++ b/code/game/objects/items/implants/implanter.dm
@@ -1,7 +1,7 @@
/obj/item/implanter
name = "implanter"
desc = "A sterile automatic implant injector."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "implanter0"
item_state = "syringe_0"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
diff --git a/code/game/objects/items/implants/implantpad.dm b/code/game/objects/items/implants/implantpad.dm
index 37667786262..ccbda83067a 100644
--- a/code/game/objects/items/implants/implantpad.dm
+++ b/code/game/objects/items/implants/implantpad.dm
@@ -1,7 +1,7 @@
/obj/item/implantpad
name = "implant pad"
desc = "Used to modify implants."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "implantpad-0"
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index 9e90329404f..f7ff9c187a9 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -1,10 +1,7 @@
/* Kitchen tools
* Contains:
* Fork
- * Kitchen knives
- * Ritual Knife
* Butcher's cleaver
- * Combat Knife
* Rolling Pins
* Plastic Utensils
*/
@@ -64,221 +61,6 @@
user.visible_message("[user]'s fork snaps into tiny pieces in their hand.")
qdel(src)
-/obj/item/kitchen/knife
- name = "kitchen knife"
- icon = 'icons/obj/item/knife.dmi'
- lefthand_file = 'icons/mob/inhands/weapons/knifes_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/knifes_righthand.dmi'
- icon_state = "kitchenknife"
- item_state = "kitchenknife"
- desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
- pickup_sound = 'sound/items/handling/knife1_pickup.ogg'
- drop_sound = 'sound/items/handling/knife3_drop.ogg'
- flags_1 = CONDUCT_1
- force = 10
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 10
- hitsound = 'sound/weapons/bladeslice.ogg'
- throw_speed = 3
- throw_range = 6
- custom_materials = list(/datum/material/iron=12000)
- attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- sharpness = IS_SHARP_ACCURATE
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- item_flags = EYE_STAB
- var/bayonet = FALSE //Can this be attached to a gun?
- custom_price = 250
-
-/obj/item/kitchen/knife/ComponentInitialize()
- . = ..()
- set_butchering()
-
-///Adds the butchering component, used to override stats for special cases
-/obj/item/kitchen/knife/proc/set_butchering()
- AddComponent(/datum/component/butchering, 80 - force, 100, force - 10) //bonus chance increases depending on force
-
-/obj/item/kitchen/knife/plastic
- name = "plastic knife"
- icon_state = "plastic_knife"
- desc = "A very safe, barely sharp knife made of plastic. Good for cutting food and not much else."
- force = 0
- w_class = WEIGHT_CLASS_TINY
- throwforce = 0
- throw_range = 5
- custom_materials = list(/datum/material/plastic = 100)
- attack_verb = list("prodded", "whiffed","scratched", "poked")
- sharpness = IS_SHARP
- custom_price = 50
- var/break_chance = 25
-
-/obj/item/kitchen/knife/plastic/afterattack(mob/living/carbon/user)
- .=..()
- if(prob(break_chance))
- user.visible_message("[user]'s knife snaps into tiny pieces in their hand.")
- qdel(src)
-
-/obj/item/kitchen/knife/pizza_cutter
- name = "pizza cutter"
- icon_state = "pizza_cutter"
- desc = "A knife edge bent around a circle using the power of science. Perfect for safely cutting pizza."
- force = 1
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 1
- throw_range = 6
- custom_materials = list(/datum/material/iron=4000)
- attack_verb = list("prodded", "whiffed","rolled", "poked")
- sharpness = IS_SHARP
-
-/obj/item/kitchen/knife/ritual
- name = "ritual knife"
- desc = "The unearthly energies that once powered this blade are now dormant."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "render"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
- w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/kitchen/knife/bloodletter
- name = "bloodletter"
- desc = "An occult looking dagger that is cold to the touch. Somehow, the flawless orb on the pommel is made entirely of liquid blood."
- icon = 'icons/obj/ice_moon/artifacts.dmi'
- icon_state = "bloodletter"
- w_class = WEIGHT_CLASS_NORMAL
- var/bleed_stacks_per_hit = 3
-
-/obj/item/kitchen/knife/bloodletter/attack(mob/living/M, mob/living/carbon/user)
- . =..()
- if(istype(M) && (M.mob_biotypes & MOB_ORGANIC))
- var/datum/status_effect/stacking/saw_bleed/bloodletting/B = M.has_status_effect(/datum/status_effect/stacking/saw_bleed/bloodletting)
- if(!B)
- M.apply_status_effect(/datum/status_effect/stacking/saw_bleed/bloodletting, bleed_stacks_per_hit)
- else
- B.add_stacks(bleed_stacks_per_hit)
-
-/obj/item/kitchen/knife/butcher
- name = "butcher's cleaver"
- icon_state = "cleaver"
- item_state = "cleaver"
- desc = "A huge thing used for chopping and chopping up meat."
- flags_1 = CONDUCT_1
- force = 15
- throwforce = 10
- custom_materials = list(/datum/material/iron=18000)
- attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- w_class = WEIGHT_CLASS_NORMAL
- custom_price = 600
-
-/obj/item/kitchen/knife/hunting
- name = "hunting knife"
- desc = "Despite its name, it's mainly used for cutting meat from dead prey rather than actual hunting."
- item_state = "huntingknife"
- icon_state = "huntingknife"
-
-/obj/item/kitchen/knife/hunting/set_butchering()
- AddComponent(/datum/component/butchering, 80 - force, 100, force + 10)
-
-/obj/item/kitchen/knife/switchblade
- name = "switchblade"
- icon_state = "switchblade"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- desc = "A sharp, concealable, spring-loaded knife."
- flags_1 = CONDUCT_1
- force = 3
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 5
- custom_materials = list(/datum/material/iron=12000)
- hitsound = 'sound/weapons/genhit.ogg'
- attack_verb = list("stubbed", "poked")
- resistance_flags = FIRE_PROOF
- var/extended = 0
-
-/obj/item/kitchen/knife/switchblade/attack_self(mob/user)
- extended = !extended
- playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
- if(extended)
- force = 20
- w_class = WEIGHT_CLASS_NORMAL
- throwforce = 23
- icon_state = "switchblade_ext"
- attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- else
- force = 3
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 5
- icon_state = "switchblade"
- attack_verb = list("stubbed", "poked")
- hitsound = 'sound/weapons/genhit.ogg'
- sharpness = IS_BLUNT
-
-/obj/item/kitchen/knife/combat
- name = "combat knife"
- icon = 'icons/obj/world/melee.dmi'
- icon_state = "combatknife"
- item_state = "combatknife"
- desc = "A military combat utility survival knife."
- embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
- force = 20
- throwforce = 20
- attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
- bayonet = TRUE
-
-/obj/item/kitchen/knife/combat/Initialize()
- . = ..()
- AddElement(/datum/element/world_icon, null, icon, 'icons/obj/item/knife.dmi')
-
-/obj/item/kitchen/knife/combat/survival
- name = "survival knife"
- icon_state = "survivalknife"
- item_state = "survivalknife"
- embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
- desc = "A hunting grade survival knife."
- force = 15
- throwforce = 15
- bayonet = TRUE
-
-/obj/item/kitchen/knife/combat/bone
- name = "bone dagger"
- item_state = "bone_dagger"
- icon_state = "bone_dagger"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- desc = "A sharpened bone. The bare minimum in survival."
- embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
- force = 15
- throwforce = 15
- custom_materials = null
-
-/obj/item/kitchen/knife/combat/cyborg
- name = "cyborg knife"
- icon = 'icons/obj/items_cyborg.dmi'
- icon_state = "knife_cyborg"
- desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
-
-/obj/item/kitchen/knife/shiv
- name = "glass shiv"
- icon = 'icons/obj/shards.dmi'
- icon_state = "shiv"
- item_state = "shiv"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- desc = "A makeshift glass shiv."
- force = 8
- throwforce = 12
- attack_verb = list("shanked", "shivved")
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- custom_materials = list(/datum/material/glass=400)
-
-/obj/item/kitchen/knife/shiv/carrot
- name = "carrot shiv"
- icon_state = "carrotshiv"
- item_state = "carrotshiv"
- icon = 'icons/obj/kitchen.dmi'
- desc = "Unlike other carrots, you should probably keep this far away from your eyes."
- custom_materials = null
-
/obj/item/kitchen/rollingpin
name = "rolling pin"
desc = "Used to knock out the Bartender."
@@ -292,8 +74,6 @@
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
custom_price = 200
-/* Trays moved to /obj/item/storage/bag */
-
/obj/item/kitchen/spoon/plastic
name = "plastic spoon"
desc = "Just be careful your food doesn't melt the spoon first."
@@ -304,9 +84,3 @@
custom_materials = list(/datum/material/plastic=120)
custom_price = 50
var/break_chance = 25
-
-/obj/item/kitchen/knife/plastic/afterattack(mob/living/carbon/user)
- .=..()
- if(prob(break_chance))
- user.visible_message("[user]'s spoon snaps into tiny pieces in their hand.")
- qdel(src)
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index 05af8fcadba..1a190618889 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -107,7 +107,7 @@
A firesuit must be connected to the Firefighter chassis for heat shielding.
Internal armor is plasteel for additional strength.
External armor must be installed in 2 parts, totaling 10 sheets.
-
Completed mech is more resiliant against fire, and is a bit more durable overall
+
Completed exosuit is more resiliant against fire, and is a bit more durable overall
Nanotrasen is determined to the safety of its investments employees.
@@ -240,10 +240,10 @@
"}
/obj/item/book/manual/trickwines_4_brewers
- name = "Trickwines for brewers"
+ name = "Ashen Brewing"
icon_state = "book2"
- author = "Bridget Saint-Baskett"
- title = "Trickwines for brewers"
+ author = "Amarasatsu ke Qazawat"
+ title = "Ashen Brewing"
dat = {"
@@ -256,73 +256,50 @@
-
Trickwines for brewers
- Okay, so you just joined the SRM and you want to make some brews! I'm tired of explaining all of this so I'm jotting it all down for the new hires.
- Trickwines almost all share the same effect. When you drink them, they provide a beneficial effect and when you toss them at someone it provides some sort of bad effect.
-
Breakaway flasks
- Honestly, I love these things. I'm not a scientist so I cant exactly explain how it works but somehow when you fuse plasma into glass it makes it ultra sharp and makes it really good for cracking over fauna heads.
- The simplest way I have found of making them is crafting them with a chunk of glass, plasma, and a welder.
-
-
Bacteria
- A speical speices of bacteria native to Illestren is what allows Trickwines form.
- Now we use a special distiller that keeps just enough bacertia alive to ferment without turning the batch sour.
- Now you should still have one on board but if you dont its fine.
- It just so happens we have trees on board our ships host to the Bacteria.
- To get enough Bacteria your going to need to feed it anything that would help a plant.
- Water, Fertilizer, Ashwine are all good options.
- Soon it will drops some apples and you can grind them for the bacteria.
- Once you have enough you can fabricate it the same way you would a normal barrel.
-
-
Ratios
- A common trend among Trickwines is the ratio of 3:1:1.
- 3 parts being an ethonal, the other 2 parts are often made from flora or fauna.
-
-
Ashwine
- It's kind of our trademark, and it's one of the simplest trickwines to make.
- These are the most common wines used in ceremonies so we often stock ships with the moonflowers needed to make them.
- It's made with a ratio of 3:1:1 absinthe, mushroom hallucinogen, and ash respectively.
- Mushroom hallucinogens come from mushroom caps and you can ferment absinthe from moonflowers.
- Its a mild hallucinogenic but seems to have powerful cleansing effects on the devoted SRM.
- It can also really fuck someone up, causing their vision to go shaky and blurry which makes it difficult for them to fight.
-
-
Icewine
- This one helps stopping foes in their tracks. One of my favorite flavor wise.
- Its made with 3:1:1 saké, polar bear fur, frost oil(grind chilled peppers).
- You can get polar bear fur and frost oil from grinding up polar bear hides and chilled peppers.
- It's pretty good at sealing burns and lowering your temperature quickly.
- However, it completely encases foes in ice and drops their temperature substantially.
-
-
Shockwine
- Easily my favorite for its splashed effect, this thing is great at scorching most fauna.
- Its made with vodka, calcium, and lemon juice.
- If you did not know, vodka requires enzymes instead of the normal fermenting process.
- It's a nice upper. Great if you're trying to run away.
- This one's really flashy. Expect some severe burns on your target
-
-
Hearthwine
- I once threw back a flask of this stuff in the heat of a really bad battle and it sealed my wounds within seconds its honestly increadible.
- It also acts like the inverse of Icewine heating you up more then a fever.
- Last time I threw it at someone though i almost burnt down the forest I was in.
- Its made out of ground up fireblossems with some nice hard cider and a bit of welding fuel with of course a ratio of 3:1:1.
-
-
Forcewine
- Two intresting effects from the consumption of Forcewine.
- First it seems to give you an "anti magic" effect, I have read about of tales of how it fizzled out some sort of great curse that we could best trace back to a ancient cult.
- Second is it protects the mind from cohersion and mind control.
- From my research this seems to act like nanotrasen mindshield implants.
- Would recomend for any esoteric senarios. We wont see these alot but its always smart to prepare for the worst.
- You can also use it to entrap Fauna inside of a forcefield like bubble, Gives you time to breath and prepare an attack.
- 3:1:1. Tequila, Space Montain Wind, and I know its one of the most difficult things to come by but hollow water, Its that stuff you can extract from geysers
-
-
Prismwine
- Gives you a nice shiny layer of armour, fire seems to have alot harder time sticking to me when i tested it.
- Throwing it seeems to do the reverse acting like a magnifying glass to burns and lasers
- 3:1:1. Good ol Gin, then add plasma and tinea luxor which is found from mushroom stems
-
- Some of these can be a bit situatinal but its always nice to have a few in your bag for emergecys.
- As a bonus, most of the other factions have no clue how to make these so you can sell them for a fair chunk of cash.
-
- Bridget Saint-Baskett, Senior Brewer
+
On the Topic of Trickwines
+ The alchemists of Roumain have long held that with sufficient preparation can many a potion be made. Many a daring hunter has returned to their domicile at the aid of an Alchemist. For those who travel, the 'Trickwine' is oft chosen, and so the learners of Roumain pass the secrets on to others.
+ A 'trickwine' is a potent brew, made by taking the powers that rest in the world around us and fermenting them in the blessings of Illestren. When imbibed by a Hunter, strength and power flow through their body, yet when shattered upon the beasts of the World, Illestrens' curses are unleashed upon it.
+ To freely create a trickwine is the mark of a rising alchemist, and to deliver it in the heat of a brawl is the mark of a true Hunter.
+ May this document guide you to both those marks.
+
+
Brewing Vessels.
+ While many vessels permeate the minds of alchemists, the Breakaway Flask is the instrument of choice for the rising talent. By taking the essence of plasma and infusing it within the body of glass - a most durable vessel is produced for the Trickwine. The glass remains firm lest it impacts upon a foe.
+ Any who tinker will find the infusion of essence is done most easily with a flame. Something that burns with a flame most potent. Away from the furnaces of Illestren, the burn of a welder suffices to create the vessel.
+
+
The Bacteria Of Illestren
+ The world of Illestren gave birth to a bacterium that has formed the backbone of alchemical experimentation for countless years. It has given birth to countless fermentation methods, including the cycle of brewing a Trickwine.
+ By use of a specialized distillery, the Illestren Bacteria can be maintained in amounts ideal to the fermentation of reagents from Trickwines to Beers. A talented brewer can create their own heritage by blending activating bacterium and reagent into a new concotion.
+ Not all vessels of the Militia bear a distillery, but plants transplanted from Illestren carry the bacterium within the flesh of their fruit. Careful nurture of a fruit-bearing plant will allow it to spread the blessings of Illestren. Treat the plant as you would treat any other ally. Allot it drinks. Trim its branches. Protect it from those who seek to harm it.
+ Once the fruit has ripened and dropped from the host, an alchemist can take it, fermenting the ripe flesh into a potent mixture of ciders and bacterias entangled together.
+ Just as we give to the tree, it shall give to us. It pays a talent to remember this.
+
+
Common Mixtures
+ Those that find easy success within the alchemical arts have written that to make a Trickwine, one must maintain a careful mixture.
+ Three wholes of an ethanol base, with the flavor varied for impact. Entangled with a whole strand of beast, and the blessings of plant. Once cut with the potent catalyst that is the Bacterium, the fermentation is rapid, and a Trickwine is born from the mixture.
+
+
Wine Of Ash
+ The Wine Of Ash is the most endearing brew to have come from the Distilleries of the Militia. It carries a variety of uses, from the Ceremonies of Roumain, to the warm afterparty of a successful hunt. The flavor is said to be somewhat rustic, with hints of fruit and a sweet yet ashy tang.
+ Brewing the Wine Of Ash is a simple task, that even Shadows are expected to do at times. By fermenting a flower of the moon into a potent absinthe, a strong base is formed. Seeping a hallucinogenic mushroom within the absinthe, and then introducing an ash into the mixture of drink and plant creates the Wine Of Ash. One must be patient when brewing, as the brew will be strong, but further fermentation will allow it to blossom into a true vintage.
+ Take care whilst brewing to maintain a proper ratio of ingredients. The Wine shall become off-balance if more than one whole of mushroom and one whole of ash is introduced to three wholes of absinthe. One must also take care to protect their eyes, as the Vapors of Ash are a potent irritant.
+ The Wine itself is held to be hallucinogenic, although debate rages within the halls of Roumain on the nature of such. A talented brewer can offset such trivialities by cutting the Wine with water, or introducing another substance once it has been fermented. Many a Hunter holds the drink to purify the soul, and strengthen the mind for days ahead.
+
+
Wine Of Ice
+ The Wine Of Ice is a strong brew formented by the Talent Keo Lanai. Talent Lanai had long found solace from the heat in his visions of the 'Godsforsaken Precipice' that the Ashen Huntsman was said to wander, and sought to share this solace with other Hunters. The flavor is said to be somewhat meaty, with a pleasing current of pepper.
+ Brewing of the Wine Of Ice requires a unique assortment of reagents. By fermenting the fur of a bear within traditionally brewed rice sake, Keo Lanai found a solid base for the introduction of Frozen Pepper Essence. It is said that the original brew produced a cold so potent that frost formed on Lanai's brow.
+ Hunters favor the Wine Of Ice for blessed relief from heat imbibing it provide. Alchemists have theorized that the brew stimulates the production of sweat in the body, allowing the body to cool itself more rapidly. Other Hunters swear by relief seeping into their burns as the brew finds its way into their system. Others find usage in the potent frost that it leaves upon impact, using it to freeze everything from foe to food.
+
+
Lightning's Blessing
+ Lightning's Blessing is said to be a potent stimulant, brewed by Hunter Trackers to allow them to track mobile prey through unknown environments. The flavor is said to be sharp and unrelenting, much like the Hunters who indulge in it.
+ Lightning's Blessing is brewed with a base of Vodka. By taking vodka and fermenting ground down bones within it, a strong alchemical blend is created. This blend is then inoculated with juiced lemon whilst within a distillery. The resulting blend is an environment ripe for a particular strain of Bacterium to multiply in. This strain of the Bacterium is said to be what gives the flavor to the brew, and its digestion produces a high in most sapients.
+ Hunters are said to use Lightning's Blessing as a weapon, where the bacterium, upon being introduced to open air quickly produces an electrical field, shocking whatever the mixture lands upon.
+
+
Hearthflame
+ Hearthflame is Talent Lanai's other great creation. While travelling through the cold of many a fringe world, Lanai sought the warmth of his home, and took the creation of another mixture as a challenge. By taking the hearty fermented blend of an Illestren Apple, The petals of a Fireblossom, and a hint of phosphorous, Lanai produced a potent heating drink.
+ Hearthflame is said to have a bold flavor profile, not unlike an apple shredded apart by tangy pricks. The bacterium is said to stimulate the body and cause it to start heating herself, or in cases of localized exposure, causes rapid, cauterizing heating.
+ When this particular blend is exposed to the air, it rapidly heats up. Hunters have advised Shadows be careful if issued it, and most Alchemists refuse to make it unless it is required for the hunt at hand.
+ Transcribed by Amarasatsu ke Qazawat
+
+ Amarasatsu ke Qazawat
"}
diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/melee/chainsaw.dm
similarity index 76%
rename from code/game/objects/items/chainsaw.dm
rename to code/game/objects/items/melee/chainsaw.dm
index f9181ef3ac6..f0b7019200f 100644
--- a/code/game/objects/items/chainsaw.dm
+++ b/code/game/objects/items/melee/chainsaw.dm
@@ -3,12 +3,13 @@
/obj/item/chainsaw
name = "chainsaw"
desc = "A versatile power tool. Useful for limbing trees and delimbing humans."
- icon_state = "chainsaw_off"
+ icon_state = "chainsaw"
+ icon = 'icons/obj/weapon/axe.dmi'
lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
flags_1 = CONDUCT_1
force = 13
- var/force_on = 24
+ var/active_force = 24
w_class = WEIGHT_CLASS_HUGE
throwforce = 13
throw_speed = 2
@@ -21,35 +22,17 @@
tool_behaviour = TOOL_SAW
toolspeed = 0.5
var/on = FALSE
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/chainsaw/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/chainsaw/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 30, 100, 0, 'sound/weapons/chainsawhit.ogg', TRUE)
AddComponent(/datum/component/two_handed, require_twohands=TRUE)
-/// triggered on wield of two handed item
-/obj/item/chainsaw/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/chainsaw/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
/obj/item/chainsaw/attack_self(mob/user)
on = !on
to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr." : "the chain stops moving."]")
- force = on ? force_on : initial(force)
- throwforce = on ? force_on : initial(force)
+ force = on ? active_force : initial(force)
+ throwforce = on ? active_force : initial(force)
icon_state = "chainsaw_[on ? "on" : "off"]"
var/datum/component/butchering/butchering = src.GetComponent(/datum/component/butchering)
butchering.butchering_enabled = on
@@ -66,14 +49,14 @@
A.UpdateButtonIcon()
/obj/item/chainsaw/get_dismemberment_chance()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
. = ..()
/obj/item/chainsaw/doomslayer
name = "THE GREAT COMMUNICATOR"
desc = "VRRRRRRR!!!"
armour_penetration = 100
- force_on = 30
+ active_force = 30
/obj/item/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(attack_type == PROJECTILE_ATTACK)
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/melee/dualsaber.dm
similarity index 90%
rename from code/game/objects/items/dualsaber.dm
rename to code/game/objects/items/melee/dualsaber.dm
index 7ddb0203592..1959fa81eae 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/melee/dualsaber.dm
@@ -2,7 +2,7 @@
* Double-Bladed Energy Swords - Cheridan
*/
/obj/item/dualsaber
- icon = 'icons/obj/transforming_energy.dmi'
+ icon = 'icons/obj/weapon/energy.dmi'
icon_state = "dualsaber"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
@@ -23,12 +23,11 @@
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
- var/w_class_on = WEIGHT_CLASS_BULKY
+ var/active_w_class = WEIGHT_CLASS_BULKY
var/saber_color = "green"
var/two_hand_force = 34
var/hacked = FALSE
var/list/possible_colors = list("red", "blue", "green", "purple", "yellow")
- var/wielded = FALSE // track wielded status on item
/obj/item/dualsaber/ComponentInitialize()
. = ..()
@@ -43,9 +42,8 @@
if(user.dna.check_mutation(HULK))
to_chat(user, "You lack the grace to wield this!")
return COMPONENT_TWOHANDED_BLOCK_WIELD
- wielded = TRUE
sharpness = IS_SHARP
- w_class = w_class_on
+ w_class = active_w_class
hitsound = 'sound/weapons/blade1.ogg'
START_PROCESSING(SSobj, src)
set_light_on(TRUE)
@@ -56,16 +54,14 @@
/obj/item/dualsaber/proc/on_unwield(obj/item/source, mob/living/carbon/user)
SIGNAL_HANDLER
- wielded = FALSE
sharpness = initial(sharpness)
w_class = initial(w_class)
hitsound = "swing_hit"
STOP_PROCESSING(SSobj, src)
set_light_on(FALSE)
-
/obj/item/dualsaber/update_icon_state()
- icon_state = wielded ? "dualsaber[saber_color]" : "dualsaber"
+ icon_state = HAS_TRAIT(src, TRAIT_WIELDED) ? "dualsaber[saber_color]" : "dualsaber"
return ..()
/obj/item/dualsaber/Initialize()
@@ -94,14 +90,14 @@
if(user.has_dna())
if(user.dna.check_mutation(HULK))
to_chat(user, "You grip the blade too hard and accidentally drop it!")
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
user.dropItemToGround(src, force=TRUE)
return
..()
- if(wielded && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
+ if(HAS_TRAIT(src, TRAIT_WIELDED) && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
impale(user)
return
- if(wielded && prob(50))
+ if(HAS_TRAIT(src, TRAIT_WIELDED) && prob(50))
INVOKE_ASYNC(src, PROC_REF(jedi_spin), user)
/obj/item/dualsaber/proc/jedi_spin(mob/living/user)
@@ -109,18 +105,18 @@
/obj/item/dualsaber/proc/impale(mob/living/user)
to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on [src].")
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
user.take_bodypart_damage(20,25,check_armor = TRUE)
else
user.adjustStaminaLoss(25)
/obj/item/dualsaber/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return ..()
return 0
/obj/item/dualsaber/process()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
if(hacked)
set_light_color(pick(COLOR_SOFT_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER))
open_flame()
@@ -128,12 +124,12 @@
STOP_PROCESSING(SSobj, src)
/obj/item/dualsaber/IsReflect()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return 1
/obj/item/dualsaber/ignition_effect(atom/A, mob/user)
- // same as /obj/item/melee/transforming/energy, mostly
- if(!wielded)
+ // same as /obj/item/melee/energy, mostly
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
return ""
var/in_mouth = ""
if(iscarbon(user))
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index b500eadca2f..1985c3d7ebf 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -1,7 +1,9 @@
-/obj/item/melee/transforming/energy
- icon = 'icons/obj/transforming_energy.dmi'
- hitsound_on = 'sound/weapons/blade1.ogg'
- heat = 3500
+/obj/item/melee/energy
+ sharpness = IS_SHARP
+ w_class = WEIGHT_CLASS_SMALL
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ icon = 'icons/obj/weapon/energy.dmi'
+ heat = 0
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
@@ -10,42 +12,81 @@
light_power = 1
light_on = FALSE
var/sword_color
-
-/obj/item/melee/transforming/energy/Initialize()
+ /// The heat given off when active.
+ var/active_heat = 3500
+
+ /// Force while active.
+ var/active_force = 30
+ /// Throwforce while active.
+ var/active_throwforce = 20
+ /// Sharpness while active.
+ var/active_sharpness = IS_SHARP
+ /// Hitsound played attacking while active.
+ var/active_hitsound = 'sound/weapons/blade1.ogg'
+ /// Weight class while active.
+ var/active_w_class = WEIGHT_CLASS_BULKY
+
+ var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/obj/item/melee/energy/Initialize(mapload)
. = ..()
- if(active)
+ AddComponent( \
+ /datum/component/transforming, \
+ force_on = active_force, \
+ throwforce_on = active_throwforce, \
+ throw_speed_on = 4, \
+ sharpness_on = active_sharpness, \
+ hitsound_on = active_hitsound, \
+ w_class_on = active_w_class, \
+ attack_verb_on = attack_verb_on, \
+ )
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
+ AddElement(/datum/element/update_icon_updates_onmob)
+ if(sharpness)
+ AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
START_PROCESSING(SSobj, src)
-/obj/item/melee/transforming/energy/Destroy()
+/obj/item/melee/energy/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/melee/transforming/energy/add_blood_DNA(list/blood_dna)
- return FALSE
+/obj/item/melee/energy/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
-/obj/item/melee/transforming/energy/get_sharpness()
- return active * sharpness
+ if(active)
+ heat = active_heat
+ START_PROCESSING(SSobj, src)
+ if(sword_color)
+ icon_state = "[base_icon_state][sword_color]"
+ else
+ heat = initial(heat)
+ STOP_PROCESSING(SSobj, src)
-/obj/item/melee/transforming/energy/process()
- open_flame()
+ tool_behaviour = (active ? TOOL_SAW : NONE) //Lets energy weapons cut trees. Also lets them do bonecutting surgery, which is kinda metal!
+ if(user)
+ balloon_alert(user, "[name] [active ? "enabled":"disabled"]")
+ playsound(src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE)
+ set_light_on(active)
+ update_appearance(UPDATE_ICON_STATE)
-/obj/item/melee/transforming/energy/transform_weapon(mob/living/user, supress_message_text)
- . = ..()
- if(.)
- if(active)
- if(sword_color)
- icon_state = "[base_icon_state][sword_color]"
- START_PROCESSING(SSobj, src)
- else
- STOP_PROCESSING(SSobj, src)
- set_light_on(active)
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
+/obj/item/melee/energy/add_blood_DNA(list/blood_dna)
+ return FALSE
+
+/obj/item/melee/energy/get_sharpness()
+ return sharpness
+/obj/item/melee/energy/process(seconds_per_tick)
+ if(heat)
+ open_flame()
-/obj/item/melee/transforming/energy/get_temperature()
- return active * heat
+/obj/item/melee/energy/get_temperature()
+ return heat
-/obj/item/melee/transforming/energy/ignition_effect(atom/A, mob/user)
- if(!active)
+/obj/item/melee/energy/ignition_effect(atom/A, mob/user)
+ if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
return ""
var/in_mouth = ""
@@ -57,28 +98,28 @@
playsound(loc, hitsound, get_clamped_volume(), TRUE, -1)
add_fingerprint(user)
-/obj/item/melee/transforming/energy/axe
+/obj/item/melee/energy/axe
name = "energy axe"
desc = "An energized battle axe."
- icon_state = "axe0"
+ icon_state = "axe"
lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/axes_righthand.dmi'
force = 40
- force_on = 150
+ active_force = 150
throwforce = 25
- throwforce_on = 30
+ active_throwforce = 30
hitsound = 'sound/weapons/bladeslice.ogg'
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
- w_class_on = WEIGHT_CLASS_HUGE
+ active_w_class = WEIGHT_CLASS_HUGE
flags_1 = CONDUCT_1
armour_penetration = 100
- attack_verb_off = list("attacked", "chopped", "cleaved", "torn", "cut")
+ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
attack_verb_on = list()
light_color = LIGHT_COLOR_LIGHT_CYAN
-/obj/item/melee/transforming/energy/sword
+/obj/item/melee/energy/sword
name = "energy sword"
desc = "For when a katana isn't enough. While Nanotrasen and the Syndicate both produce the so-called e-swords, they are visually and functionaly identical."
icon_state = "sword"
@@ -88,7 +129,7 @@
force = 3
throwforce = 5
hitsound = "swing_hit" //it starts deactivated
- attack_verb_off = list("tapped", "poked")
+ attack_verb = list("tapped", "poked")
throw_speed = 3
throw_range = 5
sharpness = IS_SHARP
@@ -96,38 +137,32 @@
armour_penetration = 35
block_chance = 50
-/obj/item/melee/transforming/energy/sword/transform_weapon(mob/living/user, supress_message_text)
- . = ..()
- if(. && active && sword_color)
- icon_state = "[base_icon_state][sword_color]"
-
-/obj/item/melee/transforming/energy/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(active)
+/obj/item/melee/energy/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
return ..()
return 0
-/obj/item/melee/transforming/energy/sword/cyborg
+/obj/item/melee/energy/sword/cyborg
sword_color = "red"
var/hitcost = 50
-/obj/item/melee/transforming/energy/sword/cyborg/attack(mob/M, mob/living/silicon/robot/R)
+/obj/item/melee/energy/sword/cyborg/attack(mob/M, mob/living/silicon/robot/R)
if(R.cell)
var/obj/item/stock_parts/cell/C = R.cell
- if(active && !(C.use(hitcost)))
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE) && !(C.use(hitcost)))
attack_self(R)
to_chat(R, "It's out of charge!")
return
return ..()
-/obj/item/melee/transforming/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs
+/obj/item/melee/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs
name = "energy saw"
desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness."
- force_on = 30
+ active_force = 30
force = 18 //About as much as a spear
hitsound = 'sound/weapons/circsawhit.ogg'
icon = 'icons/obj/surgery.dmi'
- icon_state = "esaw_0"
- icon_state_on = "esaw_1"
+ icon_state = "esaw"
sword_color = null //stops icon from breaking when turned on.
hitcost = 75 //Costs more than a standard cyborg esword
w_class = WEIGHT_CLASS_NORMAL
@@ -136,54 +171,49 @@
tool_behaviour = TOOL_SAW
toolspeed = 0.7 //faster as a saw
-/obj/item/melee/transforming/energy/sword/cyborg/saw/cyborg_unequip(mob/user)
- if(!active)
- return
- transform_weapon(user, TRUE)
-
-/obj/item/melee/transforming/energy/sword/cyborg/saw/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- return 0
+/obj/item/melee/energy/sword/cyborg/saw/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ return FALSE
-/obj/item/melee/transforming/energy/sword/saber
+/obj/item/melee/energy/sword/saber
var/list/possible_colors = list("red" = COLOR_SOFT_RED, "blue" = LIGHT_COLOR_LIGHT_CYAN, "green" = LIGHT_COLOR_GREEN, "purple" = LIGHT_COLOR_LAVENDER, "yellow" = COLOR_YELLOW)
var/hacked = FALSE
-/obj/item/melee/transforming/energy/sword/saber/Initialize(mapload)
+/obj/item/melee/energy/sword/saber/Initialize(mapload)
. = ..()
if(LAZYLEN(possible_colors))
var/set_color = pick(possible_colors)
sword_color = set_color
set_light_color(possible_colors[set_color])
-/obj/item/melee/transforming/energy/sword/saber/process()
+/obj/item/melee/energy/sword/saber/process()
. = ..()
if(hacked)
var/set_color = pick(possible_colors)
set_light_color(possible_colors[set_color])
-/obj/item/melee/transforming/energy/sword/saber/red
+/obj/item/melee/energy/sword/saber/red
possible_colors = list("red" = COLOR_SOFT_RED)
-/obj/item/melee/transforming/energy/sword/saber/blue
+/obj/item/melee/energy/sword/saber/blue
possible_colors = list("blue" = LIGHT_COLOR_LIGHT_CYAN)
-/obj/item/melee/transforming/energy/sword/saber/green
+/obj/item/melee/energy/sword/saber/green
possible_colors = list("green" = LIGHT_COLOR_GREEN)
-/obj/item/melee/transforming/energy/sword/saber/purple
+/obj/item/melee/energy/sword/saber/purple
possible_colors = list("purple" = LIGHT_COLOR_LAVENDER)
-/obj/item/melee/transforming/energy/sword/saber/yellow
+/obj/item/melee/energy/sword/saber/yellow
possible_colors = list("yellow" = COLOR_YELLOW)
-/obj/item/melee/transforming/energy/sword/saber/attackby(obj/item/W, mob/living/user, params)
+/obj/item/melee/energy/sword/saber/attackby(obj/item/W, mob/living/user, params)
if(W.tool_behaviour == TOOL_MULTITOOL)
if(!hacked)
hacked = TRUE
sword_color = "rainbow"
to_chat(user, "RNBW_ENGAGE")
- if(active)
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
icon_state = "[base_icon_state]rainbow"
user.update_inv_hands()
else
@@ -192,39 +222,38 @@
return ..()
-/obj/item/melee/transforming/energy/sword/saber/pirate
+/obj/item/melee/energy/sword/saber/pirate
name = "energy cutlass"
desc = "Arrrr matey."
icon_state = "cutlass"
base_icon_state = "cutlass"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- icon_state_on = "cutlass"
-/obj/item/melee/transforming/energy/sword/saber/pirate/red
+/obj/item/melee/energy/sword/saber/pirate/red
possible_colors = list("red" = COLOR_SOFT_RED)
-/obj/item/melee/transforming/energy/sword/saber/pirate/blue
+/obj/item/melee/energy/sword/saber/pirate/blue
possible_colors = list("blue" = LIGHT_COLOR_LIGHT_CYAN)
-/obj/item/melee/transforming/energy/sword/saber/pirate/green
+/obj/item/melee/energy/sword/saber/pirate/green
possible_colors = list("green" = LIGHT_COLOR_GREEN)
-/obj/item/melee/transforming/energy/sword/saber/pirate/purple
+/obj/item/melee/energy/sword/saber/pirate/purple
possible_colors = list("purple" = LIGHT_COLOR_LAVENDER)
-/obj/item/melee/transforming/energy/sword/saber/pirate/yellow
+/obj/item/melee/energy/sword/saber/pirate/yellow
possible_colors = list("yellow" = COLOR_YELLOW)
-/obj/item/melee/transforming/energy/blade
+/obj/item/melee/energy/blade
name = "energy blade"
desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
- icon_state = "blade"
+ icon_state = "lightblade"
+ item_state = "lightblade"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
force = 30 //Normal attacks deal esword damage
hitsound = 'sound/weapons/blade1.ogg'
- active = 1
throwforce = 1 //Throwing or dropping the item deletes it.
throw_speed = 3
throw_range = 1
@@ -233,30 +262,29 @@
sharpness = IS_SHARP
//Most of the other special functions are handled in their own files. aka special snowflake code so kewl
-/obj/item/melee/transforming/energy/blade/Initialize()
+/obj/item/melee/energy/blade/Initialize()
. = ..()
spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
-/obj/item/melee/transforming/energy/blade/Destroy()
+/obj/item/melee/energy/blade/Destroy()
QDEL_NULL(spark_system)
return ..()
-/obj/item/melee/transforming/energy/blade/transform_weapon(mob/living/user, supress_message_text)
+/obj/item/melee/energy/blade/on_transform(obj/item/source, mob/user, active)
return
-/obj/item/melee/transforming/energy/blade/hardlight
+/obj/item/melee/energy/blade/hardlight
name = "hardlight blade"
desc = "An extremely sharp blade made out of hard light. Packs quite a punch."
icon_state = "lightblade"
item_state = "lightblade"
-/obj/item/melee/transforming/energy/ctf
+/obj/item/melee/energy/ctf
name = "energy sword"
desc = "That cable over there, I'm going to cut it."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "plasmasword0"
+ icon_state = "plasmasword"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
sharpness = IS_SHARP
@@ -265,20 +293,19 @@
force = 0
throwforce = 0
hitsound = "swing_hit" //it starts deactivated
- attack_verb_off = list("tapped", "poked")
+ attack_verb = list("tapped", "poked")
throw_speed = 3
throw_range = 5
- force_on = 200 //instakill if shields are down
+ active_force = 200 //instakill if shields are down
-/obj/item/melee/transforming/energy/ctf/transform_weapon(mob/living/user, supress_message_text)
+/obj/item/melee/energy/ctf/on_transform(obj/item/source, mob/user, active)
. = ..()
- if(. && active)
- icon_state = "plasmasword1"
-
-/obj/item/melee/transforming/energy/ctf/solgov
- armour_penetration = 40
- force_on = 34 //desword grade, but 0 blocking
-
-/obj/item/melee/transforming/energy/ctf/transform_messages(mob/living/user, supress_message_text)
+ if(active)
+ icon_state = "plasmasword_on"
playsound(user, active ? 'sound/weapons/SolGov_sword_arm.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE)
to_chat(user, "[src] [active ? "is now active":"can now be concealed"].")
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
+/obj/item/melee/energy/ctf/solgov
+ armour_penetration = 40
+ active_force = 34 //desword grade, but 0 blocking
diff --git a/code/game/objects/items/energyhalberd.dm b/code/game/objects/items/melee/energyhalberd.dm
similarity index 90%
rename from code/game/objects/items/energyhalberd.dm
rename to code/game/objects/items/melee/energyhalberd.dm
index 416964bbfde..961325d50c1 100644
--- a/code/game/objects/items/energyhalberd.dm
+++ b/code/game/objects/items/melee/energyhalberd.dm
@@ -3,8 +3,9 @@
* Copied mostly from dualsaber.dm to avoid inhertance issues
*/
/obj/item/energyhalberd
- icon = 'icons/obj/transforming_energy.dmi'
+ icon = 'icons/obj/weapon/energy.dmi'
icon_state = "halberd"
+ icon = 'icons/obj/weapon/energy.dmi'
lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
name = "energy halberd"
@@ -25,18 +26,17 @@
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
- var/w_class_on = WEIGHT_CLASS_BULKY
+ var/active_w_class = WEIGHT_CLASS_BULKY
var/halberd_color = "green"
var/two_hand_force = 34
var/hacked = FALSE
var/list/possible_colors = list("red", "blue", "green", "purple", "yellow")
- var/wielded = FALSE // track wielded status on item
/obj/item/energyhalberd/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=force, force_wielded=two_hand_force, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg')
-/// Triggered on wield of two handed item
+
/// Specific hulk checks due to reflection chance for balance issues and switches hitsounds.
/obj/item/energyhalberd/proc/on_halberdwield(obj/item/source, mob/living/carbon/user)
SIGNAL_HANDLER
@@ -45,20 +45,16 @@
if(user.dna.check_mutation(HULK))
to_chat(user, "You lack the grace to wield this!")
return COMPONENT_TWOHANDED_BLOCK_WIELD
- wielded = TRUE
sharpness = IS_SHARP
- w_class = w_class_on
+ w_class = active_w_class
hitsound = 'sound/weapons/blade1.ogg'
START_PROCESSING(SSobj, src)
set_light_on(TRUE)
-/// Triggered on unwield of two handed item
/// switch hitsounds
/obj/item/energyhalberd/proc/on_halberdunwield(obj/item/source, mob/living/carbon/user)
SIGNAL_HANDLER
-
- wielded = FALSE
sharpness = initial(sharpness)
w_class = initial(w_class)
hitsound = "swing_hit"
@@ -67,7 +63,7 @@
/obj/item/energyhalberd/update_icon_state()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
icon_state = "halberd[halberd_color]"
return ..()
else
@@ -100,28 +96,28 @@
if(user.has_dna())
if(user.dna.check_mutation(HULK))
to_chat(user, "You grip the blade too hard and accidentally drop it!")
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
user.dropItemToGround(src, force=TRUE)
return
..()
- if(wielded && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
+ if(HAS_TRAIT(src, TRAIT_WIELDED) && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
impale(user)
return
/obj/item/energyhalberd/proc/impale(mob/living/user)
to_chat(user, "You swing around a bit before losing your balance and impaling yourself on [src].")
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
user.take_bodypart_damage(20,25,check_armor = TRUE)
else
user.adjustStaminaLoss(25)
/obj/item/energyhalberd/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return ..()
return 0
/obj/item/energyhalberd/process()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
if(hacked)
set_light_color(pick(COLOR_SOFT_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER))
open_flame()
@@ -129,12 +125,12 @@
STOP_PROCESSING(SSobj, src)
/obj/item/energyhalberd/IsReflect()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return 1
/obj/item/energyhalberd/ignition_effect(atom/A, mob/user)
- // same as /obj/item/melee/transforming/energy, mostly
- if(!wielded)
+ // same as /obj/item/melee/energy, mostly
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
return ""
var/in_mouth = ""
if(iscarbon(user))
diff --git a/code/game/objects/items/melee/fireaxe.dm b/code/game/objects/items/melee/fireaxe.dm
new file mode 100644
index 00000000000..d58c48c5e4f
--- /dev/null
+++ b/code/game/objects/items/melee/fireaxe.dm
@@ -0,0 +1,100 @@
+/obj/item/melee/axe
+ icon = 'icons/obj/weapon/axe.dmi'
+ lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/axes_righthand.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/back.dmi'
+ force = 5
+ throwforce = 15
+ w_class = WEIGHT_CLASS_BULKY
+ slot_flags = ITEM_SLOT_BACK
+ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ sharpness = IS_SHARP
+ max_integrity = 200
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+ resistance_flags = FIRE_PROOF
+
+/obj/item/melee/axe/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/butchering, 100, 80, 0 , hitsound) //axes are not known for being precision butchering tools
+ AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=24, icon_wielded="[base_icon_state]_w")
+
+/obj/item/melee/axe/update_icon_state()
+ icon_state = "[base_icon_state]"
+ return ..()
+
+/obj/item/melee/axe/afterattack(atom/A, mob/user, proximity)
+ . = ..()
+ if(!proximity)
+ return
+ if(HAS_TRAIT(src, TRAIT_WIELDED)) //destroys windows and grilles in one hit
+ if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille))
+ var/obj/structure/W = A
+ W.obj_destruction("axe")
+
+/obj/item/melee/axe/fire // DEM AXES MAN, marker -Agouri
+ name = "fire axe"
+ desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
+ icon_state = "fireaxe"
+ base_icon_state = "fireaxe"
+
+/obj/item/melee/axe/bone // Blatant imitation of the fireaxe, but made out of bone.
+ name = "bone axe"
+ desc = "A large, vicious axe crafted out of several sharpened bone plates and crudely tied together. Made of monsters, by killing monsters, for killing monsters."
+ icon_state = "bone_axe"
+ base_icon_state = "bone_axe"
+
+/obj/item/melee/axe/scrap
+ name = "scrap axe"
+ desc = "Oversided and with a pretty dull blade, its decent against armour"
+ armour_penetration = 10
+
+/obj/item/melee/axe/scrap/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=22, icon_wielded="[base_icon_state]_w")
+
+/*
+Blunt
+ */
+/obj/item/melee/axe/sledgehammer
+ icon_state = "sledgehammer"
+ base_icon_state = "sledgehammer"
+ name = "breaching sledgehammer"
+ desc = "A large hammer used by the Gorlex Marauder splinters. As powerful as a weapon as it is a shipbreaking and mining tool."
+ force = 5
+ armour_penetration = 40
+ attack_verb = list("bashed", "smashed", "crushed", "smacked")
+ hitsound = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')
+ slot_flags = ITEM_SLOT_BACK
+ sharpness = IS_BLUNT
+ toolspeed = 0.5
+ wall_decon_damage = MINERAL_WALL_INTEGRITY
+ usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
+ var/wielded = FALSE
+
+/obj/item/melee/axe/sledgehammer/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=30, icon_wielded="[base_icon_state]_w")
+
+/obj/item/melee/axe/sledgehammer/Initialize()
+ . = ..()
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
+
+/obj/item/melee/axe/sledgehammer/proc/on_wield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ tool_behaviour = TOOL_MINING
+ wielded = TRUE
+
+/obj/item/melee/axe/sledgehammer/proc/on_unwield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ tool_behaviour = null
+ wielded = FALSE
+
+/obj/item/melee/axe/sledgehammer/attack(mob/living/target, mob/living/user)
+ . = ..()
+ var/atom/throw_target = get_edge_target_turf(target, user.dir)
+ if(!target.anchored)
+ target.throw_at(throw_target, rand(1,2), 2, user, gentle = TRUE)
diff --git a/code/game/objects/items/melee/knife.dm b/code/game/objects/items/melee/knife.dm
new file mode 100644
index 00000000000..b671018d654
--- /dev/null
+++ b/code/game/objects/items/melee/knife.dm
@@ -0,0 +1,203 @@
+/obj/item/melee/knife
+ icon_state = "kitchenknife"
+ item_state = "kitchenknife"
+ icon = 'icons/obj/weapon/knives/knife.dmi'
+ world_file = 'icons/obj/weapon/knives/knife_world.dmi'
+ lefthand_file = 'icons/mob/inhands/weapons/knifes_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/knifes_righthand.dmi'
+ pickup_sound = 'sound/items/handling/knife1_pickup.ogg'
+ drop_sound = 'sound/items/handling/knife3_drop.ogg'
+ flags_1 = CONDUCT_1
+ force = 10
+ w_class = WEIGHT_CLASS_SMALL
+ throwforce = 10
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ throw_speed = 3
+ throw_range = 6
+ custom_materials = list(/datum/material/iron=12000)
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ sharpness = IS_SHARP_ACCURATE
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ item_flags = EYE_STAB
+ tool_behaviour = TOOL_KNIFE
+
+/obj/item/melee/knife/ComponentInitialize()
+ . = ..()
+ set_butchering()
+
+///Adds the butchering component, used to override stats for special cases
+/obj/item/melee/knife/proc/set_butchering()
+ AddComponent(/datum/component/butchering, 80 - force, 100, force - 10) //bonus chance increases depending on force
+
+/obj/item/melee/knife/kitchen
+ name = "kitchen knife"
+ icon_state = "kitchenknife"
+ item_state = "kitchenknife"
+ desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
+
+/obj/item/melee/knife/plastic
+ name = "plastic knife"
+ icon_state = "plastic_knife"
+ desc = "A very safe, barely sharp knife made of plastic. Good for cutting food and not much else."
+ force = 0
+ w_class = WEIGHT_CLASS_TINY
+ throwforce = 0
+ throw_range = 5
+ custom_materials = list(/datum/material/plastic = 100)
+ attack_verb = list("prodded", "whiffed","scratched", "poked")
+ sharpness = IS_SHARP
+ custom_price = 50
+ var/break_chance = 25
+
+/obj/item/melee/knife/plastic/afterattack(mob/living/carbon/user)
+ .=..()
+ if(prob(break_chance))
+ user.visible_message("[user]'s spoon snaps into tiny pieces in their hand.")
+ qdel(src)
+
+
+/obj/item/melee/knife/plastic/afterattack(mob/living/carbon/user)
+ .=..()
+ if(prob(break_chance))
+ user.visible_message("[user]'s knife snaps into tiny pieces in their hand.")
+ qdel(src)
+
+/obj/item/melee/knife/pizza_cutter
+ name = "pizza cutter"
+ icon_state = "pizza_cutter"
+ desc = "A knife edge bent around a circle using the power of science. Perfect for safely cutting pizza."
+ force = 1
+ w_class = WEIGHT_CLASS_SMALL
+ throwforce = 1
+ throw_range = 6
+ custom_materials = list(/datum/material/iron=4000)
+ attack_verb = list("prodded", "whiffed","rolled", "poked")
+ sharpness = IS_SHARP
+
+/obj/item/melee/knife/butcher
+ name = "butcher's cleaver"
+ icon_state = "cleaver"
+ item_state = "cleaver"
+ desc = "A huge thing used for chopping and chopping up meat."
+ flags_1 = CONDUCT_1
+ force = 15
+ throwforce = 10
+ custom_materials = list(/datum/material/iron=18000)
+ attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ w_class = WEIGHT_CLASS_NORMAL
+ custom_price = 600
+
+/obj/item/melee/knife/hunting
+ name = "hunting knife"
+ desc = "Despite its name, it's mainly used for cutting meat from dead prey rather than actual hunting."
+ item_state = "huntingknife"
+ icon_state = "huntingknife"
+
+/obj/item/melee/knife/hunting/set_butchering()
+ AddComponent(/datum/component/butchering, 80 - force, 100, force + 10)
+
+/obj/item/melee/knife/combat
+ name = "combat knife"
+ icon_state = "combatknife"
+ item_state = "combatknife"
+ desc = "A military combat utility survival knife."
+ embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
+ force = 20
+ throwforce = 20
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
+
+/obj/item/melee/knife/survival
+ name = "survival knife"
+ icon_state = "survivalknife"
+ item_state = "survivalknife"
+ embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
+ desc = "A hunting grade survival knife."
+ force = 15
+ throwforce = 15
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
+
+/obj/item/melee/knife/bone
+ name = "bone dagger"
+ item_state = "bone_dagger"
+ icon_state = "bone_dagger"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ desc = "A sharpened bone. The bare minimum in survival."
+ embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
+ force = 15
+ throwforce = 15
+ custom_materials = null
+
+/obj/item/melee/knife/combat/cyborg
+ name = "cyborg knife"
+ icon = 'icons/obj/items_cyborg.dmi'
+ icon_state = "knife_cyborg"
+ desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
+
+/obj/item/melee/knife/shiv
+ name = "glass shiv"
+ icon = 'icons/obj/shards.dmi'
+ icon_state = "shiv"
+ item_state = "shiv"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ desc = "A makeshift glass shiv."
+ force = 8
+ throwforce = 12
+ attack_verb = list("shanked", "shivved")
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ custom_materials = list(/datum/material/glass=400)
+
+/obj/item/melee/knife/shiv/carrot
+ name = "carrot shiv"
+ icon_state = "carrotshiv"
+ item_state = "carrotshiv"
+ icon = 'icons/obj/kitchen.dmi'
+ desc = "Unlike other carrots, you should probably keep this far away from your eyes."
+ custom_materials = null
+
+/obj/item/melee/knife/switchblade
+ name = "switchblade"
+ icon_state = "switchblade"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ world_file = null
+ desc = "A sharp, concealable, spring-loaded knife."
+ flags_1 = CONDUCT_1
+ force = 3
+ w_class = WEIGHT_CLASS_SMALL
+ sharpness = IS_BLUNT
+ throwforce = 5
+ throw_speed = 3
+ throw_range = 6
+ custom_materials = list(/datum/material/iron=12000)
+ hitsound = 'sound/weapons/genhit.ogg'
+ attack_verb = list("stubbed", "poked")
+ resistance_flags = FIRE_PROOF
+
+/obj/item/melee/knife/switchblade/ComponentInitialize()
+ . = ..()
+ AddComponent( \
+ /datum/component/transforming, \
+ force_on = 20, \
+ throwforce_on = 23, \
+ throw_speed_on = 4, \
+ sharpness_on = IS_SHARP, \
+ hitsound_on = 'sound/weapons/bladeslice.ogg', \
+ w_class_on = WEIGHT_CLASS_NORMAL, \
+ attack_verb_on = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut"), \
+ )
+
+/obj/item/melee/knife/letter_opener
+ name = "letter opener"
+ icon = 'icons/obj/items.dmi'
+ world_file = null
+ icon_state = "letter_opener"
+ desc = "A military combat utility survival knife."
+ embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
+ force = 15
+ throwforce = 15
+ unique_reskin = list("Traditional" = "letter_opener",
+ "Boxcutter" = "letter_opener_b",
+ "Corporate" = "letter_opener_a"
+ )
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 9d90a1a4337..13d4ac99fe1 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -1,6 +1,11 @@
/obj/item/melee
item_flags = NEEDS_PERMIT
+ icon = 'icons/obj/weapon/misc.dmi'
+ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
+ var/projectile_block_chance = 0
+//cruft
/obj/item/melee/proc/check_martial_counter(mob/living/carbon/human/target, mob/living/carbon/human/user)
if(target.check_block())
target.visible_message("[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!",
@@ -8,14 +13,17 @@
user.Stun(40)
return TRUE
+//This is only pathed here because there is currently only melee using it, the second you want to add charged to something just make it /obj/item/get_cell()
+/obj/item/melee/get_cell()
+ var/datum/component/transforming/charged/charged_comp = GetComponent(/datum/component/transforming/charged)
+ if(charged_comp)
+ return charged_comp.cell
/obj/item/melee/chainofcommand
name = "chain of command"
desc = "A tool used by great men to placate the frothing masses."
icon_state = "chain"
item_state = "chain"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
force = 10
@@ -44,487 +52,11 @@
. = ..()
AddComponent(/datum/component/butchering, 60, 80) //very imprecise
-/obj/item/melee/sabre
- name = "officer's sabre"
- desc = "An elegant weapon, its monomolecular edge is capable of cutting through flesh and bone with ease."
- icon_state = "sabre"
- item_state = "sabre"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- pickup_sound = 'sound/items/unsheath.ogg'
- drop_sound = 'sound/items/handling/metal_drop.ogg'
- flags_1 = CONDUCT_1
- obj_flags = UNIQUE_RENAME
- force = 15
- throwforce = 10
- w_class = WEIGHT_CLASS_BULKY
- block_chance = 60
- armour_penetration = 75
- sharpness = IS_SHARP
- attack_verb = list("slashed", "cut")
- hitsound = 'sound/weapons/rapierhit.ogg'
- custom_materials = list(/datum/material/iron = 1000)
-
-/obj/item/melee/sabre/Initialize()
- . = ..()
- AddComponent(/datum/component/butchering, 30, 95, 5) //fast and effective, but as a sword, it might damage the results.
-
-/obj/item/melee/sabre/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(attack_type == PROJECTILE_ATTACK)
- final_block_chance = 0 //Don't bring a sword to a gunfight
- return ..()
-
-/obj/item/melee/sabre/on_enter_storage(datum/component/storage/concrete/S)
- var/obj/item/storage/belt/sabre/B = S.real_location()
- if(istype(B))
- playsound(B, 'sound/items/sheath.ogg', 25, TRUE)
-
-/obj/item/melee/sabre/solgov
- name = "solarian sabre"
- desc = "A refined ceremonial blade often given to soldiers and high ranking officials of SolGov."
- icon_state = "sabresolgov"
- item_state = "sabresolgov"
-
-/obj/item/melee/sabre/suns
- name = "SUNS sabre"
- desc = "A blade of Solarian origin given to SUNS followers."
- icon_state = "suns-sabre"
- item_state = "suns-sabre"
-
-/obj/item/melee/sabre/suns/captain
- name = "SUNS captain sabre"
- desc = "An elegant blade awarded to SUNS captains. Despite its higher craftmanship, it appears to be just as effective as a normal sabre."
- icon_state = "suns-capsabre"
- item_state = "suns-capsabre"
-
-/obj/item/melee/sabre/suns/cmo
- name = "SUNS stick sabre"
- desc = "A thin blade used by SUNS medical instructors."
- icon_state = "suns-swordstick"
- item_state = "suns-swordstick"
-
-/obj/item/melee/sabre/suns/telescopic
- name = "telescopic sabre"
- desc = "A telescopic and retractable blade given to SUNS peacekeepers for easy concealment and carry. It's design makes it slightly less effective than normal sabres sadly, however it is still excelent at piercing armor."
- icon_state = "suns-tsword"
- item_state = "suns-tsword"
- force = 0
- throwforce = 0
- block_chance = 0
-
- slot_flags = ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("smacked", "prodded")
-
-
- var/extended = FALSE
- var/extend_sound = 'sound/weapons/batonextend.ogg'
-
-
-
- var/on_icon_state = "suns-tsword_ext"
- var/on_item_state = "suns-tsword_ext"
- var/off_icon_state = "suns-tsword"
- var/off_item_state = "suns-tsword"
-
- var/force_on = 10
- var/on_throwforce = 10
- var/on_blockchance = 40
-
- var/force_off = 0
- var/off_throwforce = 0
- var/off_blockchance = 0
-
- var/weight_class_on = WEIGHT_CLASS_BULKY
-
-/obj/item/melee/sabre/suns/telescopic/attack_self(mob/user)
- extended = !extended
-
- if(extended)
- to_chat(user, "You extend the [src].")
- icon_state = on_icon_state
- item_state = on_item_state
- slot_flags = 0
- w_class = weight_class_on
- force = force_on
- throwforce = on_throwforce
- block_chance = on_blockchance
- attack_verb = list("slashed", "cut")
- else
- to_chat(user, "You collapse the [src].")
- icon_state = off_icon_state
- item_state = off_item_state
- slot_flags = ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- force = force_off
- throwforce = off_throwforce
- block_chance = off_blockchance
- attack_verb = list("smacked", "prodded")
-
- playsound(get_turf(src), extend_sound, 50, TRUE)
- add_fingerprint(user)
-
-/obj/item/melee/beesword
- name = "The Stinger"
- desc = "Taken from a giant bee and folded over one thousand times in pure honey. Can sting through anything."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "beesword"
- item_state = "stinger"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- slot_flags = ITEM_SLOT_BELT
- force = 5
- w_class = WEIGHT_CLASS_BULKY
- sharpness = IS_SHARP
- throwforce = 10
- block_chance = 20
- armour_penetration = 65
- attack_verb = list("slashed", "stung", "prickled", "poked")
- hitsound = 'sound/weapons/rapierhit.ogg'
-
-/obj/item/melee/beesword/afterattack(atom/target, mob/user, proximity)
- . = ..()
- if(!proximity)
- return
- user.changeNext_move(CLICK_CD_RAPID)
- if(iscarbon(target))
- var/mob/living/carbon/H = target
- H.reagents.add_reagent(/datum/reagent/toxin, 4)
-
-/obj/item/melee/classic_baton
- name = "police baton"
- desc = "A wooden truncheon for beating criminal scum."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "classic_baton"
- item_state = "classic_baton"
- lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
- slot_flags = ITEM_SLOT_BELT
- force = 12 //9 hit crit
- w_class = WEIGHT_CLASS_NORMAL
-
- var/cooldown_check = 0 // Used interally, you don't want to modify
-
- var/cooldown = 40 // Default wait time until can stun again.
- var/knockdown_time_carbon = (1.5 SECONDS) // Knockdown length for carbons.
- var/stun_time_silicon = (5 SECONDS) // If enabled, how long do we stun silicons.
- var/stamina_damage = 55 // Do we deal stamina damage.
- var/affect_silicon = FALSE // Does it stun silicons.
- var/on_sound // "On" sound, played when switching between able to stun or not.
- var/on_stun_sound = 'sound/effects/woodhit.ogg' // Default path to sound for when we stun.
- var/stun_animation = TRUE // Do we animate the "hit" when stunning.
- var/on = TRUE // Are we on or off.
-
- var/on_icon_state // What is our sprite when turned on
- var/off_icon_state // What is our sprite when turned off
- var/on_item_state // What is our in-hand sprite when turned on
- var/force_on // Damage when on - not stunning
- var/force_off // Damage when off - not stunning
- var/weight_class_on // What is the new size class when turned on
-
-// Description for trying to stun when still on cooldown.
-/obj/item/melee/classic_baton/proc/get_wait_description()
- return
-
-// Description for when turning their baton "on"
-/obj/item/melee/classic_baton/proc/get_on_description()
- . = list()
-
- .["local_on"] = "You extend the baton."
- .["local_off"] = "You collapse the baton."
-
- return .
-
-// Default message for stunning mob.
-/obj/item/melee/classic_baton/proc/get_stun_description(mob/living/target, mob/living/user)
- . = list()
-
- .["visible"] = "[user] knocks [target] down with [src]!"
- .["local"] = "[user] knocks you down with [src]!"
-
- return .
-
-// Default message for stunning a silicon.
-/obj/item/melee/classic_baton/proc/get_silicon_stun_description(mob/living/target, mob/living/user)
- . = list()
-
- .["visible"] = "[user] pulses [target]'s sensors with the baton!"
- .["local"] = "You pulse [target]'s sensors with the baton!"
-
- return .
-
-// Are we applying any special effects when we stun to carbon
-/obj/item/melee/classic_baton/proc/additional_effects_carbon(mob/living/target, mob/living/user)
- return
-
-// Are we applying any special effects when we stun to silicon
-/obj/item/melee/classic_baton/proc/additional_effects_silicon(mob/living/target, mob/living/user)
- return
-
-/obj/item/melee/classic_baton/attack(mob/living/target, mob/living/user)
- if(!on)
- return ..()
-
- add_fingerprint(user)
- if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
- to_chat(user, "You hit yourself over the head!")
-
- user.Paralyze(knockdown_time_carbon * force)
- user.apply_damage(stamina_damage, STAMINA, BODY_ZONE_HEAD)
-
- additional_effects_carbon(user) // user is the target here
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- H.apply_damage(2*force, BRUTE, BODY_ZONE_HEAD)
- else
- user.take_bodypart_damage(2*force)
- return
- if(iscyborg(target))
- // We don't stun if we're on harm.
- if (user.a_intent != INTENT_HARM)
- if (affect_silicon)
- var/list/desc = get_silicon_stun_description(target, user)
-
- target.flash_act(affect_silicon = TRUE)
- target.Paralyze(stun_time_silicon)
- additional_effects_silicon(target, user)
-
- user.visible_message(desc["visible"], desc["local"])
- playsound(get_turf(src), on_stun_sound, 100, TRUE, -1)
-
- if (stun_animation)
- user.do_attack_animation(target)
- else
- ..()
- else
- ..()
- return
- if(!isliving(target))
- return
- if (user.a_intent == INTENT_HARM)
- if(!..())
- return
- if(!iscyborg(target))
- return
- else
- if(cooldown_check <= world.time)
- if(ishuman(target))
- var/mob/living/carbon/human/H = target
- if (H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
- return
- if(check_martial_counter(H, user))
- return
-
- var/list/desc = get_stun_description(target, user)
-
- if (stun_animation)
- user.do_attack_animation(target)
-
- playsound(get_turf(src), on_stun_sound, 75, TRUE, -1)
- target.Knockdown(knockdown_time_carbon)
- target.apply_damage(stamina_damage, STAMINA, BODY_ZONE_CHEST)
- additional_effects_carbon(target, user)
-
- log_combat(user, target, "stunned", src)
- add_fingerprint(user)
-
- target.visible_message(desc["visible"], desc["local"])
-
- if(!iscarbon(user))
- target.LAssailant = null
- else
- target.LAssailant = WEAKREF(user)
- cooldown_check = world.time + cooldown
- else
- var/wait_desc = get_wait_description()
- if (wait_desc)
- to_chat(user, wait_desc)
-
-/obj/item/conversion_kit
- name = "conversion kit"
- desc = "A strange box containing wood working tools and an instruction paper to turn stun batons into something else."
- icon = 'icons/obj/storage.dmi'
- icon_state = "uk"
- custom_price = 450
-
-/obj/item/melee/classic_baton/telescopic
- name = "telescopic baton"
- desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "telebaton_0"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- item_state = null
- slot_flags = ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- item_flags = NONE
- force = 0
- on = FALSE
- on_sound = 'sound/weapons/batonextend.ogg'
-
- on_icon_state = "telebaton_1"
- off_icon_state = "telebaton_0"
- on_item_state = "nullrod"
- force_on = 10
- force_off = 0
- weight_class_on = WEIGHT_CLASS_BULKY
-
-/obj/item/melee/classic_baton/telescopic/attack_self(mob/user)
- on = !on
- var/list/desc = get_on_description()
-
- if(on)
- to_chat(user, desc["local_on"])
- icon_state = on_icon_state
- item_state = on_item_state
- w_class = weight_class_on
- force = force_on
- attack_verb = list("smacked", "struck", "cracked", "beaten")
- else
- to_chat(user, desc["local_off"])
- icon_state = off_icon_state
- item_state = null //no sprite for concealment even when in hand
- slot_flags = ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- force = force_off
- attack_verb = list("hit", "poked")
-
- playsound(src.loc, on_sound, 50, TRUE)
- add_fingerprint(user)
-
-/obj/item/melee/classic_baton/telescopic/contractor_baton
- name = "contractor baton"
- desc = "A compact, specialised baton assigned to Syndicate contractors. Applies light electrical shocks to targets."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "contractor_baton_0"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- item_state = null
- slot_flags = ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- item_flags = NONE
- force = 5
-
- cooldown = 25
- stamina_damage = 85
- affect_silicon = TRUE
- on_sound = 'sound/weapons/contractorbatonextend.ogg'
- on_stun_sound = 'sound/effects/contractorbatonhit.ogg'
-
- on_icon_state = "contractor_baton_1"
- off_icon_state = "contractor_baton_0"
- on_item_state = "contractor_baton"
- force_on = 16
- force_off = 5
- weight_class_on = WEIGHT_CLASS_NORMAL
-
-/obj/item/melee/classic_baton/telescopic/contractor_baton/get_wait_description()
- return "The baton is still charging!"
-
-/obj/item/melee/classic_baton/telescopic/contractor_baton/additional_effects_carbon(mob/living/target, mob/living/user)
- target.Jitter(20)
- target.stuttering += 20
-
-/obj/item/melee/supermatter_sword
- name = "supermatter sword"
- desc = "In a universe full of bad ideas, this might just be the worst."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "supermatter_sword"
- item_state = "supermatter_sword"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- slot_flags = null
- w_class = WEIGHT_CLASS_BULKY
- force = 0.001
- armour_penetration = 1000
- var/obj/machinery/power/supermatter_crystal/shard
- var/balanced = 1
- force_string = "INFINITE"
-
-/obj/item/melee/supermatter_sword/Initialize()
- . = ..()
- shard = new /obj/machinery/power/supermatter_crystal(src)
- qdel(shard.countdown)
- shard.countdown = null
- START_PROCESSING(SSobj, src)
- visible_message("[src] appears, balanced ever so perfectly on its hilt. This isn't ominous at all.")
-
-/obj/item/melee/supermatter_sword/process()
- if(balanced || throwing || ismob(src.loc) || isnull(src.loc))
- return
- if(!isturf(src.loc))
- var/atom/target = src.loc
- forceMove(target.loc)
- consume_everything(target)
- else
- var/turf/T = get_turf(src)
- if(!isspaceturf(T))
- consume_turf(T)
-
-/obj/item/melee/supermatter_sword/afterattack(target, mob/user, proximity_flag)
- . = ..()
- if(user && target == user)
- user.dropItemToGround(src)
- if(proximity_flag)
- consume_everything(target)
-
-/obj/item/melee/supermatter_sword/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- ..()
- if(ismob(hit_atom))
- var/mob/M = hit_atom
- if(src.loc == M)
- M.dropItemToGround(src)
- consume_everything(hit_atom)
-
-/obj/item/melee/supermatter_sword/pickup(user)
- ..()
- balanced = 0
-
-/obj/item/melee/supermatter_sword/ex_act(severity, target)
- visible_message("The blast wave smacks into [src] and rapidly flashes to ash.",\
- "You hear a loud crack as you are washed with a wave of heat.")
- consume_everything()
-
-/obj/item/melee/supermatter_sword/acid_act()
- visible_message("The acid smacks into [src] and rapidly flashes to ash.",\
- "You hear a loud crack as you are washed with a wave of heat.")
- consume_everything()
-
-/obj/item/melee/supermatter_sword/bullet_act(obj/projectile/P)
- visible_message("[P] smacks into [src] and rapidly flashes to ash.",\
- "You hear a loud crack as you are washed with a wave of heat.")
- consume_everything(P)
- return BULLET_ACT_HIT
-
-
-/obj/item/melee/supermatter_sword/proc/consume_everything(target)
- if(isnull(target))
- shard.Consume()
- else if(!isturf(target))
- shard.Bumped(target)
- else
- consume_turf(target)
-
-/obj/item/melee/supermatter_sword/proc/consume_turf(turf/T)
- var/oldtype = T.type
- var/turf/newT = T.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
- if(newT.type == oldtype)
- return
- playsound(T, 'sound/effects/supermatter.ogg', 50, TRUE)
- T.visible_message("[T] smacks into [src] and rapidly flashes to ash.",\
- "You hear a loud crack as you are washed with a wave of heat.")
- shard.Consume()
-
-/obj/item/melee/supermatter_sword/add_blood_DNA(list/blood_dna)
- return FALSE
-
/obj/item/melee/curator_whip
name = "curator's whip"
desc = "Somewhat eccentric and outdated, it still stings like hell to be hit by."
icon_state = "whip"
item_state = "chain"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
force = 15
w_class = WEIGHT_CLASS_NORMAL
@@ -538,345 +70,128 @@
H.drop_all_held_items()
H.visible_message("[user] disarms [H]!", "[user] disarmed you!")
-/obj/item/melee/roastingstick
- name = "advanced roasting stick"
- desc = "A telescopic roasting stick with a miniature shield generator designed to ensure entry into various high-tech shielded cooking ovens and firepits."
- icon_state = "roastingstick_0"
- item_state = "null"
+/obj/item/melee/cleric_mace
+ name = "cleric mace"
+ desc = "The grandson of the club, yet the grandfather of the baseball bat. Most notably used by holy orders in days past."
+ icon_state = "mace_greyscale"
+ item_state = "mace_greyscale"
+ material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS //Material type changes the prefix as well as the color.
+ custom_materials = list(/datum/material/iron = 12000) //Defaults to an Iron Mace.
slot_flags = ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- item_flags = NONE
- force = 0
- attack_verb = list("hit", "poked")
- var/obj/item/reagent_containers/food/snacks/sausage/held_sausage
- var/static/list/ovens
- var/on = FALSE
- var/datum/beam/beam
-
-/obj/item/melee/roastingstick/Initialize()
- . = ..()
- if (!ovens)
- ovens = typecacheof(list(/obj/singularity, /obj/machinery/power/supermatter_crystal, /obj/structure/bonfire))
-
-/obj/item/melee/roastingstick/attack_self(mob/user)
- on = !on
- if(on)
- extend(user)
- else
- if (held_sausage)
- to_chat(user, "You can't retract [src] while [held_sausage] is attached!")
- return
- retract(user)
-
- playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
- add_fingerprint(user)
-
-/obj/item/melee/roastingstick/attackby(atom/target, mob/user)
- ..()
- if (istype(target, /obj/item/reagent_containers/food/snacks/sausage))
- if (!on)
- to_chat(user, "You must extend [src] to attach anything to it!")
- return
- if (held_sausage)
- to_chat(user, "[held_sausage] is already attached to [src]!")
- return
- if (user.transferItemToLoc(target, src))
- held_sausage = target
- else
- to_chat(user, "[target] doesn't seem to want to get on [src]!")
- update_appearance()
-
-/obj/item/melee/roastingstick/attack_hand(mob/user)
- ..()
- if (held_sausage)
- user.put_in_hands(held_sausage)
- held_sausage = null
- update_appearance()
-
-/obj/item/melee/roastingstick/update_overlays()
- . = ..()
- if (held_sausage)
- . += mutable_appearance(icon, "roastingstick_sausage")
-
-/obj/item/melee/roastingstick/proc/extend(user)
- to_chat(user, "You extend [src].")
- icon_state = "roastingstick_1"
- item_state = "nullrod"
+ force = 14
w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/melee/roastingstick/proc/retract(user)
- to_chat(user, "You collapse [src].")
- icon_state = "roastingstick_0"
- item_state = null
- w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/melee/roastingstick/handle_atom_del(atom/target)
- if (target == held_sausage)
- held_sausage = null
- update_appearance()
-
-/obj/item/melee/roastingstick/afterattack(atom/target, mob/user, proximity)
- . = ..()
- if (!on)
- return
- if (is_type_in_typecache(target, ovens))
- if (held_sausage && held_sausage.roasted)
- to_chat(src, "Your [held_sausage] has already been cooked!")
- return
- if (istype(target, /obj/singularity) && get_dist(user, target) < 10)
- to_chat(user, "You send [held_sausage] towards [target].")
- playsound(src, 'sound/items/rped.ogg', 50, TRUE)
- beam = user.Beam(target,icon_state="rped_upgrade",time=100)
- else if (user.Adjacent(target))
- to_chat(user, "You extend [src] towards [target].")
- playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
- else
- return
- if(do_after(user, 100, target = user))
- finish_roasting(user, target)
- else
- QDEL_NULL(beam)
- playsound(src, 'sound/weapons/batonextend.ogg', 50, TRUE)
-
-/obj/item/melee/roastingstick/proc/finish_roasting(user, atom/target)
- to_chat(user, "You finish roasting [held_sausage].")
- playsound(src,'sound/items/welder2.ogg',50,TRUE)
- held_sausage.add_atom_colour(rgb(103,63,24), FIXED_COLOUR_PRIORITY)
- held_sausage.name = "[target.name]-roasted [held_sausage.name]"
- held_sausage.desc = "[held_sausage.desc] It has been cooked to perfection on \a [target]."
- update_appearance()
-
-/obj/item/melee/greykingsword
- name = "blade of the grey-king"
- desc = "A legendary sword made with 3 replica katanas nailed together and dipped in heavy narcotics."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "grey_sword"
- item_state = "swordoff"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- flags_1 = CONDUCT_1
- slot_flags = ITEM_SLOT_BACK
- force = 15
throwforce = 8
- w_class = WEIGHT_CLASS_NORMAL
- block_chance = 30
- attack_verb = list("struck", "slashed", "mall-ninjad", "tided", "multi-shanked", "shredded")
- custom_materials = list(/datum/material/iron = 1420)
- sharpness = IS_SHARP
-
- var/prick_chance = 50
- var/prick_chems = list(
- /datum/reagent/toxin = 10,
- /datum/reagent/toxin/mindbreaker = 10,
- /datum/reagent/drug/space_drugs = 10,
- /datum/reagent/drug/crank = 5,
- /datum/reagent/drug/methamphetamine = 5,
- /datum/reagent/drug/bath_salts = 5,
- /datum/reagent/drug/aranesp = 5,
- /datum/reagent/drug/pumpup = 10,
- /datum/reagent/medicine/omnizine = 10,
- /datum/reagent/medicine/earthsblood = 15,
- /datum/reagent/medicine/omnizine/protozine = 15
- )
-
-/obj/item/melee/greykingsword/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if (iscarbon(target) && prob(prick_chance))
- var/mob/living/carbon/C = target
- var/datum/reagent/R = pick(prick_chems)
- C.reagents.add_reagent(R, prick_chems[R])
- C.visible_message("[user] is pricked!", \
- "You've been pricked by the [src]!")
- log_combat(user, C, "pricked", src.name, "with [prick_chems[R]]u of [R]")
- return ..()
-
-
-/obj/item/melee/greykingsword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text, final_block_chance, damage, attack_type)
- if(attack_type == PROJECTILE_ATTACK)
- final_block_chance = 1 //Still not like your Japaniese animes though.
- return ..()
-
-/obj/item/kitchen/knife/letter_opener
- name = "letter opener"
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "letter_opener"
- desc = "A military combat utility survival knife."
- embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
- force = 15
- throwforce = 15
- unique_reskin = list("Traditional" = "letter_opener",
- "Boxcutter" = "letter_opener_b",
- "Corporate" = "letter_opener_a"
- )
-/obj/item/melee/weebstick
- name = "Weeb Stick"
- desc = "Glorious nippon steel, folded 1000 times."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "weeb_blade"
- item_state = "weeb_blade"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- pickup_sound = 'sound/items/handling/knife2_pickup.ogg'
- drop_sound = 'sound/items/handling/metal_drop.ogg'
- flags_1 = CONDUCT_1
- obj_flags = UNIQUE_RENAME
- w_class = WEIGHT_CLASS_BULKY
- slot_flags = ITEM_SLOT_BACK
- sharpness = IS_SHARP_ACCURATE
- force = 25
- throw_speed = 4
- throw_range = 5
- throwforce = 12
- block_chance = 20
armour_penetration = 50
- hitsound = 'sound/weapons/anime_slash.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "diced", "cut")
+ attack_verb = list("smacked", "struck", "cracked", "beaten")
+ var/overlay_state = "mace_handle"
+ var/mutable_appearance/overlay
-/obj/item/melee/weebstick/Initialize()
+/obj/item/melee/cleric_mace/Initialize()
. = ..()
- AddComponent(/datum/component/butchering, 25, 90, 5) //Not made for scalping victims, but will work nonetheless
-
-/obj/item/melee/weebstick/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(attack_type == PROJECTILE_ATTACK)
- final_block_chance = block_chance / 2 //Pretty good...
- return ..()
-
-/obj/item/melee/weebstick/on_exit_storage(datum/component/storage/concrete/S)
- var/obj/item/storage/belt/weebstick/B = S.real_location()
- if(istype(B))
- playsound(B, 'sound/items/unsheath.ogg', 25, TRUE)
-
-/obj/item/melee/weebstick/on_enter_storage(datum/component/storage/concrete/S)
- var/obj/item/storage/belt/weebstick/B = S.real_location()
- if(istype(B))
- playsound(B, 'sound/items/sheath.ogg', 25, TRUE)
-
-/obj/item/storage/belt/weebstick
- name = "nanoforged blade sheath"
- desc = "It yearns to bath in the blood of your enemies... but you hold it back!"
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "weeb_sheath"
- item_state = "sheath"
- w_class = WEIGHT_CLASS_BULKY
- force = 3
- var/primed = FALSE //Prerequisite to anime bullshit
- // ##The anime bullshit## - Mostly stolen from action/innate/dash
- var/dash_sound = 'sound/weapons/unsheathed_blade.ogg'
- var/beam_effect = "blood_beam"
- var/phasein = /obj/effect/temp_visual/dir_setting/cult/phase
- var/phaseout = /obj/effect/temp_visual/dir_setting/cult/phase
-
-/obj/item/storage/belt/weebstick/ComponentInitialize()
- . = ..()
- AddElement(/datum/element/update_icon_updates_onmob)
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 1
- STR.use_sound = null
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
- /obj/item/melee/weebstick
- ))
+ overlay = mutable_appearance(icon, overlay_state)
+ overlay.appearance_flags = RESET_COLOR
+ add_overlay(overlay)
+
+/obj/item/melee/baseball_bat
+ name = "baseball bat"
+ desc = "There ain't a skull in the league that can withstand a swatter."
+ icon = 'icons/obj/weapon/blunt.dmi'
+ icon_state = "baseball_bat"
+ item_state = "baseball_bat"
+ force = 12
+ throwforce = 12
+ attack_verb = list("beat", "smacked")
+ custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 3.5)
+ w_class = WEIGHT_CLASS_HUGE
+ var/homerun_ready = FALSE
+ var/homerun_able = FALSE
-/obj/item/storage/belt/weebstick/examine(mob/user)
- . = ..()
- if(length(contents))
- . += "Use [src] in-hand to prime for an opening strike."
- . += "Alt-click it to quickly draw the blade."
+/obj/item/melee/baseball_bat/homerun
+ name = "home run bat"
+ desc = "This thing looks dangerous... Dangerously good at baseball, that is."
+ homerun_able = 1
-/obj/item/storage/belt/weebstick/AltClick(mob/user)
- if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)) || primed)
+/obj/item/melee/baseball_bat/attack_self(mob/user)
+ if(!homerun_able)
+ ..()
return
- if(length(contents))
- var/obj/item/I = contents[1]
- playsound(user, dash_sound, 25, TRUE)
- user.visible_message("[user] swiftly draws \the [I].", "You draw \the [I].")
- user.put_in_hands(I)
- update_appearance()
- else
- to_chat(user, "[src] is empty!")
-
-/obj/item/storage/belt/weebstick/attack_self(mob/user)
- if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+ if(homerun_ready)
+ to_chat(user, "You're already ready to do a home run!")
+ ..()
return
- if(length(contents))
- var/datum/component/storage/CP = GetComponent(/datum/component/storage)
- if(primed)
- CP.locked = FALSE
- playsound(user, 'sound/items/sheath.ogg', 25, TRUE)
- to_chat(user, "You return your stance.")
- primed = FALSE
- update_appearance()
- else
- CP.locked = TRUE //Prevents normal removal of the blade while primed
- playsound(user, 'sound/items/unsheath.ogg', 25, TRUE)
- user.visible_message("[user] grips the blade within [src] and primes to attack.", "You take an opening stance...", "You hear a weapon being drawn...")
- primed = TRUE
- update_appearance()
- else
- to_chat(user, "[src] is empty!")
+ to_chat(user, "You begin gathering strength...")
+ playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, TRUE)
+ if(do_after(user, 90, target = src))
+ to_chat(user, "You gather power! Time for a home run!")
+ homerun_ready = 1
+ ..()
-/obj/item/storage/belt/weebstick/afterattack(atom/A, mob/living/user, proximity_flag, params)
+/obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user)
. = ..()
- if(primed && length(contents))
- if(!(A in view(user.client.view, user)))
- return
- var/obj/item/I = contents[1]
- if(!user.put_in_inactive_hand(I))
- to_chat(user, "You need a free hand!")
- return
- var/datum/component/storage/CP = GetComponent(/datum/component/storage)
- CP.locked = FALSE
- primed = FALSE
- update_appearance()
- primed_attack(A, user)
- if(CanReach(A, I))
- I.melee_attack_chain(user, A, params)
- user.swap_hand()
-
-/obj/item/storage/belt/weebstick/proc/primed_attack(atom/target, mob/living/user)
- var/turf/end = get_turf(user)
- var/turf/start = get_turf(user)
- var/obj/spot1 = new phaseout(start, user.dir)
- var/halt = FALSE
- // Stolen dash code
- for(var/T in getline(start, get_turf(target)))
- var/turf/tile = T
- for(var/mob/living/victim in tile)
- if(victim != user)
- playsound(victim, 'sound/weapons/anime_slash.ogg', 10, TRUE)
- victim.take_bodypart_damage(15)
- // Unlike actual ninjas, we stop noclip-dashing here.
- if(isclosedturf(T))
- halt = TRUE
- for(var/obj/O in tile)
- // We ignore mobs as we are cutting through them
- if(!O.CanPass(user, tile))
- halt = TRUE
- if(halt)
- break
- else
- end = T
- user.forceMove(end) // YEET
- playsound(start, dash_sound, 35, TRUE)
- var/obj/spot2 = new phasein(end, user.dir)
- spot1.Beam(spot2, beam_effect, time=20)
- user.visible_message("In a flash of red, [user] draws [user.p_their()] blade!", "You dash forward while drawing your weapon!", "You hear a blade slice through the air at impossible speeds!")
+ var/atom/throw_target = get_edge_target_turf(target, user.dir)
+ if(homerun_ready)
+ user.visible_message("It's a home run!")
+ target.throw_at(throw_target, rand(8,10), 14, user)
+ SSexplosions.medturf += throw_target
+ playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, TRUE)
+ homerun_ready = 0
+ return
+ else if(!target.anchored)
+ target.throw_at(throw_target, rand(1,2), 2, user, gentle = TRUE)
+
+/obj/item/melee/baseball_bat/ablative
+ name = "metal baseball bat"
+ desc = "This bat is made of highly reflective, highly armored material."
+ icon_state = "baseball_bat_metal"
+ item_state = "baseball_bat_metal"
+ force = 12
+ throwforce = 15
-/obj/item/storage/belt/weebstick/update_icon_state()
- icon_state = "weeb_sheath"
- item_state = "sheath"
- if(contents.len)
- if(primed)
- icon_state += "-primed"
- else
- icon_state += "-blade"
- item_state += "-sabre"
- return ..()
+/obj/item/melee/baseball_bat/bone
+ name = "bone club"
+ desc = "A long and hard shaft of rock solid bone." // I am the master of comedy
+ icon_state = "baseball_bat_bone"
+ item_state = "baseball_bat_bone"
+
+/obj/item/melee/baseball_bat/ablative/IsReflect()//some day this will reflect thrown items instead of lasers
+ var/picksound = rand(1,2)
+ var/turf = get_turf(src)
+ if(picksound == 1)
+ playsound(turf, 'sound/weapons/effects/batreflect1.ogg', 50, TRUE)
+ if(picksound == 2)
+ playsound(turf, 'sound/weapons/effects/batreflect2.ogg', 50, TRUE)
+ return 1
+
+/obj/item/melee/flyswatter
+ name = "flyswatter"
+ desc = "Useful for killing insects of all sizes."
+ icon_state = "flyswatter"
+ item_state = "flyswatter"
+ force = 1
+ throwforce = 1
+ attack_verb = list("swatted", "smacked")
+ hitsound = 'sound/effects/snap.ogg'
+ w_class = WEIGHT_CLASS_SMALL
+ //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc.
+ var/list/strong_against
-/obj/item/storage/belt/weebstick/PopulateContents()
- //Time to generate names now that we have the sword
- var/n_title = pick(GLOB.ninja_titles)
- var/n_name = pick(GLOB.ninja_names)
- var/obj/item/melee/weebstick/sword = new /obj/item/melee/weebstick(src)
- sword.name = "[n_title] blade of clan [n_name]"
- name = "[n_title] scabbard of clan [n_name]"
- update_appearance()
+/obj/item/melee/flyswatter/Initialize()
+ . = ..()
+ strong_against = typecacheof(list(
+ /mob/living/simple_animal/hostile/poison/bees/,
+ /mob/living/simple_animal/butterfly,
+ /mob/living/simple_animal/hostile/cockroach,
+ /obj/item/queen_bee
+ ))
+
+/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)
+ . = ..()
+ if(proximity_flag)
+ if(is_type_in_typecache(target, strong_against))
+ new /obj/effect/decal/cleanable/insectguts(target.drop_location())
+ to_chat(user, "You easily splat the [target].")
+ if(istype(target, /mob/living/))
+ var/mob/living/bug = target
+ bug.death(1)
+ else
+ qdel(target)
diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/melee/powerfist.dm
similarity index 98%
rename from code/game/objects/items/powerfist.dm
rename to code/game/objects/items/melee/powerfist.dm
index c41142d4ad2..13d1d10230f 100644
--- a/code/game/objects/items/powerfist.dm
+++ b/code/game/objects/items/melee/powerfist.dm
@@ -75,6 +75,7 @@
return
var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
var/turf/T = get_turf(src)
+ var/mols_used = gasused.total_moles()
if(!T)
return
T.assume_air(gasused)
@@ -86,7 +87,7 @@
target.visible_message("[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!", \
"[user]'s punches you!")
return
- if(gasused.total_moles() < gasperfist * fisto_setting)
+ if(mols_used < gasperfist * fisto_setting)
to_chat(user, "\The [src]'s piston-ram lets out a weak hiss, it needs more gas!")
playsound(loc, 'sound/weapons/punch4.ogg', 50, TRUE)
target.apply_damage((force / 2), BRUTE)
diff --git a/code/game/objects/items/melee/spear.dm b/code/game/objects/items/melee/spear.dm
new file mode 100644
index 00000000000..4a7b8b789dc
--- /dev/null
+++ b/code/game/objects/items/melee/spear.dm
@@ -0,0 +1,122 @@
+//spears
+/obj/item/melee/spear
+ icon_state = "spearglass"
+ icon = 'icons/obj/weapon/spear.dmi'
+ lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
+ name = "spear"
+ desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
+ force = 10
+ w_class = WEIGHT_CLASS_BULKY
+ slot_flags = ITEM_SLOT_BACK
+ throwforce = 20
+ throw_speed = 4
+ embedding = list("impact_pain_mult" = 3)
+ armour_penetration = 10
+ custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
+ sharpness = IS_SHARP
+ max_integrity = 200
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
+ species_exception = list(/datum/species/kepori)
+ var/icon_prefix = "spearglass"
+
+/obj/item/melee/spear/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/butchering, 100, 70) //decent in a pinch, but pretty bad.
+ AddComponent(/datum/component/jousting)
+ AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]_w")
+
+/obj/item/melee/spear/update_icon_state()
+ icon_state = "[icon_prefix]"
+ return ..()
+
+/obj/item/melee/spear/CheckParts(list/parts_list)
+ var/obj/item/shard/tip = locate() in parts_list
+ if (istype(tip, /obj/item/shard/plasma))
+ throwforce = 21
+ icon_prefix = "spearplasma"
+ AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]_w")
+ update_appearance()
+ qdel(tip)
+ ..()
+
+/*
+ * Bone Spear
+ */
+/obj/item/melee/spear/bone //Blatant imitation of spear, but made out of bone. Not valid for explosive modification.
+ icon_state = "bone_spear"
+ name = "bone spear"
+ base_icon_state = "bone_spear"
+ icon_prefix = "bone_spear"
+ desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology."
+ //this should be a plasma spear or worse.
+ force = 11
+ throwforce = 21
+
+/obj/item/melee/spear/bone/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]_w")
+
+/obj/item/melee/spear/explosive
+ name = "explosive lance"
+ icon_state = "spearbomb"
+ base_icon_state = "spearbomb"
+ icon_prefix = "spearbomb"
+ var/obj/item/grenade/explosive = null
+ var/war_cry = "AAAAARGH!!!"
+
+/obj/item/melee/spear/explosive/Initialize(mapload)
+ . = ..()
+ set_explosive(new /obj/item/grenade/iedcasing/spawned()) //For admin-spawned explosive lances
+
+/obj/item/melee/spear/explosive/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]_w")
+
+/obj/item/melee/spear/explosive/proc/set_explosive(obj/item/grenade/G)
+ if(explosive)
+ QDEL_NULL(explosive)
+ G.forceMove(src)
+ explosive = G
+ desc = "A makeshift spear with [G] attached to it"
+
+/obj/item/melee/spear/explosive/CheckParts(list/parts_list)
+ var/obj/item/grenade/G = locate() in parts_list
+ if(G)
+ var/obj/item/melee/spear/lancePart = locate() in parts_list
+ var/datum/component/two_handed/comp_twohand = lancePart.GetComponent(/datum/component/two_handed)
+ if(comp_twohand)
+ var/lance_wielded = comp_twohand.force_wielded
+ var/lance_unwielded = comp_twohand.force_unwielded
+ AddComponent(/datum/component/two_handed, force_unwielded=lance_unwielded, force_wielded=lance_wielded)
+ throwforce = lancePart.throwforce
+ icon_prefix = lancePart.icon_prefix
+ parts_list -= G
+ parts_list -= lancePart
+ set_explosive(G)
+ qdel(lancePart)
+ ..()
+
+/obj/item/melee/spear/explosive/examine(mob/user)
+ . = ..()
+ . += "Alt-click to set your war cry."
+
+/obj/item/melee/spear/explosive/AltClick(mob/user)
+ if(user.canUseTopic(src, BE_CLOSE))
+ ..()
+ if(istype(user) && loc == user)
+ var/input = stripped_input(user,"What do you want your war cry to be? You will shout it when you hit someone in melee.", ,"", 50)
+ if(input)
+ src.war_cry = input
+
+/obj/item/melee/spear/explosive/afterattack(atom/movable/AM, mob/user, proximity)
+ . = ..()
+ if(!proximity)
+ return
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
+ user.say("[war_cry]", forced="spear warcry")
+ explosive.forceMove(AM)
+ explosive.prime()
+ qdel(src)
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/melee/stunbaton.dm
similarity index 51%
rename from code/game/objects/items/stunbaton.dm
rename to code/game/objects/items/melee/stunbaton.dm
index 3265b36a3b4..152bc76d5f8 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/melee/stunbaton.dm
@@ -1,7 +1,7 @@
/obj/item/melee/baton
name = "stun baton"
desc = "A stun baton for incapacitating people with."
-
+ icon = 'icons/obj/weapon/baton.dmi'
icon_state = "stunbaton"
item_state = "baton"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
@@ -23,7 +23,7 @@
var/can_remove_cell = TRUE
var/turned_on = FALSE
- var/activate_sound = "sparks"
+ var/activate_sound = SFX_SPARKS
var/attack_cooldown_check = 0 SECONDS
var/attack_cooldown = 2.5 SECONDS
@@ -99,7 +99,7 @@
/obj/item/melee/baton/update_icon_state()
if(turned_on)
- icon_state = "[initial(icon_state)]_active"
+ icon_state = "[initial(icon_state)]_on"
return ..()
if(!cell)
icon_state = "[initial(icon_state)]_nocell"
@@ -110,23 +110,23 @@
/obj/item/melee/baton/examine(mob/user)
. = ..()
if(cell)
- . += "\The [src] is [round(cell.percent())]% charged."
+ . += span_notice("\The [src] is [round(cell.percent())]% charged.")
else
- . += "\The [src] does not have a power source installed."
+ . += span_warning("\The [src] does not have a power source installed.")
/obj/item/melee/baton/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stock_parts/cell))
var/obj/item/stock_parts/cell/C = W
if(cell)
- to_chat(user, "[src] already has a cell!")
+ to_chat(user, span_notice("[src] already has a cell!"))
else
if(C.maxcharge < cell_hit_cost)
- to_chat(user, "[src] requires a higher capacity cell.")
+ to_chat(user, span_notice("[src] requires a higher capacity cell."))
return
if(!user.transferItemToLoc(W, src))
return
cell = W
- to_chat(user, "You install a cell in [src].")
+ to_chat(user, span_notice("You install a cell in [src]."))
update_appearance()
else if(W.tool_behaviour == TOOL_SCREWDRIVER)
@@ -139,7 +139,7 @@
cell.update_appearance()
cell.forceMove(get_turf(src))
cell = null
- to_chat(user, "You remove the cell from [src].")
+ to_chat(user, span_notice("You remove the cell from [src]."))
turned_on = FALSE
update_appearance()
@@ -149,22 +149,22 @@
/obj/item/melee/baton/proc/toggle_on(mob/user)
if(cell && cell.charge > cell_hit_cost)
turned_on = !turned_on
- to_chat(user, "[src] is now [turned_on ? "on" : "off"].")
+ to_chat(user, span_notice("[src] is now [turned_on ? "on" : "off"]."))
playsound(src, activate_sound, 75, TRUE, -1)
else
turned_on = FALSE
if(!cell)
- to_chat(user, "[src] does not have a power source!")
+ to_chat(user, span_warning("[src] does not have a power source!"))
else
- to_chat(user, "[src] is out of charge.")
+ to_chat(user, span_warning("[src] is out of charge."))
update_appearance()
add_fingerprint(user)
/obj/item/melee/baton/proc/clumsy_check(mob/living/carbon/human/user)
if(turned_on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
playsound(src, stun_sound, 75, TRUE, -1)
- user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \
- "You accidentally hit yourself with [src]!")
+ user.visible_message(span_danger("[user] accidentally hits [user.p_them()]self with [src]!"), \
+ span_userdanger("You accidentally hit yourself with [src]!"))
user.Knockdown(stun_time*3) //should really be an equivalent to attack(user,user)
deductcharge(cell_hit_cost)
return TRUE
@@ -191,10 +191,10 @@
user.do_attack_animation(M)
return
else
- to_chat(user, "The baton is still charging!")
+ to_chat(user, span_danger("The [src] is still charging!"))
else
- M.visible_message("[user] prods [M] with [src]. Luckily it was off.", \
- "[user] prods you with [src]. Luckily it was off.")
+ M.visible_message(span_warning("[user] prods [M] with [src]. Luckily it was off."), \
+ span_warning("[user] prods you with [src]. Luckily it was off."))
else
if(turned_on)
if(attack_cooldown_check <= world.time)
@@ -206,7 +206,7 @@
if(shields_blocked(L, user))
return FALSE
if(HAS_TRAIT_FROM(L, TRAIT_IWASBATONED, user)) //no doublebaton abuse anon!
- to_chat(user, "[L] manages to avoid the attack!")
+ to_chat(user, span_danger("[L] manages to avoid the attack!"))
return FALSE
if(iscyborg(loc))
var/mob/living/silicon/robot/R = loc
@@ -228,8 +228,8 @@
if(user)
L.lastattacker = user.real_name
L.lastattackerckey = user.ckey
- L.visible_message("[user] stuns [L] with [src]!", \
- "[user] stuns you with [src]!")
+ L.visible_message(span_danger("[user] stuns [L] with [src]!"), \
+ span_userdanger("[user] stuns you with [src]!"))
log_combat(user, L, "stunned")
playsound(src, stun_sound, 50, TRUE, -1)
@@ -245,7 +245,7 @@
/obj/item/melee/baton/proc/apply_stun_effect_end(mob/living/target)
var/trait_check = HAS_TRAIT(target, TRAIT_STUNRESISTANCE) //var since we check it in out to_chat as well as determine stun duration
if(!target.IsKnockdown())
- to_chat(target, "Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]")
+ to_chat(target, span_warning("Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]"))
if(trait_check)
target.Knockdown(stun_time * 0.1)
@@ -333,3 +333,233 @@
/obj/item/melee/baton/boomerang/loaded //Same as above, comes with a cell.
preload_cell_type = /obj/item/stock_parts/cell/high
+
+/obj/item/melee/classic_baton
+ name = "police baton"
+ desc = "A wooden truncheon for beating criminal scum."
+ icon = 'icons/obj/weapon/baton.dmi'
+ icon_state = "classic_baton"
+ item_state = "classic_baton"
+ lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+ slot_flags = ITEM_SLOT_BELT
+ force = 12 //9 hit crit
+ w_class = WEIGHT_CLASS_NORMAL
+
+ var/cooldown_check = 0 // Used interally, you don't want to modify
+
+ var/cooldown = 40 // Default wait time until can stun again.
+ var/knockdown_time_carbon = (1.5 SECONDS) // Knockdown length for carbons.
+ var/stun_time_silicon = (5 SECONDS) // If enabled, how long do we stun silicons.
+ var/stamina_damage = 55 // Do we deal stamina damage.
+ var/affect_silicon = FALSE // Does it stun silicons.
+ var/on_sound // "On" sound, played when switching between able to stun or not.
+ var/on_stun_sound = 'sound/effects/woodhit.ogg' // Default path to sound for when we stun.
+ var/stun_animation = TRUE // Do we animate the "hit" when stunning.
+ var/on = TRUE // Are we on or off.
+
+ var/on_icon_state // What is our sprite when turned on
+ var/off_icon_state // What is our sprite when turned off
+ var/on_item_state // What is our in-hand sprite when turned on
+ var/active_force // Damage when on - not stunning
+ var/force_off // Damage when off - not stunning
+ var/weight_class_on // What is the new size class when turned on
+
+// Description for trying to stun when still on cooldown.
+/obj/item/melee/classic_baton/proc/get_wait_description()
+ return
+
+// Description for when turning their baton "on"
+/obj/item/melee/classic_baton/proc/get_on_description()
+ . = list()
+
+ .["local_on"] = span_warning("You extend the baton.")
+ .["local_off"] = span_notice("You collapse the baton.")
+
+ return .
+
+// Default message for stunning mob.
+/obj/item/melee/classic_baton/proc/get_stun_description(mob/living/target, mob/living/user)
+ . = list()
+
+ .["visible"] = span_danger("[user] knocks [target] down with [src]!")
+ .["local"] = span_userdanger("[user] knocks you down with [src]!")
+
+ return .
+
+// Default message for stunning a silicon.
+/obj/item/melee/classic_baton/proc/get_silicon_stun_description(mob/living/target, mob/living/user)
+ . = list()
+
+ .["visible"] = span_danger("[user] pulses [target]'s sensors with the baton!")
+ .["local"] = span_danger("You pulse [target]'s sensors with the baton!")
+
+ return .
+
+// Are we applying any special effects when we stun to carbon
+/obj/item/melee/classic_baton/proc/additional_effects_carbon(mob/living/target, mob/living/user)
+ return
+
+// Are we applying any special effects when we stun to silicon
+/obj/item/melee/classic_baton/proc/additional_effects_silicon(mob/living/target, mob/living/user)
+ return
+
+/obj/item/melee/classic_baton/attack(mob/living/target, mob/living/user)
+ if(!on)
+ return ..()
+
+ add_fingerprint(user)
+ if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
+ to_chat(user, span_userdanger("You hit yourself over the head!"))
+
+ user.Paralyze(knockdown_time_carbon * force)
+ user.apply_damage(stamina_damage, STAMINA, BODY_ZONE_HEAD)
+
+ additional_effects_carbon(user) // user is the target here
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ H.apply_damage(2*force, BRUTE, BODY_ZONE_HEAD)
+ else
+ user.take_bodypart_damage(2*force)
+ return
+ if(iscyborg(target))
+ // We don't stun if we're on harm.
+ if (user.a_intent != INTENT_HARM)
+ if (affect_silicon)
+ var/list/desc = get_silicon_stun_description(target, user)
+
+ target.flash_act(affect_silicon = TRUE)
+ target.Paralyze(stun_time_silicon)
+ additional_effects_silicon(target, user)
+
+ user.visible_message(desc["visible"], desc["local"])
+ playsound(get_turf(src), on_stun_sound, 100, TRUE, -1)
+
+ if (stun_animation)
+ user.do_attack_animation(target)
+ else
+ ..()
+ else
+ ..()
+ return
+ if(!isliving(target))
+ return
+ if (user.a_intent == INTENT_HARM)
+ if(!..())
+ return
+ if(!iscyborg(target))
+ return
+ else
+ if(cooldown_check <= world.time)
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ if (H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
+ return
+ if(check_martial_counter(H, user))
+ return
+
+ var/list/desc = get_stun_description(target, user)
+
+ if (stun_animation)
+ user.do_attack_animation(target)
+
+ playsound(get_turf(src), on_stun_sound, 75, TRUE, -1)
+ target.Knockdown(knockdown_time_carbon)
+ target.apply_damage(stamina_damage, STAMINA, BODY_ZONE_CHEST)
+ additional_effects_carbon(target, user)
+
+ log_combat(user, target, "stunned", src)
+ add_fingerprint(user)
+
+ target.visible_message(desc["visible"], desc["local"])
+
+ if(!iscarbon(user))
+ target.LAssailant = null
+ else
+ target.LAssailant = WEAKREF(user)
+ cooldown_check = world.time + cooldown
+ else
+ var/wait_desc = get_wait_description()
+ if (wait_desc)
+ to_chat(user, wait_desc)
+
+/obj/item/conversion_kit
+ name = "conversion kit"
+ desc = "A strange box containing wood working tools and an instruction paper to turn stun batons into something else."
+ icon = 'icons/obj/storage.dmi'
+ icon_state = "uk"
+ custom_price = 450
+
+/obj/item/melee/classic_baton/telescopic
+ name = "telescopic baton"
+ desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
+ icon_state = "telebaton"
+ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
+ item_state = null
+ slot_flags = ITEM_SLOT_BELT
+ w_class = WEIGHT_CLASS_SMALL
+ item_flags = NONE
+ force = 0
+ on = FALSE
+ on_sound = 'sound/weapons/batonextend.ogg'
+
+ on_icon_state = "telebaton_on"
+ off_icon_state = "telebaton"
+ on_item_state = "nullrod"
+ active_force = 10
+ force_off = 0
+ weight_class_on = WEIGHT_CLASS_BULKY
+
+/obj/item/melee/classic_baton/telescopic/attack_self(mob/user)
+ on = !on
+ var/list/desc = get_on_description()
+
+ if(on)
+ to_chat(user, desc["local_on"])
+ icon_state = on_icon_state
+ item_state = on_item_state
+ w_class = weight_class_on
+ force = active_force
+ attack_verb = list("smacked", "struck", "cracked", "beaten")
+ else
+ to_chat(user, desc["local_off"])
+ icon_state = off_icon_state
+ item_state = null //no sprite for concealment even when in hand
+ slot_flags = ITEM_SLOT_BELT
+ w_class = WEIGHT_CLASS_SMALL
+ force = force_off
+ attack_verb = list("hit", "poked")
+
+ playsound(src.loc, on_sound, 50, TRUE)
+ add_fingerprint(user)
+
+/obj/item/melee/classic_baton/telescopic/contractor_baton
+ name = "contractor baton"
+ desc = "A compact, specialised baton assigned to Syndicate contractors. Applies light electrical shocks to targets."
+ icon_state = "contractor_baton"
+ item_state = null
+ slot_flags = ITEM_SLOT_BELT
+ w_class = WEIGHT_CLASS_SMALL
+ item_flags = NONE
+ force = 5
+
+ cooldown = 25
+ stamina_damage = 85
+ affect_silicon = TRUE
+ on_sound = 'sound/weapons/contractorbatonextend.ogg'
+ on_stun_sound = 'sound/effects/contractorbatonhit.ogg'
+
+ on_icon_state = "contractor_baton_on"
+ off_icon_state = "contractor_baton"
+ on_item_state = "contractor_baton"
+ active_force = 16
+ force_off = 5
+ weight_class_on = WEIGHT_CLASS_NORMAL
+
+/obj/item/melee/classic_baton/telescopic/contractor_baton/get_wait_description()
+ return span_danger("The baton is still charging!")
+
+/obj/item/melee/classic_baton/telescopic/contractor_baton/additional_effects_carbon(mob/living/target, mob/living/user)
+ target.Jitter(20)
+ target.stuttering += 20
diff --git a/code/game/objects/items/melee/sword.dm b/code/game/objects/items/melee/sword.dm
new file mode 100644
index 00000000000..223a6c17f32
--- /dev/null
+++ b/code/game/objects/items/melee/sword.dm
@@ -0,0 +1,513 @@
+/obj/item/melee/sword
+ icon = 'icons/obj/weapon/sword.dmi'
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ pickup_sound = 'sound/items/unsheath.ogg'
+ drop_sound = 'sound/items/handling/metal_drop.ogg'
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ flags_1 = CONDUCT_1
+ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
+ w_class = WEIGHT_CLASS_BULKY
+ block_chance = 10
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ sharpness = IS_SHARP
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+ resistance_flags = FIRE_PROOF
+
+/obj/item/melee/sword/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/butchering, 30, 95, 5) //fast and effective, but as a sword, it might damage the results.
+
+//cruft
+/obj/item/melee/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ if(attack_type == PROJECTILE_ATTACK)
+ final_block_chance = projectile_block_chance //Don't bring a sword to a gunfight
+ return ..()
+
+/obj/item/melee/sword/claymore
+ name = "claymore"
+ desc = "What are you standing around staring at this for? Get to killing!"
+ icon_state = "claymore"
+ item_state = "claymore"
+ force = 30
+ throwforce = 10
+ block_chance = 40
+ max_integrity = 200
+
+/obj/item/melee/sword/claymore/Initialize()
+ . = ..()
+ AddComponent(/datum/component/butchering, 40, 105)
+
+/obj/item/melee/sword/bone
+ name = "bone sword"
+ desc = "Jagged pieces of bone are tied to what looks like a goliaths femur."
+ icon_state = "bone_sword"
+ item_state = "bone_sword"
+ force = 15
+ throwforce = 10
+ armour_penetration = 15
+
+/obj/item/melee/sword/scrap
+ name = "scrap sword"
+ desc = "A jagged and painful weapon only effective on targets without an armour"
+ icon_state = "machete"
+ force = 24
+ throwforce = 10
+ armour_penetration = -35
+ max_integrity = 100
+
+/obj/item/melee/sword/mass
+ name = "mass produced machete"
+ desc = "A middle ground between a machete and a short sword. A simple construction of stamped steel but its so cheap its hard to complain. Its right between being a one hand and two handed weapon"
+ icon_state = "machete"
+ base_icon_state = "machete"
+ force = 20
+ throwforce = 15
+ max_integrity = 50
+
+/obj/item/melee/sword/mass/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/two_handed, force_unwielded=20, force_wielded=22)
+
+/obj/item/melee/sword/katana
+ name = "katana"
+ desc = "Woefully underpowered in D20."
+ icon_state = "katana"
+ item_state = "katana"
+ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
+ force = 30
+ throwforce = 10
+ w_class = WEIGHT_CLASS_HUGE
+ block_chance = 10
+ max_integrity = 200
+
+/obj/item/melee/sword/chainsaw
+ name = "sacred chainsaw sword"
+ desc = "Suffer not a heretic to live."
+ icon_state = "chainsword_on"
+ item_state = "chainsword_on"
+ force = 15
+ throwforce = 10
+ armour_penetration = 25
+ slot_flags = ITEM_SLOT_BELT
+ attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
+ hitsound = 'sound/weapons/chainsawhit.ogg'
+ tool_behaviour = TOOL_SAW
+ toolspeed = 1.5 //slower than a real saw
+
+/obj/item/melee/sword/sabre
+ name = "officer's sabre"
+ desc = "An elegant weapon, its monomolecular edge is capable of cutting through flesh and bone with ease."
+ icon_state = "sabre"
+ item_state = "sabre"
+ force = 15
+ throwforce = 10
+ block_chance = 60
+ armour_penetration = 75
+ attack_verb = list("slashed", "cut")
+ hitsound = 'sound/weapons/rapierhit.ogg'
+ custom_materials = list(/datum/material/iron = 1000)
+
+/obj/item/melee/sword/sabre/on_enter_storage(datum/component/storage/concrete/S)
+ var/obj/item/storage/belt/sabre/B = S.real_location()
+ if(istype(B))
+ playsound(B, 'sound/items/sheath.ogg', 25, TRUE)
+
+/obj/item/melee/sword/sabre/solgov
+ name = "solarian sabre"
+ desc = "A refined ceremonial blade often given to soldiers and high ranking officials of SolGov."
+ icon_state = "sabresolgov"
+ item_state = "sabresolgov"
+
+/obj/item/melee/sword/sabre/suns
+ name = "SUNS sabre"
+ desc = "A blade of Solarian origin given to SUNS followers."
+ icon_state = "suns-sabre"
+ item_state = "suns-sabre"
+
+/obj/item/melee/sword/sabre/suns/captain
+ name = "SUNS captain sabre"
+ desc = "An elegant blade awarded to SUNS captains. Despite its higher craftmanship, it appears to be just as effective as a normal sabre."
+ icon_state = "suns-capsabre"
+ item_state = "suns-capsabre"
+
+/obj/item/melee/sword/sabre/suns/cmo
+ name = "SUNS stick sabre"
+ desc = "A thin blade used by SUNS medical instructors."
+ icon_state = "suns-swordstick"
+ item_state = "suns-swordstick"
+
+/obj/item/melee/sword/sabre/pgf
+ name = "\improper boarding cutlass"
+ desc = "When beam and bullet puncture the hull, a trustworthy blade will carry you through the fight"
+ icon_state = "pgf-sabre"
+ block_chance = 30
+ force = 22
+
+/obj/item/melee/sword/sabre/suns/telescopic
+ name = "telescopic sabre"
+ desc = "A telescopic and retractable blade given to SUNS peacekeepers for easy concealment and carry. It's design makes it slightly less effective than normal sabres sadly, however it is still excelent at piercing armor."
+ icon_state = "suns-tsword"
+ item_state = "suns-tsword"
+ force = 0
+ throwforce = 0
+ block_chance = 0
+
+ slot_flags = ITEM_SLOT_BELT
+ w_class = WEIGHT_CLASS_SMALL
+ attack_verb = list("smacked", "prodded")
+
+ var/extend_sound = 'sound/weapons/batonextend.ogg'
+
+ var/on_block_chance = 40
+
+/obj/item/melee/sword/sabre/suns/telescopic/ComponentInitialize()
+ . = ..()
+ AddComponent( \
+ /datum/component/transforming, \
+ force_on = 10, \
+ throwforce_on = 10, \
+ attack_verb_on = list("slashed", "cut"), \
+ w_class_on = WEIGHT_CLASS_BULKY, \
+ )
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
+
+/obj/item/melee/sword/sabre/suns/telescopic/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ if(active)
+ block_chance = on_block_chance
+ else
+ block_chance = initial(block_chance)
+ playsound(user, extend_sound, 50, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
+/obj/item/melee/sword/supermatter
+ name = "supermatter sword"
+ desc = "In a universe full of bad ideas, this might just be the worst."
+ icon_state = "supermatter_sword"
+ item_state = "supermatter_sword"
+ slot_flags = null
+ force = 0.001
+ armour_penetration = 1000
+ var/obj/machinery/power/supermatter_crystal/shard
+ var/balanced = 1
+ force_string = "INFINITE"
+
+/obj/item/melee/sword/supermatter/Initialize()
+ . = ..()
+ shard = new /obj/machinery/power/supermatter_crystal(src)
+ qdel(shard.countdown)
+ shard.countdown = null
+ START_PROCESSING(SSobj, src)
+ visible_message("[src] appears, balanced ever so perfectly on its hilt. This isn't ominous at all.")
+
+/obj/item/melee/sword/supermatter/process()
+ if(balanced || throwing || ismob(src.loc) || isnull(src.loc))
+ return
+ if(!isturf(src.loc))
+ var/atom/target = src.loc
+ forceMove(target.loc)
+ consume_everything(target)
+ else
+ var/turf/T = get_turf(src)
+ if(!isspaceturf(T))
+ consume_turf(T)
+
+/obj/item/melee/sword/supermatter/afterattack(target, mob/user, proximity_flag)
+ . = ..()
+ if(user && target == user)
+ user.dropItemToGround(src)
+ if(proximity_flag)
+ consume_everything(target)
+
+/obj/item/melee/sword/supermatter/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ ..()
+ if(ismob(hit_atom))
+ var/mob/M = hit_atom
+ if(src.loc == M)
+ M.dropItemToGround(src)
+ consume_everything(hit_atom)
+
+/obj/item/melee/sword/supermatter/pickup(user)
+ ..()
+ balanced = 0
+
+/obj/item/melee/sword/supermatter/ex_act(severity, target)
+ visible_message("The blast wave smacks into [src] and rapidly flashes to ash.",\
+ "You hear a loud crack as you are washed with a wave of heat.")
+ consume_everything()
+
+/obj/item/melee/sword/supermatter/acid_act()
+ visible_message("The acid smacks into [src] and rapidly flashes to ash.",\
+ "You hear a loud crack as you are washed with a wave of heat.")
+ consume_everything()
+
+/obj/item/melee/sword/supermatter/bullet_act(obj/projectile/P)
+ visible_message("[P] smacks into [src] and rapidly flashes to ash.",\
+ "You hear a loud crack as you are washed with a wave of heat.")
+ consume_everything(P)
+ return BULLET_ACT_HIT
+
+
+/obj/item/melee/sword/supermatter/proc/consume_everything(target)
+ if(isnull(target))
+ shard.Consume()
+ else if(!isturf(target))
+ shard.Bumped(target)
+ else
+ consume_turf(target)
+
+/obj/item/melee/sword/supermatter/proc/consume_turf(turf/T)
+ var/oldtype = T.type
+ var/turf/newT = T.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+ if(newT.type == oldtype)
+ return
+ playsound(T, 'sound/effects/supermatter.ogg', 50, TRUE)
+ T.visible_message("[T] smacks into [src] and rapidly flashes to ash.",\
+ "You hear a loud crack as you are washed with a wave of heat.")
+ shard.Consume()
+
+/obj/item/melee/sword/supermatter/add_blood_DNA(list/blood_dna)
+ return FALSE
+
+/obj/item/melee/sword/greyking
+ name = "blade of the grey-king"
+ desc = "A legendary sword made with 3 replica katanas nailed together and dipped in heavy narcotics."
+ icon_state = "grey_sword"
+ item_state = "swordoff"
+ slot_flags = ITEM_SLOT_BACK
+ force = 15
+ throwforce = 8
+ block_chance = 30
+ attack_verb = list("struck", "slashed", "mall-ninjad", "tided", "multi-shanked", "shredded")
+
+ var/prick_chance = 50
+ var/prick_chems = list(
+ /datum/reagent/toxin = 10,
+ /datum/reagent/toxin/mindbreaker = 10,
+ /datum/reagent/drug/space_drugs = 10,
+ /datum/reagent/drug/crank = 5,
+ /datum/reagent/drug/methamphetamine = 5,
+ /datum/reagent/drug/bath_salts = 5,
+ /datum/reagent/drug/aranesp = 5,
+ /datum/reagent/drug/pumpup = 10,
+ /datum/reagent/medicine/omnizine = 10,
+ /datum/reagent/medicine/earthsblood = 15,
+ /datum/reagent/medicine/omnizine/protozine = 15
+ )
+
+/obj/item/melee/sword/greyking/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+ if (iscarbon(target) && prob(prick_chance))
+ var/mob/living/carbon/C = target
+ var/datum/reagent/R = pick(prick_chems)
+ C.reagents.add_reagent(R, prick_chems[R])
+ C.visible_message("[user] is pricked!", \
+ "You've been pricked by the [src]!")
+ log_combat(user, C, "pricked", src.name, "with [prick_chems[R]]u of [R]")
+ return ..()
+
+//HF blade
+/obj/item/melee/sword/vibro
+ icon_state = "hfrequency"
+ base_icon_state = "hfrequency"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ name = "vibro sword"
+ desc = "A potent weapon capable of cutting through nearly anything. Wielding it in two hands will allow you to deflect gunfire."
+ armour_penetration = 100
+ block_chance = 30
+ force = 20
+ throwforce = 20
+ throw_speed = 4
+ sharpness = IS_SHARP
+ attack_verb = list("cut", "sliced", "diced")
+ slot_flags = ITEM_SLOT_BACK
+ hitsound = 'sound/weapons/bladeslice.ogg'
+
+/obj/item/melee/sword/vibro/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/butchering, 20, 105)
+ AddComponent(/datum/component/two_handed, force_multiplier=2, icon_wielded="[base_icon_state]1")
+
+/obj/item/melee/sword/vibro/update_icon_state()
+ icon_state = "[base_icon_state]0"
+ return ..()
+
+/obj/item/melee/sword/vibro/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
+ final_block_chance *= 2
+ if(HAS_TRAIT(src, TRAIT_WIELDED) || attack_type != PROJECTILE_ATTACK)
+ if(prob(final_block_chance))
+ if(attack_type == PROJECTILE_ATTACK)
+ owner.visible_message("[owner] deflects [attack_text] with [src]!")
+ playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)
+ return 1
+ else
+ owner.visible_message("[owner] parries [attack_text] with [src]!")
+ return 1
+ return 0
+
+/obj/item/melee/sword/weebstick
+ name = "Weeb Stick"
+ desc = "Glorious nippon steel, folded 1000 times."
+ icon_state = "weeb_blade"
+ item_state = "weeb_blade"
+ slot_flags = ITEM_SLOT_BACK
+ sharpness = IS_SHARP_ACCURATE
+ force = 25
+ throw_speed = 4
+ throw_range = 5
+ throwforce = 12
+ block_chance = 20
+ armour_penetration = 50
+ hitsound = 'sound/weapons/anime_slash.ogg'
+
+/obj/item/melee/sword/weebstick/Initialize()
+ . = ..()
+ AddComponent(/datum/component/butchering, 25, 90, 5) //Not made for scalping victims, but will work nonetheless
+
+/obj/item/melee/sword/weebstick/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ if(attack_type == PROJECTILE_ATTACK)
+ final_block_chance = block_chance / 2 //Pretty good...
+ return ..()
+
+/obj/item/melee/sword/weebstick/on_exit_storage(datum/component/storage/concrete/S)
+ var/obj/item/storage/belt/weebstick/B = S.real_location()
+ if(istype(B))
+ playsound(B, 'sound/items/unsheath.ogg', 25, TRUE)
+
+/obj/item/melee/sword/weebstick/on_enter_storage(datum/component/storage/concrete/S)
+ var/obj/item/storage/belt/weebstick/B = S.real_location()
+ if(istype(B))
+ playsound(B, 'sound/items/sheath.ogg', 25, TRUE)
+
+/obj/item/storage/belt/weebstick
+ name = "nanoforged blade sheath"
+ desc = "It yearns to bath in the blood of your enemies... but you hold it back!"
+ icon = 'icons/obj/weapon/sword.dmi'
+ icon_state = "weeb_sheath"
+ item_state = "sheath"
+ force = 3
+ var/primed = FALSE //Prerequisite to anime bullshit
+ // ##The anime bullshit## - Mostly stolen from action/innate/dash
+ var/dash_sound = 'sound/weapons/unsheathed_blade.ogg'
+ var/beam_effect = "blood_beam"
+ var/phasein = /obj/effect/temp_visual/dir_setting/cult/phase
+ var/phaseout = /obj/effect/temp_visual/dir_setting/cult/phase
+
+/obj/item/storage/belt/weebstick/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/update_icon_updates_onmob)
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 1
+ STR.use_sound = null
+ STR.max_w_class = WEIGHT_CLASS_BULKY
+ STR.set_holdable(list(
+ /obj/item/melee/sword/weebstick
+ ))
+
+/obj/item/storage/belt/weebstick/examine(mob/user)
+ . = ..()
+ if(length(contents))
+ . += "Use [src] in-hand to prime for an opening strike."
+ . += "Alt-click it to quickly draw the blade."
+
+/obj/item/storage/belt/weebstick/AltClick(mob/user)
+ if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)) || primed)
+ return
+ if(length(contents))
+ var/obj/item/I = contents[1]
+ playsound(user, dash_sound, 25, TRUE)
+ user.visible_message("[user] swiftly draws \the [I].", "You draw \the [I].")
+ user.put_in_hands(I)
+ update_appearance()
+ else
+ to_chat(user, "[src] is empty!")
+
+/obj/item/storage/belt/weebstick/attack_self(mob/user)
+ if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+ return
+ if(length(contents))
+ var/datum/component/storage/CP = GetComponent(/datum/component/storage)
+ if(primed)
+ CP.locked = FALSE
+ playsound(user, 'sound/items/sheath.ogg', 25, TRUE)
+ to_chat(user, "You return your stance.")
+ primed = FALSE
+ update_appearance()
+ else
+ CP.locked = TRUE //Prevents normal removal of the blade while primed
+ playsound(user, 'sound/items/unsheath.ogg', 25, TRUE)
+ user.visible_message("[user] grips the blade within [src] and primes to attack.", "You take an opening stance...", "You hear a weapon being drawn...")
+ primed = TRUE
+ update_appearance()
+ else
+ to_chat(user, "[src] is empty!")
+
+/obj/item/storage/belt/weebstick/afterattack(atom/A, mob/living/user, proximity_flag, params)
+ . = ..()
+ if(primed && length(contents))
+ if(!(A in view(user.client.view, user)))
+ return
+ var/obj/item/I = contents[1]
+ if(!user.put_in_inactive_hand(I))
+ to_chat(user, "You need a free hand!")
+ return
+ var/datum/component/storage/CP = GetComponent(/datum/component/storage)
+ CP.locked = FALSE
+ primed = FALSE
+ update_appearance()
+ primed_attack(A, user)
+ if(CanReach(A, I))
+ I.melee_attack_chain(user, A, params)
+ user.swap_hand()
+
+/obj/item/storage/belt/weebstick/proc/primed_attack(atom/target, mob/living/user)
+ var/turf/end = get_turf(user)
+ var/turf/start = get_turf(user)
+ var/obj/spot1 = new phaseout(start, user.dir)
+ var/halt = FALSE
+ // Stolen dash code
+ for(var/T in getline(start, get_turf(target)))
+ var/turf/tile = T
+ for(var/mob/living/victim in tile)
+ if(victim != user)
+ playsound(victim, 'sound/weapons/anime_slash.ogg', 10, TRUE)
+ victim.take_bodypart_damage(15)
+ // Unlike actual ninjas, we stop noclip-dashing here.
+ if(isclosedturf(T))
+ halt = TRUE
+ for(var/obj/O in tile)
+ // We ignore mobs as we are cutting through them
+ if(!O.CanPass(user, tile))
+ halt = TRUE
+ if(halt)
+ break
+ else
+ end = T
+ user.forceMove(end) // YEET
+ playsound(start, dash_sound, 35, TRUE)
+ var/obj/spot2 = new phasein(end, user.dir)
+ spot1.Beam(spot2, beam_effect, time=20)
+ user.visible_message("In a flash of red, [user] draws [user.p_their()] blade!", "You dash forward while drawing your weapon!", "You hear a blade slice through the air at impossible speeds!")
+
+/obj/item/storage/belt/weebstick/update_icon_state()
+ icon_state = "weeb_sheath"
+ item_state = "sheath"
+ if(contents.len)
+ if(primed)
+ icon_state += "-primed"
+ else
+ icon_state += "-blade"
+ item_state += "-sabre"
+ return ..()
+
+/obj/item/storage/belt/weebstick/PopulateContents()
+ //Time to generate names now that we have the sword
+ var/n_title = pick(GLOB.ninja_titles)
+ var/n_name = pick(GLOB.ninja_names)
+ var/obj/item/melee/sword/weebstick/sword = new /obj/item/melee/sword/weebstick(src)
+ sword.name = "[n_title] blade of clan [n_name]"
+ name = "[n_title] scabbard of clan [n_name]"
+ update_appearance()
diff --git a/code/game/objects/items/teleprod.dm b/code/game/objects/items/melee/teleprod.dm
similarity index 100%
rename from code/game/objects/items/teleprod.dm
rename to code/game/objects/items/melee/teleprod.dm
diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm
deleted file mode 100644
index 8059e021b8f..00000000000
--- a/code/game/objects/items/melee/transforming.dm
+++ /dev/null
@@ -1,88 +0,0 @@
-/obj/item/melee/transforming
- sharpness = IS_SHARP
- stealthy_audio = TRUE //Most of these are antag weps so we dont want them to be /too/ overt.
- var/active = FALSE
- var/force_on = 30 //force when active
- var/faction_bonus_force = 0 //Bonus force dealt against certain factions
- var/throwforce_on = 20
- var/icon_state_on = "axe1"
- var/hitsound_on = 'sound/weapons/blade1.ogg'
- var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- var/list/attack_verb_off = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- w_class = WEIGHT_CLASS_SMALL
- var/bonus_active = FALSE //If the faction damage bonus is active
- var/list/nemesis_factions //Any mob with a faction that exists in this list will take bonus damage/effects
- var/w_class_on = WEIGHT_CLASS_BULKY
- var/clumsy_check = TRUE
-
-/obj/item/melee/transforming/Initialize()
- . = ..()
- if(active)
- if(attack_verb_on.len)
- attack_verb = attack_verb_on
- else
- if(attack_verb_off.len)
- attack_verb = attack_verb_off
- if(embedding)
- updateEmbedding()
- if(sharpness)
- AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)
-
-/obj/item/melee/transforming/attack_self(mob/living/carbon/user)
- if(transform_weapon(user))
- clumsy_transform_effect(user)
-
-/obj/item/melee/transforming/attack(mob/living/target, mob/living/carbon/human/user)
- var/nemesis_faction = FALSE
- if(LAZYLEN(nemesis_factions))
- for(var/F in target.faction)
- if(F in nemesis_factions)
- nemesis_faction = TRUE
- force += faction_bonus_force
- nemesis_effects(user, target)
- break
- . = ..()
- if(nemesis_faction)
- force -= faction_bonus_force
-
-/obj/item/melee/transforming/proc/transform_weapon(mob/living/user, supress_message_text)
- active = !active
- if(active)
- force = force_on
- throwforce = throwforce_on
- hitsound = hitsound_on
- throw_speed = 4
- if(attack_verb_on.len)
- attack_verb = attack_verb_on
- icon_state = icon_state_on
- w_class = w_class_on
- if(embedding)
- updateEmbedding()
- else
- force = initial(force)
- throwforce = initial(throwforce)
- hitsound = initial(hitsound)
- throw_speed = initial(throw_speed)
- if(attack_verb_off.len)
- attack_verb = attack_verb_off
- icon_state = initial(icon_state)
- w_class = initial(w_class)
- if(embedding)
- disableEmbedding()
-
- transform_messages(user, supress_message_text)
- add_fingerprint(user)
- return TRUE
-
-/obj/item/melee/transforming/proc/nemesis_effects(mob/living/user, mob/living/target)
- return
-
-/obj/item/melee/transforming/proc/transform_messages(mob/living/user, supress_message_text)
- playsound(user, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE) //changed it from 50% volume to 35% because deafness
- if(!supress_message_text)
- to_chat(user, "[src] [active ? "is now active":"can now be concealed"].")
-
-/obj/item/melee/transforming/proc/clumsy_transform_effect(mob/living/user)
- if(clumsy_check && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
- to_chat(user, "You accidentally cut yourself with [src], like a doofus!")
- user.take_bodypart_damage(5,5)
diff --git a/code/game/objects/items/melee/trickweapon.dm b/code/game/objects/items/melee/trickweapon.dm
new file mode 100644
index 00000000000..af574085a15
--- /dev/null
+++ b/code/game/objects/items/melee/trickweapon.dm
@@ -0,0 +1,69 @@
+/obj/item/melee/cleaving_saw
+ name = "cleaving saw"
+ desc = "This saw, effective at drawing the blood of beasts, transforms into a long cleaver that makes use of centrifugal force."
+ force = 12
+ var/active_force = 20 //force when active
+ throwforce = 20
+ var/active_throwforce = 20
+ icon = 'icons/obj/lavaland/artefacts.dmi'
+ lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
+ inhand_x_dimension = 64
+ inhand_y_dimension = 64
+ icon_state = "cleaving_saw"
+ item_state = "cleaving_saw"
+ slot_flags = ITEM_SLOT_BELT
+ attack_verb = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ sharpness = IS_SHARP
+
+ var/transform_cooldown
+ var/swiping = FALSE
+ var/bleed_stacks_per_hit = 3
+
+/obj/item/melee/cleaving_saw/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/update_icon_updates_onmob)
+ AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)
+ AddComponent( \
+ /datum/component/transforming, \
+ transform_cooldown_time = (CLICK_CD_MELEE * 0.25), \
+ force_on = active_force, \
+ throwforce_on = active_throwforce, \
+ attack_verb_on = list("cleave", "swipe", "slash", "chop"), \
+ )
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
+
+/obj/item/melee/cleaving_saw/examine(mob/user)
+ . = ..()
+ . += span_notice("It is [HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE) ? "open, will cleave enemies in a wide arc and deal additional damage to fauna":"closed, and can be used for rapid consecutive attacks that cause fauna to bleed"].")
+ . += span_notice("Both modes will build up existing bleed effects, doing a burst of high damage if the bleed is built up high enough.")
+ . += span_notice("Transforming it immediately after an attack causes the next attack to come out faster.")
+
+/obj/item/melee/cleaving_saw/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+ user.changeNext_move(CLICK_CD_MELEE * 0.25)
+ if(user)
+ balloon_alert(user, "[active ? "opened" : "closed"] [src]")
+ playsound(user, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
+/obj/item/melee/cleaving_saw/melee_attack_chain(mob/user, atom/target, params)
+ . = ..()
+ if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
+ user.changeNext_move(CLICK_CD_MELEE * 0.5) //when closed, it attacks very rapidly
+
+/obj/item/melee/cleaving_saw/attack(mob/living/target, mob/living/carbon/human/user)
+ if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE) || swiping || !target.density || get_turf(target) == get_turf(user))
+ ..()
+ else
+ var/turf/user_turf = get_turf(user)
+ var/dir_to_target = get_dir(user_turf, get_turf(target))
+ swiping = TRUE
+ var/static/list/cleaving_saw_cleave_angles = list(0, -45, 45) //so that the animation animates towards the target clicked and not towards a side target
+ for(var/i in cleaving_saw_cleave_angles)
+ var/turf/T = get_step(user_turf, turn(dir_to_target, i))
+ for(var/mob/living/L in T)
+ if(user.Adjacent(L) && L.density)
+ melee_attack_chain(user, L)
+ swiping = FALSE
diff --git a/code/game/objects/items/melee/weaponry.dm b/code/game/objects/items/melee/weaponry.dm
new file mode 100644
index 00000000000..131e5e1aab2
--- /dev/null
+++ b/code/game/objects/items/melee/weaponry.dm
@@ -0,0 +1,119 @@
+
+
+/obj/item/wirerod
+ name = "wired rod"
+ desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit."
+ icon = 'icons/obj/weapon/spear.dmi'
+ icon_state = "wiredrod"
+ item_state = "rods"
+ flags_1 = CONDUCT_1
+ force = 9
+ throwforce = 10
+ w_class = WEIGHT_CLASS_NORMAL
+ custom_materials = list(/datum/material/iron=1150, /datum/material/glass=75)
+ attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
+
+/obj/item/wirerod/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/shard))
+ var/obj/item/melee/spear/S = new /obj/item/melee/spear
+
+ remove_item_from_storage(user)
+ if (!user.transferItemToLoc(I, S))
+ return
+ S.CheckParts(list(I))
+ qdel(src)
+
+ user.put_in_hands(S)
+ to_chat(user, "You fasten the glass shard to the top of the rod with the cable.")
+
+ else if(istype(I, /obj/item/assembly/igniter) && !(HAS_TRAIT(I, TRAIT_NODROP)))
+ var/obj/item/melee/baton/cattleprod/P = new /obj/item/melee/baton/cattleprod
+
+ remove_item_from_storage(user)
+
+ to_chat(user, "You fasten [I] to the top of the rod with the cable.")
+
+ qdel(I)
+ qdel(src)
+
+ user.put_in_hands(P)
+ else
+ return ..()
+
+/obj/item/throwing_star
+ name = "throwing star"
+ desc = "An ancient weapon still used to this day, due to its ease of lodging itself into its victim's body parts."
+ icon_state = "throwingstar"
+ item_state = "eshield0"
+ lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
+ force = 2
+ throwforce = 20 //20 + 2 (WEIGHT_CLASS_SMALL) * 4 (EMBEDDED_IMPACT_PAIN_MULTIPLIER) = 28 damage on hit due to guaranteed embedding
+ throw_speed = 4
+ embedding = list("pain_mult" = 4, "embed_chance" = 100, "fall_chance" = 0, "embed_chance_turf_mod" = 15)
+ armour_penetration = 40
+
+ w_class = WEIGHT_CLASS_SMALL
+ sharpness = IS_SHARP
+ custom_materials = list(/datum/material/iron=500, /datum/material/glass=500)
+ resistance_flags = FIRE_PROOF
+
+/obj/item/throwing_star/stamina
+ name = "shock throwing star"
+ desc = "An aerodynamic disc designed to cause excruciating pain when stuck inside fleeing targets, hopefully without causing fatal harm."
+ throwforce = 5
+ embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 0.8, "jostle_pain_mult" = 3)
+
+/obj/item/throwing_star/toy
+ name = "toy throwing star"
+ desc = "An aerodynamic disc strapped with adhesive for sticking to people, good for playing pranks and getting yourself killed by security."
+ sharpness = IS_BLUNT
+ force = 0
+ throwforce = 0
+ embedding = list("pain_mult" = 0, "jostle_pain_mult" = 0, "embed_chance" = 100, "fall_chance" = 0)
+
+/obj/item/throwing_star/magspear
+ name = "magnetic spear"
+ desc = "A reusable spear that is typically loaded into kinetic spearguns."
+ icon = 'icons/obj/ammunition/ammo_bullets.dmi'
+ icon_state = "magspear"
+ throwforce = 25 //kills regular carps in one hit
+ force = 10
+ throw_range = 0 //throwing these invalidates the speargun
+ attack_verb = list("stabbed", "ripped", "gored", "impaled")
+ embedding = list("pain_mult" = 8, "embed_chance" = 100, "fall_chance" = 0, "impact_pain_mult" = 15) //55 damage+embed on hit
+
+/obj/item/mounted_chainsaw
+ name = "mounted chainsaw"
+ desc = "A chainsaw that has replaced your arm."
+ icon_state = "chainsaw_on"
+ item_state = "mounted_chainsaw"
+ lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
+ item_flags = ABSTRACT | DROPDEL
+ w_class = WEIGHT_CLASS_HUGE
+ force = 24
+ throwforce = 0
+ throw_range = 0
+ throw_speed = 0
+ sharpness = IS_SHARP
+ attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
+ hitsound = 'sound/weapons/chainsawhit.ogg'
+ tool_behaviour = TOOL_SAW
+ toolspeed = 1
+
+/obj/item/mounted_chainsaw/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
+
+/obj/item/mounted_chainsaw/Destroy()
+ var/obj/item/bodypart/part
+ new /obj/item/chainsaw(get_turf(src))
+ if(iscarbon(loc))
+ var/mob/living/carbon/holder = loc
+ var/index = holder.get_held_index_of_item(src)
+ if(index)
+ part = holder.hand_bodyparts[index]
+ . = ..()
+ if(part)
+ part.drop_limb()
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index 0f5d79f13b3..03f3797c4c4 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -13,11 +13,10 @@
attack_verb = list("warned", "cautioned", "smashed")
/obj/item/choice_beacon
- name = "choice beacon"
- desc = "Hey, why are you viewing this?!! Please let CentCom know about this odd occurrence."
- icon = 'icons/obj/device.dmi'
- icon_state = "gangtool-blue"
- item_state = "radio"
+ name = "choice box"
+ desc = "A box containing items to choose."
+ icon = 'icons/obj/storage.dmi'
+ icon_state = "deliverypackage3"
var/uses = 1
/obj/item/choice_beacon/attack_self(mob/user)
@@ -31,41 +30,31 @@
if(user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return TRUE
else
- playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE)
return FALSE
/obj/item/choice_beacon/proc/generate_options(mob/living/M)
var/list/display_names = generate_display_names()
if(!display_names.len)
return
- var/choice = input(M,"Which item would you like to order?","Select an Item") as null|anything in sortList(display_names)
+ var/choice = input(M,"Which item would you like to pick?","Select an Item") as null|anything in sortList(display_names)
if(!choice || !M.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
spawn_option(display_names[choice],M)
uses--
if(!uses)
+ new /obj/effect/decal/cleanable/wrapping(get_turf(M))
qdel(src)
else
to_chat(M, "[uses] use[uses > 1 ? "s" : ""] remaining on the [src].")
/obj/item/choice_beacon/proc/spawn_option(obj/choice,mob/living/M)
- var/obj/new_item = new choice()
- var/obj/structure/closet/supplypod/bluespacepod/pod = new()
- pod.explosionSize = list(0,0,0,0)
- new_item.forceMove(pod)
- var/msg = "After making your selection, you notice a strange target on the ground. It might be best to step back!"
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(istype(H.ears, /obj/item/radio/headset))
- msg = "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows: Item request received. Your package is inbound, please stand back from the landing site. Message ends.\""
- to_chat(M, msg)
-
- new /obj/effect/pod_landingzone(get_turf(src), pod)
+ new choice(get_turf(M))
+ playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, TRUE)
/obj/item/choice_beacon/hero
- name = "heroic beacon"
- desc = "To summon heroes from the past to protect the future."
+ name = "heroic box"
+ desc = "To become heroes from the past to protect the future."
/obj/item/choice_beacon/hero/generate_display_names()
var/static/list/hero_item_list
@@ -105,7 +94,7 @@
/obj/item/storage/box/hero/scottish/PopulateContents()
new /obj/item/clothing/under/costume/kilt(src)
- new /obj/item/claymore/weak/ceremonial(src)
+ new /obj/item/melee/sword/claymore(src)
new /obj/item/toy/crayon/spraycan(src)
new /obj/item/clothing/shoes/sandal(src)
@@ -116,7 +105,7 @@
/obj/item/storage/box/hero/carphunter/PopulateContents()
new /obj/item/clothing/suit/space/hardsuit/carp/old(src)
new /obj/item/clothing/mask/gas/carp(src)
- new /obj/item/kitchen/knife/hunting(src)
+ new /obj/item/melee/knife/hunting(src)
new /obj/item/storage/box/papersack/meat(src)
new /obj/item/fishing_rod(src)
new /obj/item/fishing_line(src)
@@ -127,18 +116,16 @@
/obj/item/storage/box/hero/ghostbuster/PopulateContents()
new /obj/item/choice_beacon/ouija(src)
- new /obj/item/clothing/glasses/welding/ghostbuster(src)
new /obj/item/storage/belt/fannypack/bustin(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/shoes/jackboots(src)
- new /obj/item/clothing/under/color/khaki/buster(src)
new /obj/item/grenade/chem_grenade/ghostbuster(src)
new /obj/item/grenade/chem_grenade/ghostbuster(src)
new /obj/item/grenade/chem_grenade/ghostbuster(src)
/obj/item/choice_beacon/augments
- name = "augment beacon"
- desc = "Summons augmentations. Can be used 3 times!"
+ name = "augment box"
+ desc = "Contains augmentations. Can be used 3 times!"
uses = 3
/obj/item/choice_beacon/augments/generate_display_names()
@@ -157,14 +144,9 @@
augment_list[initial(A.name)] = A
return augment_list
-/obj/item/choice_beacon/augments/spawn_option(obj/choice,mob/living/M)
- new choice(get_turf(M))
- to_chat(M, "You hear something crackle from the beacon for a moment before a voice speaks. \"Please stand by for a message from S.E.L.F. Message as follows: Item request received. Your package has been transported, use the autosurgeon supplied to apply the upgrade. Message ends.\"")
-
/obj/item/skub
desc = "It's skub."
name = "skub"
- icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "skub"
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("skubbed")
@@ -217,8 +199,10 @@
#undef NICKNAME_CAP
/obj/item/choice_beacon/ouija
- name = "spirit board delivery beacon"
+ name = "spirit board box"
desc = "Ghost communication on demand! It is unclear how this thing is still operational."
+ icon_state = "deliverybox"
+ w_class = WEIGHT_CLASS_BULKY
/obj/item/choice_beacon/ouija/generate_display_names()
var/static/list/ouija_spaghetti_list
@@ -230,17 +214,6 @@
ouija_spaghetti_list[initial(A.name)] = A
return ouija_spaghetti_list
-/obj/structure/legionpike
- name = "legion on a spear"
- desc = "EXTREME interior decorating. You can feel it watching you."
- icon = 'icons/obj/structures.dmi'
- icon_state = "headpike-legion"
- density = FALSE
- anchored = TRUE
- light_color = "#8B0000"
- light_power = 2
- light_range = 2
-
//rare and valulable gems- designed to eventually be used for archeology, or to be given as opposed to money as loot. Auctioned off at export, or kept as a trophy.
/obj/item/gem/rupee
name = "\improper Ruperium Crystal"
@@ -295,3 +268,283 @@
light_power = 1
light_color = "#4785a4"
w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/phone
+ name = "red phone"
+ desc = "Should anything ever go wrong..."
+ icon_state = "red_phone"
+ force = 3
+ throwforce = 2
+ throw_speed = 3
+ throw_range = 4
+ w_class = WEIGHT_CLASS_SMALL
+ attack_verb = list("called", "rang")
+ hitsound = 'sound/weapons/ring.ogg'
+
+/obj/item/roastingstick
+ name = "advanced roasting stick"
+ desc = "A telescopic roasting stick with a miniature shield generator designed to ensure entry into various high-tech shielded cooking ovens and firepits."
+ icon_state = "roastingstick_0"
+ item_state = "null"
+ slot_flags = ITEM_SLOT_BELT
+ w_class = WEIGHT_CLASS_SMALL
+ item_flags = NONE
+ force = 0
+ attack_verb = list("hit", "poked")
+ var/obj/item/reagent_containers/food/snacks/sausage/held_sausage
+ var/static/list/ovens
+ var/on = FALSE
+ var/datum/beam/beam
+
+/obj/item/roastingstick/Initialize()
+ . = ..()
+ if (!ovens)
+ ovens = typecacheof(list(/obj/singularity, /obj/machinery/power/supermatter_crystal, /obj/structure/bonfire))
+
+/obj/item/roastingstick/attack_self(mob/user)
+ on = !on
+ if(on)
+ extend(user)
+ else
+ if (held_sausage)
+ to_chat(user, "You can't retract [src] while [held_sausage] is attached!")
+ return
+ retract(user)
+
+ playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
+ add_fingerprint(user)
+
+/obj/item/roastingstick/attackby(atom/target, mob/user)
+ ..()
+ if (istype(target, /obj/item/reagent_containers/food/snacks/sausage))
+ if (!on)
+ to_chat(user, "You must extend [src] to attach anything to it!")
+ return
+ if (held_sausage)
+ to_chat(user, "[held_sausage] is already attached to [src]!")
+ return
+ if (user.transferItemToLoc(target, src))
+ held_sausage = target
+ else
+ to_chat(user, "[target] doesn't seem to want to get on [src]!")
+ update_appearance()
+
+/obj/item/roastingstick/attack_hand(mob/user)
+ ..()
+ if (held_sausage)
+ user.put_in_hands(held_sausage)
+ held_sausage = null
+ update_appearance()
+
+/obj/item/roastingstick/update_overlays()
+ . = ..()
+ if (held_sausage)
+ . += mutable_appearance(icon, "roastingstick_sausage")
+
+/obj/item/roastingstick/proc/extend(user)
+ to_chat(user, "You extend [src].")
+ icon_state = "roastingstick_1"
+ item_state = "nullrod"
+ w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/roastingstick/proc/retract(user)
+ to_chat(user, "You collapse [src].")
+ icon_state = "roastingstick_0"
+ item_state = null
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/roastingstick/handle_atom_del(atom/target)
+ if (target == held_sausage)
+ held_sausage = null
+ update_appearance()
+
+/obj/item/roastingstick/afterattack(atom/target, mob/user, proximity)
+ . = ..()
+ if (!on)
+ return
+ if (is_type_in_typecache(target, ovens))
+ if (held_sausage && held_sausage.roasted)
+ to_chat(src, "Your [held_sausage] has already been cooked!")
+ return
+ if (istype(target, /obj/singularity) && get_dist(user, target) < 10)
+ to_chat(user, "You send [held_sausage] towards [target].")
+ playsound(src, 'sound/items/rped.ogg', 50, TRUE)
+ beam = user.Beam(target,icon_state="rped_upgrade",time=100)
+ else if (user.Adjacent(target))
+ to_chat(user, "You extend [src] towards [target].")
+ playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
+ else
+ return
+ if(do_after(user, 100, target = user))
+ finish_roasting(user, target)
+ else
+ QDEL_NULL(beam)
+ playsound(src, 'sound/weapons/batonextend.ogg', 50, TRUE)
+
+/obj/item/roastingstick/proc/finish_roasting(user, atom/target)
+ to_chat(user, "You finish roasting [held_sausage].")
+ playsound(src,'sound/items/welder2.ogg',50,TRUE)
+ held_sausage.add_atom_colour(rgb(103,63,24), FIXED_COLOUR_PRIORITY)
+ held_sausage.name = "[target.name]-roasted [held_sausage.name]"
+ held_sausage.desc = "[held_sausage.desc] It has been cooked to perfection on \a [target]."
+ update_appearance()
+
+/obj/item/skateboard
+ name = "improvised skateboard"
+ desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon."
+ icon_state = "skateboard"
+ item_state = "skateboard"
+ force = 12
+ throwforce = 4
+ w_class = WEIGHT_CLASS_NORMAL
+ attack_verb = list("smacked", "whacked", "slammed", "smashed")
+ ///The vehicle counterpart for the board
+ var/board_item_type = /obj/vehicle/ridden/scooter/skateboard
+
+/obj/item/skateboard/attack_self(mob/user)
+ var/obj/vehicle/ridden/scooter/skateboard/S = new board_item_type(get_turf(user))//this probably has fucky interactions with telekinesis but for the record it wasnt my fault
+ S.buckle_mob(user)
+ qdel(src)
+
+/obj/item/skateboard/pro
+ name = "skateboard"
+ desc = "A RaDSTORMz brand professional skateboard. It looks sturdy and well made."
+ icon_state = "skateboard2"
+ item_state = "skateboard2"
+ board_item_type = /obj/vehicle/ridden/scooter/skateboard/pro
+ custom_premium_price = 500
+
+/obj/item/skateboard/hoverboard
+ name = "hoverboard"
+ desc = "A blast from the past, so retro!"
+ icon_state = "hoverboard_red"
+ item_state = "hoverboard_red"
+ board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard
+ custom_premium_price = 2015
+
+/obj/item/skateboard/hoverboard/admin
+ name = "\improper Board Of Directors"
+ desc = "The engineering complexity of a spaceship concentrated inside of a board. Just as expensive, too."
+ icon_state = "hoverboard_nt"
+ item_state = "hoverboard_nt"
+ board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard/admin
+
+/obj/item/statuebust
+ name = "bust"
+ desc = "A priceless ancient marble bust, the kind that belongs in a museum." //or you can hit people with it
+ icon = 'icons/obj/statue.dmi'
+ icon_state = "bust"
+ force = 15
+ throwforce = 10
+ throw_speed = 5
+ throw_range = 2
+ attack_verb = list("busted")
+ var/impressiveness = 45
+
+/obj/item/statuebust/Initialize()
+ . = ..()
+ AddComponent(/datum/component/art, impressiveness)
+ AddElement(/datum/element/beauty, 1000)
+
+/obj/item/statuebust/hippocratic
+ name = "hippocrates bust"
+ desc = "A bust of the famous Greek physician Hippocrates of Kos, often referred to as the father of western medicine."
+ icon_state = "hippocratic"
+ impressiveness = 50
+
+/obj/item/extendohand
+ name = "extendo-hand"
+ desc = "Futuristic tech has allowed these classic spring-boxing toys to essentially act as a fully functional hand-operated hand prosthetic."
+ icon_state = "extendohand"
+ item_state = "extendohand"
+ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
+ force = 0
+ throwforce = 5
+ reach = 2
+ var/min_reach = 2
+
+/obj/item/extendohand/acme
+ name = "\improper ACME Extendo-Hand"
+ desc = "A novelty extendo-hand produced by the ACME corporation. Originally designed to knock out roadrunners."
+
+/obj/item/extendohand/attack(atom/M, mob/living/carbon/human/user)
+ var/dist = get_dist(M, user)
+ if(dist < min_reach)
+ to_chat(user, "[M] is too close to use [src] on.")
+ return
+ M.attack_hand(user)
+
+/obj/item/gohei
+ name = "gohei"
+ desc = "A wooden stick with white streamers at the end. Originally used by shrine maidens to purify things."
+ force = 5
+ throwforce = 5
+ hitsound = "swing_hit"
+ attack_verb = list("whacked", "thwacked", "walloped", "socked")
+ icon_state = "gohei"
+ item_state = "gohei"
+ lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
+
+/obj/item/ectoplasm
+ name = "ectoplasm"
+ desc = "Spooky."
+ gender = PLURAL
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "ectoplasm"
+
+/obj/item/ectoplasm/angelic
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "angelplasm"
+
+/obj/item/cane
+ name = "cane"
+ desc = "A cane used by a true gentleman."
+ icon = 'icons/obj/items.dmi'
+ icon_state = "cane"
+ item_state = "stick"
+ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
+ force = 5
+ throwforce = 5
+ w_class = WEIGHT_CLASS_SMALL
+ custom_materials = list(/datum/material/iron=50)
+ attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
+
+/obj/item/staff
+ name = "wizard staff"
+ desc = "Apparently a staff used by the wizard."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "staff"
+ lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
+ force = 3
+ throwforce = 5
+ throw_speed = 2
+ throw_range = 5
+ w_class = WEIGHT_CLASS_SMALL
+ armour_penetration = 100
+ attack_verb = list("bludgeoned", "whacked", "disciplined")
+ resistance_flags = FLAMMABLE
+
+/obj/item/staff/broom
+ name = "broom"
+ desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "broom"
+ resistance_flags = FLAMMABLE
+
+/obj/item/staff/stick
+ name = "stick"
+ desc = "A great tool to drag someone else's drinks across the bar."
+ icon = 'icons/obj/items.dmi'
+ icon_state = "cane"
+ item_state = "stick"
+ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
+ force = 3
+ throwforce = 5
+ throw_speed = 2
+ throw_range = 5
+ w_class = WEIGHT_CLASS_SMALL
diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm
index 5aff78b5561..9e314d848e3 100644
--- a/code/game/objects/items/paint.dm
+++ b/code/game/objects/items/paint.dm
@@ -5,7 +5,6 @@
gender= PLURAL
name = "paint"
desc = "Used to recolor floors and walls. Can be removed by the janitor."
- icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "paint_neutral"
var/paint_color = "FFFFFF"
item_state = "paintcan"
diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm
index a08b1398aad..0882034b165 100644
--- a/code/game/objects/items/pet_carrier.dm
+++ b/code/game/objects/items/pet_carrier.dm
@@ -31,13 +31,13 @@
/obj/item/pet_carrier/Exited(atom/movable/occupant)
. = ..()
- if(occupant in occupants && isliving(occupant))
+ if((occupant in occupants) && isliving(occupant))
var/mob/living/L = occupant
occupants -= occupant
occupant_weight -= L.mob_size
/obj/item/pet_carrier/handle_atom_del(atom/A)
- if(A in occupants && isliving(A))
+ if((A in occupants) && isliving(A))
var/mob/living/L = A
occupants -= L
occupant_weight -= L.mob_size
@@ -178,7 +178,7 @@
add_occupant(target)
/obj/item/pet_carrier/proc/add_occupant(mob/living/occupant)
- if(occupant in occupants || !istype(occupant))
+ if((occupant in occupants) || !istype(occupant))
return
occupant.forceMove(src)
occupants += occupant
diff --git a/code/game/objects/items/pitchfork.dm b/code/game/objects/items/pitchfork.dm
deleted file mode 100644
index 05183ed479d..00000000000
--- a/code/game/objects/items/pitchfork.dm
+++ /dev/null
@@ -1,102 +0,0 @@
-/obj/item/pitchfork
- icon_state = "pitchfork0"
- base_icon_state = "pitchfork"
- lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
- name = "pitchfork"
- desc = "A simple tool used for moving hay."
- force = 7
- throwforce = 15
- w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("attacked", "impaled", "pierced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
- resistance_flags = FIRE_PROOF
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/pitchfork/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
-
-/obj/item/pitchfork/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=7, force_wielded=15, icon_wielded="[base_icon_state]1")
-
-/// triggered on wield of two handed item
-/obj/item/pitchfork/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/pitchfork/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
-/obj/item/pitchfork/update_icon_state()
- icon_state = "[base_icon_state]0"
- return ..()
-
-/obj/item/pitchfork/demonic
- name = "demonic pitchfork"
- desc = "A red pitchfork, it looks like the work of the devil."
- force = 19
- throwforce = 24
- light_system = MOVABLE_LIGHT
- light_range = 3
- light_power = 6
- light_color = COLOR_SOFT_RED
-
-
-/obj/item/pitchfork/demonic/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=19, force_wielded=25)
-
-/obj/item/pitchfork/demonic/greater
- force = 24
- throwforce = 50
-
-/obj/item/pitchfork/demonic/greater/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=24, force_wielded=34)
-
-/obj/item/pitchfork/demonic/ascended
- force = 100
- throwforce = 100
-
-/obj/item/pitchfork/demonic/ascended/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=100, force_wielded=500000) // Kills you DEAD
-
-/obj/item/pitchfork/demonic/pickup(mob/living/user)
- . = ..()
- if(isliving(user) && user.mind && user.owns_soul() && !is_devil(user))
- var/mob/living/U = user
- U.visible_message("As [U] picks [src] up, [U]'s arms briefly catch fire.", \
- "\"As you pick up [src] your arms ignite, reminding you of all your past sins.\"")
- if(ishuman(U))
- var/mob/living/carbon/human/H = U
- H.apply_damage(rand(force/2, force), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
- else
- U.adjustFireLoss(rand(force/2,force))
-
-/obj/item/pitchfork/demonic/attack(mob/target, mob/living/carbon/human/user)
- if(user.mind && user.owns_soul() && !is_devil(user))
- to_chat(user, "[src] burns in your hands.")
- user.apply_damage(rand(force/2, force), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
- ..()
-
-/obj/item/pitchfork/demonic/ascended/afterattack(atom/target, mob/user, proximity)
- . = ..()
- if(!proximity || !wielded)
- return
- if(iswallturf(target))
- var/turf/closed/wall/W = target
- user.visible_message("[user] blasts \the [target] with \the [src]!")
- playsound(target, 'sound/magic/disintegrate.ogg', 100, TRUE)
- W.dismantle_wall(devastated = FALSE)
- return
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index a6ef402ecad..dd00d3abd1f 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -38,7 +38,7 @@
. = ..()
if(should_squeak)
AddComponent(/datum/component/squeak, squeak_override)
- AddElement(/datum/element/bed_tuckable, 6, -5, 90)
+ AddElement(/datum/element/bed_tuckable, 6, -5, 90, FALSE, FALSE)
//have we decided if Pinocchio goes in the blue or pink aisle yet?
if(gender == NEUTER)
diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm
index 060e59f0f5d..9122be0a5d6 100644
--- a/code/game/objects/items/pneumaticCannon.dm
+++ b/code/game/objects/items/pneumaticCannon.dm
@@ -11,8 +11,8 @@
icon = 'icons/obj/pneumaticCannon.dmi'
icon_state = "pneumaticCannon"
item_state = "bulldog"
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ lefthand_file = GUN_LEFTHAND_ICON
+ righthand_file = GUN_RIGHTHAND_ICON
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
var/maxWeightClass = 20 //The max weight of items that can fit into the cannon
var/loadedWeightClass = 0 //The weight of items currently in the cannon
@@ -326,23 +326,3 @@
/obj/item/pneumatic_cannon/speargun/Initialize()
. = ..()
allowed_typecache = magspear_typecache
-
-/obj/item/storage/backpack/magspear_quiver
- name = "quiver"
- desc = "A quiver for holding magspears."
- icon_state = "quiver"
- item_state = "quiver"
-
-/obj/item/storage/backpack/magspear_quiver/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 20
- STR.max_combined_w_class = 40
- STR.display_numerical_stacking = TRUE
- STR.set_holdable(list(
- /obj/item/throwing_star/magspear
- ))
-
-/obj/item/storage/backpack/magspear_quiver/PopulateContents()
- for(var/i in 1 to 20)
- new /obj/item/throwing_star/magspear(src)
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index e2507dfb911..97cc74a5158 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -232,7 +232,7 @@
name = "Plate Gauntlets"
icon_state = "crusader"
desc = "They're like gloves, but made of metal."
- siemens_coefficient = 0
+ siemens_coefficient = 0.5
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
@@ -244,52 +244,6 @@
/obj/item/clothing/gloves/plate/blue
icon_state = "crusader-blue"
-/obj/item/clothing/shoes/plate
- name = "Plate Boots"
- desc = "Metal boots, they look heavy."
- icon_state = "crusader"
- w_class = WEIGHT_CLASS_NORMAL
- armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //does this even do anything on boots?
- clothing_flags = NOSLIP
- cold_protection = FEET
- min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
- heat_protection = FEET
- max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
-
-
-/obj/item/clothing/shoes/plate/red
- icon_state = "crusader-red"
-
-/obj/item/clothing/shoes/plate/blue
- icon_state = "crusader-blue"
-
-
/obj/item/storage/box/itemset/crusader
name = "Crusader's Armour Set" //i can't into ck2 references
desc = "This armour is said to be based on the armor of kings on another world thousands of years ago, who tended to assassinate, conspire, and plot against everyone who tried to do the same to them. Some things never change."
-
-
-/obj/item/storage/box/itemset/crusader/blue/PopulateContents()
- new /obj/item/clothing/suit/armor/plate/crusader/blue(src)
- new /obj/item/clothing/head/helmet/plate/crusader/blue(src)
- new /obj/item/clothing/gloves/plate/blue(src)
- new /obj/item/clothing/shoes/plate/blue(src)
-
-
-/obj/item/storage/box/itemset/crusader/red/PopulateContents()
- new /obj/item/clothing/suit/armor/plate/crusader/red(src)
- new /obj/item/clothing/head/helmet/plate/crusader/red(src)
- new /obj/item/clothing/gloves/plate/red(src)
- new /obj/item/clothing/shoes/plate/red(src)
-
-
-/obj/item/claymore/weak
- desc = "This one is rusted."
- force = 30
- armour_penetration = 15
-
-/obj/item/claymore/weak/ceremonial
- desc = "A rusted claymore, once at the heart of a powerful scottish clan struck down and oppressed by tyrants, it has been passed down the ages as a symbol of defiance."
- force = 15
- block_chance = 30
- armour_penetration = 5
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 243b84b7e1e..0b83489ed8c 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -593,7 +593,7 @@
to_chat(user, "You [active? "activate":"deactivate"] [src].")
/obj/item/borg/projectile_dampen/update_icon_state()
- icon_state = "[initial(icon_state)][active]"
+ icon_state = "shield[active]"
return ..()
/obj/item/borg/projectile_dampen/proc/activate_field()
@@ -886,7 +886,7 @@
desc = "A special apparatus for carrying drinks without spilling the contents. Alt-Z or right-click to drop the beaker."
icon_state = "borg_beaker_apparatus"
storable = list(/obj/item/reagent_containers/food/drinks/,
- /obj/item/reagent_containers/food/condiment)
+ /obj/item/reagent_containers/condiment)
/obj/item/borg/apparatus/beaker/service/Initialize()
. = ..()
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 3194c130251..6aba2046339 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -289,7 +289,6 @@
if(M.laws.id == DEFAULT_AI_LAWID)
O.make_laws()
- SSticker.mode.remove_antag_for_borging(B.mind)
O.job = "Cyborg"
O.cell = chest.cell
diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm
index f9d429b55a3..00217a8550a 100644
--- a/code/game/objects/items/sharpener.dm
+++ b/code/game/objects/items/sharpener.dm
@@ -21,7 +21,7 @@
if(requires_sharpness && !I.get_sharpness())
to_chat(user, "You can only sharpen items that are already sharp, such as knives!")
return
- if(istype(I, /obj/item/melee/transforming/energy))
+ if(istype(I, /obj/item/melee/energy))
to_chat(user, "You don't think \the [I] will be the thing getting modified if you use it on \the [src]!")
return
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index 685bfeae8a8..a9051a5c24e 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -27,6 +27,8 @@
transparent = TRUE
max_integrity = 75
material_flags = MATERIAL_NO_EFFECTS
+ ///Modifier for recoil when using a gun with this shield in the offhand
+ var/recoil_bonus = -2
/obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(transparent && (hitby.pass_flags & PASSGLASS))
@@ -42,30 +44,32 @@
/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/melee/baton))
if(cooldown < world.time - 25)
- user.visible_message("[user] bashes [src] with [W]!")
+ user.visible_message(span_warning("[user] bashes [src] with [W]!"))
playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, TRUE)
cooldown = world.time
else if(istype(W, /obj/item/stack/sheet/mineral/titanium))
if (obj_integrity >= max_integrity)
- to_chat(user, "[src] is already in perfect condition.")
+ to_chat(user, span_warning("[src] is already in perfect condition."))
else
var/obj/item/stack/sheet/mineral/titanium/T = W
T.use(1)
obj_integrity = max_integrity
- to_chat(user, "You repair [src] with [T].")
+ to_chat(user, span_notice("You repair [src] with [T]."))
else
return ..()
/obj/item/shield/riot/examine(mob/user)
. = ..()
+ if(recoil_bonus)
+ . += span_info("Firing a gun while holding this will brace against it, reducing the impact of recoil.")
var/healthpercent = round((obj_integrity/max_integrity) * 100, 1)
switch(healthpercent)
if(50 to 99)
- . += "It looks slightly damaged."
+ . += span_info("It looks slightly damaged.")
if(25 to 50)
- . += "It appears heavily damaged."
+ . += span_info("It appears heavily damaged.")
if(0 to 25)
- . += "It's falling apart!"
+ . += span_warning("It's falling apart!")
/obj/item/shield/riot/proc/shatter(mob/living/carbon/human/owner)
playsound(owner, 'sound/effects/glassbr3.ogg', 100)
@@ -97,6 +101,7 @@
block_chance = 0
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
max_integrity = 30
+ recoil_bonus = 0 //it's PLASTIC
/obj/item/shield/riot/roman/shatter(mob/living/carbon/human/owner)
playsound(owner, 'sound/effects/grillehit.ogg', 100)
@@ -115,6 +120,7 @@
transparent = FALSE
max_integrity = 55
w_class = WEIGHT_CLASS_NORMAL
+ recoil_bonus = -1
/obj/item/shield/riot/buckler/shatter(mob/living/carbon/human/owner)
playsound(owner, 'sound/effects/bang.ogg', 50)
diff --git a/code/game/objects/items/shrapnel.dm b/code/game/objects/items/shrapnel.dm
index 959649c8c59..8eb154baf74 100644
--- a/code/game/objects/items/shrapnel.dm
+++ b/code/game/objects/items/shrapnel.dm
@@ -20,7 +20,7 @@
/obj/item/shrapnel/bullet // bullets
name = "bullet"
- icon = 'icons/obj/ammo_bullets.dmi'
+ icon = 'icons/obj/ammunition/ammo_bullets.dmi'
icon_state = "pistol-brass"
item_flags = NONE
@@ -31,11 +31,42 @@
name = "\improper .38 DumDum bullet"
embedding = list(embed_chance=70, fall_chance=7, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10, embed_chance_turf_mod=-100)
+/obj/item/shrapnel/bullet/tracker
+ name = "\improper bullet tracker"
+ embedding = list(embed_chance=100, fall_chance=0, jostle_chance=1, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=1, jostle_pain_mult=2, rip_time=100, embed_chance_turf_mod=-100)
+ var/lifespan = 3000
+ var/gps_tag = "*TRAC"
+ var/timer_id
+
+/obj/item/shrapnel/bullet/tracker/Initialize()
+ . = ..()
+ timer_id = QDEL_IN(src, lifespan)
+ AddComponent(/datum/component/gps/item, gps_tag)
+
+/obj/item/shrapnel/bullet/tracker/Destroy()
+ deltimer(timer_id)
+ return ..()
+
+/obj/item/shrapnel/bullet/tracker/c38
+ name = ".38 Tracker"
+
+/obj/item/shrapnel/bullet/tracker/a8_50r
+ name = "8x50mm Tracker"
+
+/obj/item/shrapnel/bullet/tracker/a858
+ name = "8x58mm Tracker"
+
+/obj/item/shrapnel/bullet/tracker/a65clip
+ name = "6.5x57mm Tracker"
+
+/obj/item/shrapnel/bullet/tracker/a308
+ name = ".308 Tracker"
+
/obj/projectile/bullet/shrapnel
name = "flying shrapnel shard"
damage = 10
range = 10
- armour_penetration = -20
+ armour_penetration = -5
dismemberment = 25
ricochets_max = 2
ricochet_chance = 40
@@ -49,7 +80,7 @@
/obj/projectile/bullet/shrapnel/rusty
damage = 8
- armour_penetration = -35
+ armour_penetration = -10
dismemberment = 15
ricochets_max = 3//duller = less likely to stick in a wall
ricochet_chance = 60
@@ -115,3 +146,42 @@
/obj/projectile/bullet/pellet/stingball/on_ricochet(atom/A)
hit_stunned_targets = TRUE // ducking will save you from the first wave, but not the rebounds
+
+
+//claymore shrapnel stuff//
+//2 small bursts- one that harasses people passing by a bit aways, one that brutalizes point-blank targets.
+/obj/item/ammo_casing/caseless/shrapnel
+ name = "directional shrapnel burst :D"
+ desc = "I May Have Overreacted"
+ pellets = 5
+ variance = 70
+ projectile_type = /obj/projectile/bullet/shrapnel/claymore
+ randomspread = TRUE
+
+/obj/item/ammo_casing/caseless/shrapnel/shred
+ name = "point blank directional shrapnel burst"
+ desc = "Claymores are lethal to armored infantry at point blank range."
+ pellets = 4
+ variance = 50
+ projectile_type = /obj/projectile/bullet/shrapnel/claymore/pointbl
+ randomspread = TRUE
+
+/obj/projectile/bullet/shrapnel/claymore
+ name = "ceramic splinter"
+ range = 4
+ armour_penetration = 0
+
+/obj/projectile/bullet/shrapnel/claymore/pointbl
+ name = "large ceramic shard"
+ range = 2
+ damage = 18
+ dismemberment = 30
+ armour_penetration = 10
+
+/obj/item/ammo_casing/caseless/shrapnel/plasma
+ name = "directional plasma burst"
+ projectile_type = /obj/projectile/energy/plasmabolt
+
+/obj/item/ammo_casing/caseless/shrapnel/shred/plasma
+ name = "point blank directional plasma burst"
+ projectile_type = /obj/projectile/energy/plasmabolt/shred
diff --git a/code/game/objects/items/shuttle_creator.dm b/code/game/objects/items/shuttle_creator.dm
index 781020f8731..9f25041d1f0 100644
--- a/code/game/objects/items/shuttle_creator.dm
+++ b/code/game/objects/items/shuttle_creator.dm
@@ -218,7 +218,6 @@
/obj/item/shuttle_creator/proc/check_current_area(mob/user)
var/static/area_or_turf_fail_types = typecacheof(list(
/turf/open/space,
- /area/shuttle
))
//Check to see if the user can make a new area to prevent spamming
if(user)
diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm
deleted file mode 100644
index 04d7629623b..00000000000
--- a/code/game/objects/items/singularityhammer.dm
+++ /dev/null
@@ -1,145 +0,0 @@
-/obj/item/singularityhammer
- name = "singularity hammer"
- desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows."
- icon_state = "singularity0"
- base_icon_state = "singularity_hammer"
- lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
- flags_1 = CONDUCT_1
- slot_flags = ITEM_SLOT_BACK
- force = 5
- throwforce = 15
- throw_range = 1
- w_class = WEIGHT_CLASS_HUGE
- armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
- resistance_flags = FIRE_PROOF | ACID_PROOF
- force_string = "LORD SINGULOTH HIMSELF"
- var/charged = 5
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/singularityhammer/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
- START_PROCESSING(SSobj, src)
-
-/obj/item/singularityhammer/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_multiplier=4, icon_wielded="[base_icon_state]1")
-
-/// triggered on wield of two handed item
-/obj/item/singularityhammer/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/singularityhammer/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
-/obj/item/singularityhammer/update_icon_state()
- icon_state = "[base_icon_state]0"
- return ..()
-
-/obj/item/singularityhammer/Destroy()
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/item/singularityhammer/process()
- if(charged < 5)
- charged++
-
-/obj/item/singularityhammer/proc/vortex(turf/pull, mob/wielder)
- for(var/atom/X in orange(5,pull))
- if(ismovable(X))
- var/atom/movable/A = X
- if(A == wielder)
- continue
- if(A && !A.anchored && !ishuman(X) && !isobserver(X))
- step_towards(A,pull)
- step_towards(A,pull)
- step_towards(A,pull)
- else if(ishuman(X))
- var/mob/living/carbon/human/H = X
- if(istype(H.shoes, /obj/item/clothing/shoes/magboots))
- var/obj/item/clothing/shoes/magboots/M = H.shoes
- if(M.magpulse)
- continue
- H.apply_effect(20, EFFECT_PARALYZE, 0)
- step_towards(H,pull)
- step_towards(H,pull)
- step_towards(H,pull)
-
-/obj/item/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
- . = ..()
- if(!proximity)
- return
- if(wielded)
- if(charged == 5)
- charged = 0
- if(istype(A, /mob/living/))
- var/mob/living/Z = A
- Z.take_bodypart_damage(20,0)
- playsound(user, 'sound/weapons/marauder.ogg', 50, TRUE)
- var/turf/target = get_turf(A)
- vortex(target,user)
-
-/obj/item/mjollnir
- name = "Mjolnir"
- desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
- icon_state = "mjollnir0"
- base_icon_state = "mjollnir"
- lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
- flags_1 = CONDUCT_1
- slot_flags = ITEM_SLOT_BACK
- force = 5
- throwforce = 30
- throw_range = 7
- w_class = WEIGHT_CLASS_HUGE
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/mjollnir/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
-
-/obj/item/mjollnir/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_multiplier=5, icon_wielded="[base_icon_state]1", attacksound="sparks")
-
-/// triggered on wield of two handed item
-/obj/item/mjollnir/proc/on_wield(obj/item/source, mob/user)
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/mjollnir/proc/on_unwield(obj/item/source, mob/user)
- wielded = FALSE
-
-/obj/item/mjollnir/update_icon_state()
- icon_state = "[base_icon_state]0"
- return ..()
-
-/obj/item/mjollnir/proc/shock(mob/living/target)
- target.Stun(60)
- var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread
- s.set_up(5, 1, target.loc)
- s.start()
- target.visible_message("[target.name] is shocked by [src]!", \
- "You feel a powerful shock course through your body sending you flying!", \
- "You hear a heavy electrical crack!")
- var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
- target.throw_at(throw_target, 200, 4)
- return
-
-/obj/item/mjollnir/attack(mob/living/M, mob/user)
- ..()
- if(wielded)
- shock(M)
-
-/obj/item/mjollnir/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- . = ..()
- if(isliving(hit_atom))
- shock(hit_atom)
diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm
deleted file mode 100644
index be6b9d3a5a1..00000000000
--- a/code/game/objects/items/spear.dm
+++ /dev/null
@@ -1,283 +0,0 @@
-//spears
-/obj/item/spear
- icon_state = "spearglass0"
- lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
- name = "spear"
- desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
- force = 10
- w_class = WEIGHT_CLASS_BULKY
- slot_flags = ITEM_SLOT_BACK
- throwforce = 20
- throw_speed = 4
- embedding = list("impact_pain_mult" = 3)
- armour_penetration = 10
- custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
- sharpness = IS_SHARP
- max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
- species_exception = list(/datum/species/kepori)
- var/war_cry = "AAAAARGH!!!"
- var/icon_prefix = "spearglass"
-
-/obj/item/spear/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/butchering, 100, 70) //decent in a pinch, but pretty bad.
- AddComponent(/datum/component/jousting)
- AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]1")
-
-/obj/item/spear/update_icon_state()
- icon_state = "[icon_prefix]0"
- return ..()
-
-/obj/item/spear/CheckParts(list/parts_list)
- var/obj/item/shard/tip = locate() in parts_list
- if (istype(tip, /obj/item/shard/plasma))
- throwforce = 21
- icon_prefix = "spearplasma"
- AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]1")
- update_appearance()
- qdel(tip)
- ..()
-
-/obj/item/spear/explosive
- name = "explosive lance"
- icon_state = "spearbomb0"
- base_icon_state = "spearbomb"
- icon_prefix = "spearbomb"
- var/obj/item/grenade/explosive = null
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/spear/explosive/Initialize(mapload)
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
- set_explosive(new /obj/item/grenade/iedcasing/spawned()) //For admin-spawned explosive lances
-
-/obj/item/spear/explosive/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]1")
-
-/// triggered on wield of two handed item
-/obj/item/spear/explosive/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/spear/explosive/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
-/obj/item/spear/explosive/proc/set_explosive(obj/item/grenade/G)
- if(explosive)
- QDEL_NULL(explosive)
- G.forceMove(src)
- explosive = G
- desc = "A makeshift spear with [G] attached to it"
-
-/obj/item/spear/explosive/CheckParts(list/parts_list)
- var/obj/item/grenade/G = locate() in parts_list
- if(G)
- var/obj/item/spear/lancePart = locate() in parts_list
- var/datum/component/two_handed/comp_twohand = lancePart.GetComponent(/datum/component/two_handed)
- if(comp_twohand)
- var/lance_wielded = comp_twohand.force_wielded
- var/lance_unwielded = comp_twohand.force_unwielded
- AddComponent(/datum/component/two_handed, force_unwielded=lance_unwielded, force_wielded=lance_wielded)
- throwforce = lancePart.throwforce
- icon_prefix = lancePart.icon_prefix
- parts_list -= G
- parts_list -= lancePart
- set_explosive(G)
- qdel(lancePart)
- ..()
-
-/obj/item/spear/explosive/examine(mob/user)
- . = ..()
- . += "Alt-click to set your war cry."
-
-/obj/item/spear/explosive/AltClick(mob/user)
- if(user.canUseTopic(src, BE_CLOSE))
- ..()
- if(istype(user) && loc == user)
- var/input = stripped_input(user,"What do you want your war cry to be? You will shout it when you hit someone in melee.", ,"", 50)
- if(input)
- src.war_cry = input
-
-/obj/item/spear/explosive/afterattack(atom/movable/AM, mob/user, proximity)
- . = ..()
- if(!proximity)
- return
- if(wielded)
- user.say("[war_cry]", forced="spear warcry")
- explosive.forceMove(AM)
- explosive.prime()
- qdel(src)
-
-//GREY TIDE
-/obj/item/spear/grey_tide
- name = "\improper Grey Tide"
- desc = "Recovered from the aftermath of a revolt aboard Defense Outpost Theta Aegis, in which a seemingly endless tide of Assistants caused heavy casualities among Nanotrasen military forces."
- attack_verb = list("gored")
- force=15
-
-/obj/item/spear/grey_tide/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=15, force_wielded=25, icon_wielded="[icon_prefix]1")
-
-/obj/item/spear/grey_tide/afterattack(atom/movable/AM, mob/living/user, proximity)
- . = ..()
- if(!proximity)
- return
- user.faction |= "greytide([REF(user)])"
- if(isliving(AM))
- var/mob/living/L = AM
- if(istype (L, /mob/living/simple_animal/hostile/illusion))
- return
- if(!L.stat && prob(50))
- var/mob/living/simple_animal/hostile/illusion/M = new(user.loc)
- M.faction = user.faction.Copy()
- M.Copy_Parent(user, 100, user.health/2.5, 12, 30)
- M.GiveTarget(L)
-
-/*
- * Bone Spear
- */
-/obj/item/spear/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification.
- icon_state = "bone_spear0"
- name = "bone spear"
- base_icon_state = "bone_spear0"
- icon_prefix = "bone_spear"
- desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology."
- icon = 'icons/obj/items_and_weapons.dmi'
- lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
- mob_overlay_icon = 'icons/mob/clothing/back.dmi'
- force = 12
- throwforce = 22
- armour_penetration = 15 //Enhanced armor piercing
-
-/obj/item/spear/bonespear/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=12, force_wielded=20, icon_wielded="[icon_prefix]1")
-/obj/item/spear/dragonspear//version of the bone spear crafted from the trophy dropped by the Ash Drake. High damage, high ap, burns.
- name = "dragonslayer's spear"
- desc = "A bone spear crafted from the leading spine of a fully-grown drake, razor-sharp and hotter then magma. Wielded by the deranged, pyromaniacs, and champions of lavaland."
- icon = 'icons/obj/items_and_weapons.dmi'
- lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
- mob_overlay_icon = 'icons/mob/clothing/back.dmi'
- force = 20
- throwforce = 25
- block_chance = 15//lol,lmao
- armour_penetration = 30
- embedding = list("impact_pain_mult" = 5)
- icon_prefix = "dragonspear"
- base_icon_state = "dragonspear0"
- icon_state = "dragonspear0"
- var/list/nemesis_factions = list("mining", "boss")
- var/faction_bonus_force = 25
- attack_verb = list("seared", "braided", "impaled", "smote", "gored")
- hitsound = 'sound/weapons/sear.ogg'
- var/cooldown_time = 0 SECONDS
- COOLDOWN_DECLARE(freeze_cooldown)
-
-/obj/item/spear/dragonspear/attack(mob/living/target, mob/living/carbon/human/user)
- var/nemesis_faction = FALSE
- if(LAZYLEN(nemesis_factions))
- for(var/F in target.faction)
- if(F in nemesis_factions)
- nemesis_faction = TRUE
- force += faction_bonus_force
- throwforce += faction_bonus_force
- nemesis_effects(user, target)
- break
- . = ..()
- if(nemesis_faction)
- force -= faction_bonus_force
- throwforce -= faction_bonus_force
-
-/obj/item/spear/dragonspear/proc/nemesis_effects(mob/living/user, mob/living/target)
- return
-
-/obj/item/spear/dragonspear/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=20, force_wielded=25, icon_wielded="[icon_prefix]1")
- AddComponent(/datum/component/butchering, 60, 150)
-
-/obj/item/spear/dragonspear/attack(atom/target, blocked = FALSE)
- if(iscarbon(target))
- var/mob/living/carbon/M = target
- M.adjust_fire_stacks(3)
- M.IgniteMob()
- M.apply_damage(5, BURN)
- M.adjust_bodytemperature(150)
- if(isanimal(target))
- var/mob/living/simple_animal/M = target
- M.apply_damage(15, BURN)
- ..()
-
-//crystal spear
-/obj/item/spear/crystal
- icon_state = "crystal_spear0"
- name = "crystal spear"
- desc = "While more 'sharp stick' than spear, this thing is extremely dangerous neverless. Crafted out of the mysterous crystals, it can hit for very high damage, although it will break with repeated use."
- icon = 'icons/obj/items_and_weapons.dmi'
- base_icon_state = "crystal_spear"
- icon_prefix = "crystal_spear"
- lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
- mob_overlay_icon = 'icons/mob/clothing/back.dmi'
- force = 12
- throwforce = 40
- armour_penetration = 20
- max_integrity = 300 //you can repair this with duct tape
- var/damage_to_take_on_hit = 25 //every time we hit something, deal how much damage?
-
-/obj/item/spear/crystal/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=12, force_wielded=30, icon_wielded="[icon_prefix]1") //4 hit crit
-
-/obj/item/spear/crystal/examine(mob/user)
- . = ..()
- . += "You can throw it for very high damage and stuns fauna, though this will shatter it instantly."
- var/healthpercent = (obj_integrity/max_integrity) * 100
- switch(healthpercent)
- if(50 to 99)
- . += "It looks slightly damaged."
- if(25 to 50)
- . += "It appears heavily damaged."
- if(0 to 25)
- . += "It's falling apart!"
-
-/obj/item/spear/crystal/attack(mob/living/M, mob/living/user)
- . = ..()
- take_damage(damage_to_take_on_hit)
-
-/obj/item/spear/crystal/attack_obj(obj/O, mob/living/user)
- . = ..()
- take_damage(damage_to_take_on_hit)
-
-/obj/item/spear/crystal/obj_destruction(damage_flag)
- visible_message("[src] shatters into a million pieces!")
- playsound(src,"shatter", 70)
- new /obj/effect/decal/cleanable/glass/strange(get_turf(src))
- return ..()
-
-/obj/item/spear/crystal/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) //destroyes when thrown
- . = ..()
- if(ishostile(hit_atom))
- var/mob/living/simple_animal/hostile/hostile_target = hit_atom
- var/hostile_ai_status = hostile_target.AIStatus
- hostile_target.AIStatus = AI_OFF
- addtimer(VARSET_CALLBACK(hostile_target, AIStatus, hostile_ai_status), 5 SECONDS)
-
- new /obj/effect/temp_visual/goliath_tentacle/crystal/visual_only(get_turf(src))
- visible_message("[src] shatters into a million pieces!")
- playsound(src,"shatter", 70)
- new /obj/effect/decal/cleanable/glass/strange(get_turf(src))
- qdel(src)
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 264ab12646e..8335a2d8273 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -4,16 +4,16 @@
icon = 'icons/obj/stack_objects.dmi'
amount = 6
max_amount = 6
- w_class = WEIGHT_CLASS_TINY
- full_w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
+ full_w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
resistance_flags = FLAMMABLE
max_integrity = 40
novariants = FALSE
item_flags = NOBLUDGEON
- var/splint_fracture = FALSE //WS Edit- Splints
- var/failure_chance //WS Edit - Failure chance
+ var/splint_fracture = FALSE
+ var/failure_chance
var/self_delay = 50
var/other_delay = 0
var/repeating = FALSE
@@ -117,9 +117,6 @@
grind_results = list(/datum/reagent/medicine/styptic_powder = 10)
/obj/item/stack/medical/bruise_pack/heal(mob/living/target, mob/user)
- if(target.stat == DEAD)
- to_chat(user, "[target] is dead! You can not help [target.p_them()].")
- return
if(isanimal(target))
var/mob/living/simple_animal/critter = target
if (!(critter.healable))
@@ -204,9 +201,6 @@
grind_results = list(/datum/reagent/medicine/silver_sulfadiazine = 10)
/obj/item/stack/medical/ointment/heal(mob/living/target, mob/user)
- if(target.stat == DEAD)
- to_chat(user, "[target] is dead! You can not help [target.p_them()].")
- return
if(iscarbon(target))
return heal_carbon(target, user, 0, heal_burn)
to_chat(user, "You can't heal [target] with the \the [src]!")
@@ -234,9 +228,6 @@
/obj/item/stack/medical/suture/heal(mob/living/target, mob/user)
. = ..()
- if(target.stat == DEAD)
- to_chat(user, "[target] is dead! You can not help [target.p_them()].")
- return
if(iscarbon(target))
return heal_carbon(target, user, heal_brute, 0)
if(isanimal(target))
@@ -281,9 +272,6 @@
/obj/item/stack/medical/mesh/heal(mob/living/target, mob/user)
. = ..()
- if(target.stat == DEAD)
- to_chat(user, "[target] is dead! You can not help [target.p_them()].")
- return
if(iscarbon(target))
return heal_carbon(target, user, 0, heal_burn)
to_chat(user, "You can't heal [target] with the \the [src]!")
@@ -347,9 +335,6 @@
/obj/item/stack/medical/aloe/heal(mob/living/target, mob/user)
. = ..()
- if(target.stat == DEAD)
- to_chat(user, "[target] is dead! You can not help [target.p_them()].")
- return FALSE
if(iscarbon(target))
return heal_carbon(target, user, heal, heal)
if(isanimal(target))
@@ -382,7 +367,7 @@
desc = "Used to secure limbs following a fracture."
gender = PLURAL
singular_name = "splint"
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "splint"
apply_sounds = list('sound/effects/rip1.ogg', 'sound/effects/rip2.ogg')
self_delay = 40
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index da08c87a5a3..0930ec09cab 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
null, \
new/datum/stack_recipe("directional reinforced window", /obj/structure/window/reinforced/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/reinforced/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
- new/datum/stack_recipe(" reinforced glass tile", /obj/item/stack/tile/glass/reinforced, 1, 4, 20), \
+ new/datum/stack_recipe("reinforced glass tile", /obj/item/stack/tile/glass/reinforced, 1, 4, 20), \
new/datum/stack_recipe("glass shard", /obj/item/shard, 1) \
))
@@ -282,7 +282,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
var/obj/item/stack/sheet/weld_material = /obj/item/stack/sheet/glass
embedding = list("embed_chance" = 65)
-/obj/item/shard/Initialize()
+/obj/item/shard/Initialize(mapload)
. = ..()
AddComponent(/datum/component/caltrop, force)
AddComponent(/datum/component/butchering, 150, 65)
@@ -300,17 +300,14 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
if (icon_prefix)
icon_state = "[icon_prefix][icon_state]"
- SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
+ if(!mapload)
+ SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
-/obj/item/shard/Destroy()
- . = ..()
- SSblackbox.record_feedback("tally", "station_mess_destroyed", 1, name)
-
/obj/item/shard/afterattack(atom/A as mob|obj, mob/user, proximity)
. = ..()
if(!proximity || !(src in user))
@@ -339,7 +336,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
var/obj/item/stack/sheet/cotton/cloth/C = I
to_chat(user, "You begin to wrap the [C] around the [src]...")
if(do_after(user, 35, target = src))
- var/obj/item/kitchen/knife/shiv/S = new /obj/item/kitchen/knife/shiv
+ var/obj/item/melee/knife/shiv/S = new /obj/item/melee/knife/shiv
C.use(1)
to_chat(user, "You wrap the [C] around the [src] forming a makeshift weapon.")
remove_item_from_storage(src)
@@ -371,7 +368,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
playsound(src, 'sound/effects/glass_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 30 : 50, TRUE)
/obj/item/shard/plasma
- name = "purple shard"
+ name = "plasmaglass shard"
desc = "A nasty looking shard of plasma glass."
force = 6
throwforce = 11
@@ -379,3 +376,13 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
custom_materials = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass=MINERAL_MATERIAL_AMOUNT)
icon_prefix = "plasma"
weld_material = /obj/item/stack/sheet/plasmaglass
+
+/obj/item/shard/plastitanium
+ name = "plastitanium glass shard"
+ desc = "A nasty looking shard of plastitanium glass."
+ force = 6
+ throwforce = 11
+ icon_state = "plastitaniumlarge"
+ custom_materials = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/plasma=MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass=MINERAL_MATERIAL_AMOUNT)
+ icon_prefix = "plastitanium"
+ weld_material = /obj/item/stack/sheet/plastitaniumglass
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 26cff752c36..5f4ede1dbe1 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -11,14 +11,6 @@
singular_name = "human skin piece"
novariants = FALSE
-GLOBAL_LIST_INIT(human_recipes, list( \
- new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/hooded/bloated_human, 5), \
- ))
-
-/obj/item/stack/sheet/animalhide/human/get_main_recipes()
- . = ..()
- . += GLOB.human_recipes
-
/obj/item/stack/sheet/animalhide/generic
name = "skin"
desc = "A piece of skin."
@@ -32,12 +24,6 @@ GLOBAL_LIST_INIT(human_recipes, list( \
icon_state = "sheet-corgi"
item_state = "sheet-corgi"
-
-GLOBAL_LIST_INIT(gondola_recipes, list ( \
- new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1), \
- new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/costume/gondola, 2), \
- ))
-
/obj/item/stack/sheet/animalhide/mothroach
name = "mothroach hide"
desc = "A thin layer of mothroach hide."
@@ -53,18 +39,6 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \
icon_state = "sheet-gondola"
item_state = "sheet-gondola"
-/obj/item/stack/sheet/animalhide/gondola/get_main_recipes()
- . = ..()
- . += GLOB.gondola_recipes
-
-GLOBAL_LIST_INIT(corgi_recipes, list ( \
- new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/hooded/ian_costume, 3), \
- ))
-
-/obj/item/stack/sheet/animalhide/corgi/get_main_recipes()
- . = ..()
- . += GLOB.corgi_recipes
-
/obj/item/stack/sheet/animalhide/cat
name = "cat hide"
desc = "The by-product of cat farming."
@@ -79,15 +53,6 @@ GLOBAL_LIST_INIT(corgi_recipes, list ( \
icon_state = "sheet-monkey"
item_state = "sheet-monkey"
-GLOBAL_LIST_INIT(monkey_recipes, list ( \
- new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \
- new/datum/stack_recipe("monkey suit", /obj/item/clothing/suit/monkeysuit, 2), \
- ))
-
-/obj/item/stack/sheet/animalhide/monkey/get_main_recipes()
- . = ..()
- . += GLOB.monkey_recipes
-
/obj/item/stack/sheet/animalhide/lizard
name = "lizard skin"
desc = "Sssssss..."
@@ -102,15 +67,6 @@ GLOBAL_LIST_INIT(monkey_recipes, list ( \
icon_state = "sheet-xeno"
item_state = "sheet-xeno"
-GLOBAL_LIST_INIT(xeno_recipes, list ( \
- new/datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos, 1), \
- new/datum/stack_recipe("alien suit", /obj/item/clothing/suit/xenos, 2), \
- ))
-
-/obj/item/stack/sheet/animalhide/xeno/get_main_recipes()
- . = ..()
- . += GLOB.xeno_recipes
-
//don't see anywhere else to put these, maybe together they could be used to make the xenos suit?
/obj/item/stack/sheet/xenochitin
name = "alien chitin"
@@ -167,7 +123,6 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \
new/datum/stack_recipe("bandolier", /obj/item/storage/belt/bandolier, 5), \
new/datum/stack_recipe("leather jacket", /obj/item/clothing/suit/jacket/leather, 7), \
new/datum/stack_recipe("leather shoes", /obj/item/clothing/shoes/laceup, 2), \
- new/datum/stack_recipe("leather overcoat", /obj/item/clothing/suit/jacket/leather/overcoat, 10), \
new/datum/stack_recipe("saddle", /obj/item/saddle, 5), \
))
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 9fc6fa808a4..88ac0c90d95 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -26,7 +26,6 @@ Mineral Sheets
GLOBAL_LIST_INIT(sandstone_recipes, list ( \
new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = 0, on_floor = 1) \
))
@@ -74,9 +73,8 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
/obj/item/emptysandbag
name = "empty sandbag"
desc = "A bag to be filled with sand."
- icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "sandbag"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/emptysandbag/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stack/ore/glass))
@@ -109,9 +107,6 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
GLOBAL_LIST_INIT(diamond_recipes, list ( \
new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), \
- new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/diamond/get_main_recipes()
@@ -147,7 +142,6 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \
new/datum/stack_recipe("Nuke Statue", /obj/structure/statue/uranium/nuke, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/uranium/get_main_recipes()
@@ -187,7 +181,6 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
GLOBAL_LIST_INIT(plasma_recipes, list ( \
new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \
- new/datum/stack_recipe("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/plasma/get_main_recipes()
@@ -241,12 +234,7 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
new/datum/stack_recipe("chemical crate", /obj/structure/closet/crate/chem, 1, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \
new/datum/stack_recipe("blank plaque", /obj/item/plaque, 1), \
- new/datum/stack_recipe("HoS Statue", /obj/structure/statue/gold/hos, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("HOP Statue", /obj/structure/statue/gold/head_of_personnel, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("CE Statue", /obj/structure/statue/gold/ce, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("RD Statue", /obj/structure/statue/gold/rd, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \
- new/datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/gold/get_main_recipes()
@@ -297,11 +285,6 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
GLOBAL_LIST_INIT(silver_recipes, list ( \
new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \
- new/datum/stack_recipe("Med Officer Statue", /obj/structure/statue/silver/md, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Janitor Statue", /obj/structure/statue/silver/janitor, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Sec Officer Statue", /obj/structure/statue/silver/sec, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/silver/get_main_recipes()
diff --git a/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm b/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
index 6860f34be5c..44b7d7f2698 100644
--- a/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
+++ b/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
@@ -1,9 +1,13 @@
GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("double bed", /obj/structure/bed/double, 4, one_per_turf = TRUE, on_floor = TRUE), \
null, \
+ new/datum/stack_recipe_list("beds", list( \
+ new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("double bed", /obj/structure/bed/double, 4, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("bottom bunk", /obj/structure/bed/bunk, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("top bunk", /obj/structure/bed/bunk/top, 2, one_per_turf = TRUE, on_floor = TRUE), \
+ )), \
new/datum/stack_recipe_list("office chairs", list( \
new/datum/stack_recipe("gray office chair", /obj/structure/chair/office, 5, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("light office chair", /obj/structure/chair/office/light, 5, one_per_turf = TRUE, on_floor = TRUE), \
@@ -221,7 +225,6 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
null, \
new/datum/stack_recipe("firelock frame (fulltile)", /obj/structure/firelock_frame, 3, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("firelock frame (directional)", /obj/structure/firelock_frame/border, 1, time = 25, on_floor = TRUE), \
- new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
null, \
@@ -238,7 +241,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
null, \
new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("voting box", /obj/structure/votebox, 15, time = 50), \
+ new/datum/stack_recipe("voting box", /obj/structure/votebox, 5, time = 50), \
new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar/metal, 3), \
new/datum/stack_recipe("pestle", /obj/item/pestle, 1, time = 50), \
new/datum/stack_recipe("hygienebot assembly", /obj/item/bot_assembly/hygienebot, 2, time = 50), \
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index ead6b8aeb8f..48dc33b79c3 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -7,7 +7,6 @@
* Plastic
* Cardboard
* Paper Frames
- * Runed Metal (cult)
* Bronze (bake brass)
*/
@@ -128,6 +127,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("dresser", /obj/structure/dresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("picture frame", /obj/item/wallframe/picture, 1, time = 10),\
new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
+ new/datum/stack_recipe("easel", /obj/structure/easel, 4, time = 10),\
new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
@@ -137,6 +137,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("rake", /obj/item/cultivator/rake, 5, time = 10),\
new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
+ new/datum/stack_recipe("wooden cabinet", /obj/structure/closet/cabinet, 10, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\
new/datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar, 3), \
@@ -347,8 +348,6 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
*/
GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new/datum/stack_recipe("box", /obj/item/storage/box), \
- new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
- new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \
null, \
@@ -451,11 +450,8 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
new/datum/stack_recipe("pinion airlock assembly", /obj/structure/door_assembly/door_assembly_bronze, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bronze pinion airlock assembly", /obj/structure/door_assembly/door_assembly_bronze/seethru, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bronze hat", /obj/item/clothing/head/bronze), \
- new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/bronze), \
- new/datum/stack_recipe("bronze boots", /obj/item/clothing/shoes/bronze), \
null,
new/datum/stack_recipe("bronze chair", /obj/structure/chair/comfy/shuttle/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("Marx Bust", /obj/structure/statue/bronze/marx, 15, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/tile/bronze
@@ -519,10 +515,8 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
GLOBAL_LIST_INIT(bone_recipes, list( \
new /datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar/bone, 3), \
- new /datum/stack_recipe("bone armor", /obj/item/clothing/suit/armor/bone, 6), \
- new /datum/stack_recipe("skull helmet", /obj/item/clothing/head/helmet/skull, 4), \
- new /datum/stack_recipe("bone dagger", /obj/item/kitchen/knife/combat/bone, 2), \
- new /datum/stack_recipe("club", /obj/item/melee/baseball_bat/bone, 6)))
+ new /datum/stack_recipe("bone dagger", /obj/item/melee/knife/bone, 2)))
+
/obj/item/stack/sheet/bone
name = "bones"
icon = 'icons/obj/mining.dmi'
@@ -608,41 +602,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
/obj/item/stack/sheet/paperframes/fifty
amount = 50
-/obj/item/stack/sheet/meat
- name = "meat sheets"
- desc = "Something's bloody meat compressed into a nice solid sheet."
- singular_name = "meat sheet"
- icon_state = "sheet-meat"
- material_flags = MATERIAL_COLOR
- custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT)
- merge_type = /obj/item/stack/sheet/meat
- material_type = /datum/material/meat
- material_modifier = 1 //None of that wussy stuff
-
-/obj/item/stack/sheet/meat/fifty
- amount = 50
-/obj/item/stack/sheet/meat/twenty
- amount = 20
-/obj/item/stack/sheet/meat/five
- amount = 5
-
-/obj/item/stack/sheet/pizza
- name = "pepperoni sheetzzas"
- desc = "It's a delicious pepperoni sheetzza!"
- singular_name = "pepperoni sheetzza"
- icon_state = "sheet-meat" //This needs a pizza sheet but we also i dont think anyone will ever make this.
- custom_materials = list(/datum/material/pizza = MINERAL_MATERIAL_AMOUNT)
- merge_type = /obj/item/stack/sheet/pizza
- material_type = /datum/material/pizza
- material_modifier = 1
-
-/obj/item/stack/sheet/pizza/fifty
- amount = 50
-/obj/item/stack/sheet/pizza/twenty
- amount = 20
-/obj/item/stack/sheet/pizza/five
- amount = 5
-
/obj/item/stack/sheet/sandblock
name = "blocks of sand"
desc = "You're too old to be playing with sandcastles. Now you build... sandstations."
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 5653b641c99..f34836de156 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -305,7 +305,7 @@
if(!window_structure.fulltile)
continue
if(object.density)
- to_chat(usr, "There is \a [object.name] here. You cant make \a [recipe.title] here!")
+ to_chat(usr, "There is \a [object.name] here. You can't make \a [recipe.title] here!")
return FALSE
if(recipe.placement_checks)
switch(recipe.placement_checks)
diff --git a/code/game/objects/items/storage/ammo_can.dm b/code/game/objects/items/storage/ammo_can.dm
new file mode 100644
index 00000000000..e619aced069
--- /dev/null
+++ b/code/game/objects/items/storage/ammo_can.dm
@@ -0,0 +1,69 @@
+//No idea why this is a toolbox but I'm not fixing that right now
+/obj/item/storage/toolbox/ammo
+ name = "ammo can"
+ desc = "A metal container for storing multiple boxes of ammunition or grenades."
+ icon_state = "ammobox"
+ item_state = "ammobox"
+ drop_sound = 'sound/items/handling/ammobox_drop.ogg'
+ pickup_sound = 'sound/items/handling/ammobox_pickup.ogg'
+ material_flags = NONE
+ has_latches = FALSE
+ w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/toolbox/ammo/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_volume = STORAGE_VOLUME_BACKPACK
+ STR.max_w_class = MAX_WEIGHT_CLASS_BACKPACK
+ STR.set_holdable(list(
+ /obj/item/storage/box/ammo,
+ /obj/item/mine,
+ /obj/item/grenade,
+ /obj/item/ammo_casing/caseless/rocket,
+ /obj/item/ammo_box/magazine/ammo_stack,
+ /obj/item/ammo_casing,
+ /obj/item/mine,
+ /obj/item/grenade
+ ))
+
+/obj/item/storage/toolbox/ammo/a850r/PopulateContents()
+ name = "ammo can (8x50mmR)"
+ icon_state = "ammobox_850"
+ for(var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/a8_50r(src)
+
+/obj/item/storage/toolbox/ammo/a762_40/PopulateContents()
+ name = "ammo can (7.62x40mm CLIP)"
+ icon_state = "ammobox_762"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/a762_40(src)
+
+/obj/item/storage/toolbox/ammo/a308/PopulateContents()
+ name = "ammo can (.308)"
+ icon_state = "ammobox_308"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/a308(src)
+
+/obj/item/storage/toolbox/ammo/c45/PopulateContents()
+ name = "ammo can (.45)"
+ icon_state = "ammobox_45"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/c45(src)
+
+/obj/item/storage/toolbox/ammo/c9mm/PopulateContents()
+ name = "ammo can (9mm)"
+ icon_state = "ammobox_9mm"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/c9mm(src)
+
+/obj/item/storage/toolbox/ammo/c10mm/PopulateContents()
+ name = "ammo can (10mm)"
+ icon_state = "ammobox_10mm"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/c10mm(src)
+
+/obj/item/storage/toolbox/ammo/shotgun/PopulateContents()
+ name = "ammo can (12ga)"
+ icon_state = "ammobox_12ga"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/a12g_buckshot(src)
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 5d87b42b78e..34eba9a2519 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -16,6 +16,8 @@
desc = "You wear this on your back and put items into it."
icon_state = "backpack"
item_state = "backpack"
+ icon = 'icons/obj/clothing/back/backpacks.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/back/backpacks.dmi'
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
pickup_sound = "rustle"
@@ -26,7 +28,9 @@
max_integrity = 300
greyscale_icon_state = "backpack"
greyscale_colors = list(list(13, 17), list(12, 17), list(12, 21))
- supports_variations = VOX_VARIATION
+
+ supports_variations = VOX_VARIATION | KEPORI_VARIATION
+ kepori_override_icon = 'icons/mob/clothing/back/backpacks_kepori.dmi'
/obj/item/storage/backpack/ComponentInitialize()
. = ..()
@@ -61,51 +65,12 @@
STR.storage_flags = STORAGE_FLAGS_VOLUME_DEFAULT
STR.max_volume = STORAGE_VOLUME_BAG_OF_HOLDING
-/obj/item/storage/backpack/santabag
- name = "Santa's Gift Bag"
- desc = "Space Santa uses this to deliver presents to all the nice children in space in Christmas! Wow, it's pretty big!"
- icon_state = "giftbag0"
- item_state = "giftbag"
- w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/backpack/santabag/Initialize()
- . = ..()
- regenerate_presents()
-
-/obj/item/storage/backpack/santabag/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_w_class = WEIGHT_CLASS_NORMAL
- STR.max_combined_w_class = 60
-
-/obj/item/storage/backpack/santabag/proc/regenerate_presents()
- addtimer(CALLBACK(src, PROC_REF(regenerate_presents)), 30 SECONDS)
-
- var/mob/M = get(loc, /mob)
- if(!istype(M))
- return
- if(M.mind && HAS_TRAIT(M.mind, TRAIT_CANNOT_OPEN_PRESENTS))
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- var/turf/floor = get_turf(src)
- var/obj/item/I = new /obj/item/a_gift/anything(floor)
- if(STR.can_be_inserted(I, stop_messages=TRUE))
- STR.handle_item_insertion(I, prevent_warning=TRUE)
- else
- qdel(I)
-
-
/obj/item/storage/backpack/cultpack
name = "trophy rack"
desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
icon_state = "cultpack"
item_state = "backpack"
-/obj/item/storage/backpack/clown
- name = "Giggles von Honkerton"
- desc = "It's a backpack made by Honk! Co."
- icon_state = "clownpack"
- item_state = "clownpack"
-
/obj/item/storage/backpack/explorer
name = "explorer bag"
desc = "A robust backpack for stashing your loot."
@@ -215,7 +180,6 @@
item_state = "satchel-norm"
greyscale_icon_state = "satchel"
greyscale_colors = list(list(11, 12), list(17, 18), list(10, 11))
- supports_variations = VOX_VARIATION
/obj/item/storage/backpack/satchel/ComponentInitialize()
. = ..()
@@ -226,7 +190,6 @@
/obj/item/storage/backpack/satchel/leather
name = "leather satchel"
desc = "It's a very fancy satchel made with fine leather."
- icon = 'icons/obj/storage.dmi'
icon_state = "satchel"
item_state = "satchel"
@@ -261,12 +224,6 @@
icon_state = "satchel-chem"
item_state = "satchel-chem"
-/obj/item/storage/backpack/satchel/gen
- name = "geneticist satchel"
- desc = "A sterile satchel with geneticist colours."
- icon_state = "satchel-gen"
- item_state = "satchel-gen"
-
/obj/item/storage/backpack/satchel/tox
name = "scientist satchel"
desc = "Useful for holding research materials."
@@ -354,8 +311,6 @@
/obj/item/storage/backpack/messenger
name = "messenger bag"
desc = "A sturdy backpack worn over one shoulder."
- icon = 'icons/obj/storage.dmi'
- mob_overlay_icon = 'icons/mob/clothing/back.dmi'
icon_state = "courierbag"
item_state = "courierbag"
greyscale_icon_state = "satchel"
@@ -528,7 +483,6 @@
desc = "A large duffel bag for holding extra tactical supplies."
icon_state = "duffel-syndie"
item_state = "duffel-syndieammo"
- slowdown = 0
resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/duffelbag/syndie/ComponentInitialize()
@@ -581,17 +535,17 @@
/obj/item/storage/backpack/duffelbag/syndie/ammo/shotgun/PopulateContents()
for(var/i in 1 to 6)
- new /obj/item/ammo_box/magazine/m12g(src)
- new /obj/item/ammo_box/magazine/m12g/slug(src)
- new /obj/item/ammo_box/magazine/m12g/slug(src)
- new /obj/item/ammo_box/magazine/m12g/dragon(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/slug(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/slug(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/dragon(src)
/obj/item/storage/backpack/duffelbag/syndie/ammo/smg
desc = "A large duffel bag, packed to the brim with C-20r magazines."
/obj/item/storage/backpack/duffelbag/syndie/ammo/smg/PopulateContents()
for(var/i in 1 to 9)
- new /obj/item/ammo_box/magazine/smgm45(src)
+ new /obj/item/ammo_box/magazine/m45_cobra(src)
/obj/item/storage/backpack/duffelbag/syndie/ammo/mech
desc = "A large duffel bag, packed to the brim with various exosuit ammo."
@@ -603,10 +557,10 @@
new /obj/item/mecha_ammo/scattershot(src)
new /obj/item/storage/belt/utility/syndicate(src)
-/obj/item/storage/backpack/duffelbag/syndie/ammo/mauler
+/obj/item/storage/backpack/duffelbag/syndie/ammo/touro
desc = "A large duffel bag, packed to the brim with various exosuit ammo."
-/obj/item/storage/backpack/duffelbag/syndie/ammo/mauler/PopulateContents()
+/obj/item/storage/backpack/duffelbag/syndie/ammo/touro/PopulateContents()
new /obj/item/mecha_ammo/lmg(src)
new /obj/item/mecha_ammo/lmg(src)
new /obj/item/mecha_ammo/lmg(src)
@@ -621,18 +575,18 @@
desc = "A large duffel bag containing a C-20r, some magazines, and a cheap looking suppressor."
/obj/item/storage/backpack/duffelbag/syndie/c20rbundle/PopulateContents()
- new /obj/item/ammo_box/magazine/smgm45(src)
- new /obj/item/ammo_box/magazine/smgm45(src)
- new /obj/item/gun/ballistic/automatic/smg/c20r(src)
- new /obj/item/suppressor/specialoffer(src)
+ new /obj/item/ammo_box/magazine/m45_cobra(src)
+ new /obj/item/ammo_box/magazine/m45_cobra(src)
+ new /obj/item/gun/ballistic/automatic/smg/cobra(src)
+ new /obj/item/attachment/silencer(src)
/obj/item/storage/backpack/duffelbag/syndie/bulldogbundle
desc = "A large duffel bag containing a Bulldog, some drums, and a pair of thermal imaging glasses."
/obj/item/storage/backpack/duffelbag/syndie/bulldogbundle/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/bulldog(src)
- new /obj/item/ammo_box/magazine/m12g(src)
- new /obj/item/ammo_box/magazine/m12g(src)
+ new /obj/item/gun/ballistic/shotgun/automatic/bulldog(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
/obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle
@@ -641,8 +595,8 @@
/obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle/PopulateContents()
new /obj/item/clothing/shoes/magboots/syndie(src)
new /obj/item/storage/firstaid/tactical(src)
- new /obj/item/gun/ballistic/automatic/hmg/l6_saw/toy/riot(src)
- new /obj/item/ammo_box/foambox/riot(src)
+ new /obj/item/gun/ballistic/automatic/toy(src)
+ new /obj/item/storage/box/ammo/foam_darts/riot(src)
/obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
desc = "A large duffel bag containing deadly chemicals, a handheld chem sprayer, Bioterror foam grenade, a Donksoft assault rifle, box of riot grade darts, a dart pistol, and a box of syringes."
@@ -651,9 +605,9 @@
new /obj/item/reagent_containers/spray/chemsprayer/bioterror(src)
new /obj/item/storage/box/syndie_kit/chemical(src)
new /obj/item/gun/syringe/syndicate(src)
- new /obj/item/gun/ballistic/automatic/smg/c20r/toy/riot(src)
+ new /obj/item/gun/ballistic/automatic/toy(src)
new /obj/item/storage/box/syringes(src)
- new /obj/item/ammo_box/foambox/riot(src)
+ new /obj/item/storage/box/ammo/foam_darts/riot(src)
new /obj/item/grenade/chem_grenade/bioterrorfoam(src)
if(prob(5))
new /obj/item/reagent_containers/food/snacks/pizza/pineapple(src)
@@ -672,9 +626,9 @@
/obj/item/storage/backpack/duffelbag/syndie/firestarter/PopulateContents()
new /obj/item/watertank/op(src)
new /obj/item/clothing/suit/space/hardsuit/syndi/elite(src)
- new /obj/item/gun/ballistic/automatic/pistol/APS(src)
- new /obj/item/ammo_box/magazine/pistolm9mm(src)
- new /obj/item/ammo_box/magazine/pistolm9mm(src)
+ new /obj/item/gun/ballistic/automatic/pistol/rattlesnake(src)
+ new /obj/item/ammo_box/magazine/m9mm_rattlesnake(src)
+ new /obj/item/ammo_box/magazine/m9mm_rattlesnake(src)
new /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka(src)
new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
new /obj/item/grenade/syndieminibomb(src)
@@ -689,7 +643,6 @@
/obj/item/storage/backpack/duffelbag/clown/syndie/PopulateContents()
new /obj/item/pda/clown(src)
new /obj/item/clothing/under/rank/civilian/clown(src)
- new /obj/item/clothing/shoes/clown_shoes(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/bikehorn(src)
new /obj/item/implanter/sad_trombone(src)
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index ecee3894ccb..cfe07df070b 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -407,7 +407,7 @@
))
/*
- * Biowaste bag (mostly for xenobiologists)
+ * Biowaste bag
*/
/obj/item/storage/bag/bio
@@ -424,7 +424,6 @@
STR.max_items = 20
STR.insert_preposition = "in"
STR.set_holdable(list(
- /obj/item/slime_extract,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/glass/beaker,
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 2904745f25a..3247ceb443c 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -74,7 +74,8 @@
/obj/item/chisel,
/obj/item/clothing/glasses/welding, //WS edit: ok mald sure I'll add the welding stuff to the. ok.
/obj/item/clothing/mask/gas/welding,
- /obj/item/clothing/head/welding //WS end
+ /obj/item/clothing/head/welding, //WS end
+ /obj/item/gun/energy/plasmacutter
))
/obj/item/storage/belt/utility/chief
@@ -86,7 +87,6 @@
/obj/item/storage/belt/utility/chief/full/PopulateContents()
new /obj/item/screwdriver/power(src)
new /obj/item/crowbar/power(src)
- new /obj/item/weldingtool/experimental(src)//This can be changed if this is too much
new /obj/item/multitool(src)
new /obj/item/stack/cable_coil(src,MAXCOIL,pick("red","yellow","orange"))
new /obj/item/extinguisher/mini(src)
@@ -142,7 +142,6 @@
/obj/item/storage/belt/utility/full/ert/PopulateContents()
new /obj/item/screwdriver/power(src)
new /obj/item/crowbar/power(src)
- new /obj/item/weldingtool/experimental(src)
new /obj/item/multitool(src)
new /obj/item/construction/rcd/combat(src)
new /obj/item/extinguisher/mini(src)
@@ -258,6 +257,15 @@
new /obj/item/hypospray/mkii(src)
update_appearance()
+/obj/item/storage/belt/medical/webbing/combat/PopulateContents()
+ . = ..()
+ new /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor(src)
+ new /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/stack/medical/gauze/twelve(src)
+ new /obj/item/stack/medical/splint(src)
+
/obj/item/storage/belt/security
name = "security belt"
desc = "Can hold security gear like handcuffs and flashes."
@@ -274,6 +282,7 @@
STR.set_holdable(list(
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
+ /obj/item/melee/knife,
/obj/item/grenade,
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
@@ -283,21 +292,21 @@
/obj/item/ammo_box/magazine,
/obj/item/ammo_box/c38, //speed loaders don't have a common path like magazines. pain.
/obj/item/ammo_box/a357, //some day we should refactor these into an ammo_box/speedloader type
- /obj/item/ammo_box/a4570, //but not today
/obj/item/ammo_box/a858, //oh boy stripper clips too
/obj/item/ammo_box/vickland_a308,
/obj/item/ammo_box/a300,
- /obj/item/ammo_box/aac_300blk_stripper,
+ /obj/item/ammo_box/a762_stripper,
/obj/item/ammo_box/amagpellet_claris, //that's the last of the clips
/obj/item/reagent_containers/food/snacks/donut,
- /obj/item/kitchen/knife/combat,
+ /obj/item/melee/knife/combat,
/obj/item/flashlight/seclite,
/obj/item/melee/classic_baton/telescopic,
/obj/item/radio,
/obj/item/clothing/gloves,
/obj/item/restraints/legcuffs/bola,
/obj/item/holosign_creator/security,
- /obj/item/stock_parts/cell/gun //WS edit Gun cells fit where they should and not where they dont
+ /obj/item/stock_parts/cell/gun,
+ /obj/item/ammo_box/magazine/ammo_stack, //handfuls of bullets
))
/obj/item/storage/belt/security/full/PopulateContents()
@@ -321,10 +330,12 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 6
-/obj/item/storage/belt/security/webbing/bulldog/PopulateContents()
+/obj/item/storage/belt/security/webbing/bulldog_mixed/PopulateContents()
. = ..()
- for(var/i in 1 to 3)
- new /obj/item/ammo_box/magazine/m12g(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/bioterror(src) // you only get ONE this one is nasty
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/slug(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/slug(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum(src)
/obj/item/storage/belt/mining
name = "explorer's webbing"
@@ -356,6 +367,7 @@
/obj/item/clothing/gloves,
/obj/item/resonator,
/obj/item/mining_scanner,
+ /obj/item/pinpointer/mineral,
/obj/item/pickaxe,
/obj/item/shovel,
/obj/item/stack/sheet/animalhide,
@@ -365,7 +377,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/reagent_containers/food/drinks/bottle,
/obj/item/stack/medical,
- /obj/item/kitchen/knife,
+ /obj/item/melee/knife,
/obj/item/reagent_containers/hypospray,
/obj/item/gps,
/obj/item/storage/bag/ore,
@@ -380,8 +392,7 @@
/obj/item/storage/bag/plants,
/obj/item/stack/marker_beacon,
/obj/item/restraints/legcuffs/bola/watcher,
- /obj/item/claymore/bone,
- /obj/item/key/lasso
+ /obj/item/melee/sword/bone
))
@@ -403,32 +414,6 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 5
-/obj/item/storage/belt/soulstone
- name = "soul stone belt"
- desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away."
- icon_state = "soulstone"
- item_state = "soulstone"
-
-/obj/item/storage/belt/soulstone/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 6
- STR.set_holdable(list(
- /obj/item/soulstone
- ))
-
-/obj/item/storage/belt/soulstone/full/PopulateContents()
- for(var/i in 1 to 6)
- new /obj/item/soulstone(src)
-
-/obj/item/storage/belt/soulstone/full/chappy/PopulateContents()
- for(var/i in 1 to 6)
- new /obj/item/soulstone/anybody/chaplain(src)
-
-/obj/item/storage/belt/soulstone/full/purified/PopulateContents()
- for(var/i in 1 to 6)
- new /obj/item/soulstone/anybody/purified(src)
-
/obj/item/storage/belt/champion
name = "championship belt"
desc = "Proves to the world that you are the strongest!"
@@ -477,15 +462,29 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
-/obj/item/storage/belt/military/c20r/PopulateContents()
+/obj/item/storage/belt/military/cobra/PopulateContents()
. = ..()
for(var/i in 1 to 4)
- new /obj/item/ammo_box/magazine/smgm45(src)
+ new /obj/item/ammo_box/magazine/m45_cobra(src)
-/obj/item/storage/belt/military/assault/m90/PopulateContents()
+/obj/item/storage/belt/military/hydra/PopulateContents()
. = ..()
for(var/i in 1 to 4)
- new /obj/item/ammo_box/magazine/m556(src)
+ new /obj/item/ammo_box/magazine/m556_42_hydra(src)
+
+/obj/item/storage/belt/military/boomslang/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/boomslang(src)
+
+/obj/item/storage/belt/military/mako/PopulateContents()
+ . = ..()
+ new /obj/item/ammo_casing/caseless/rocket/a70mm/hedp(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm/hedp(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
/obj/item/storage/belt/military/snack
name = "tactical snack rig"
@@ -520,7 +519,7 @@
/obj/item/reagent_containers/food/snacks/cheesynachos,
/obj/item/reagent_containers/food/snacks/cubannachos,
/obj/item/reagent_containers/food/snacks/nugget,
- /obj/item/reagent_containers/food/snacks/spaghetti/pastatomato,
+ /obj/item/food/spaghetti/pastatomato,
/obj/item/reagent_containers/food/snacks/rofflewaffles,
/obj/item/reagent_containers/food/snacks/donkpocket,
/obj/item/reagent_containers/food/drinks/soda_cans/cola,
@@ -570,6 +569,22 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 6
+/obj/item/storage/belt/military/assault/hydra/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m556_42_hydra(src)
+
+/obj/item/storage/belt/military/assault/sniper/PopulateContents()
+ . = ..()
+ new /obj/item/ammo_box/magazine/sniper_rounds(src)
+ new /obj/item/ammo_box/magazine/sniper_rounds(src)
+ new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
+
+/obj/item/storage/belt/military/assault/commander/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/co9mm(src)
+
/obj/item/storage/belt/grenade
name = "grenadier belt"
desc = "A belt for holding grenades."
@@ -588,7 +603,7 @@
/obj/item/screwdriver,
/obj/item/lighter,
/obj/item/multitool,
- /obj/item/reagent_containers/food/drinks/bottle/molotov,
+ /obj/item/reagent_containers/food/drinks/molotov,
/obj/item/grenade/c4,
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb,
/obj/item/reagent_containers/food/snacks/grown/firelemon
@@ -680,7 +695,7 @@
/obj/item/storage/belt/bandolier
name = "bandolier"
- desc = "A bandolier for holding ammunition. Does not hold magazines"
+ desc = "A bandolier for holding ammunition. Does not hold magazines."
icon_state = "bandolier"
item_state = "bandolier"
@@ -694,6 +709,10 @@
/obj/item/ammo_casing
))
+/obj/item/storage/belt/bandolier/examine(mob/user)
+ . = ..()
+ . += span_notice("The bandolier can be directly loaded by clicking on it with an ammo box.")
+
/obj/item/storage/belt/fannypack
name = "fannypack"
desc = "A dorky fannypack for keeping small items in."
@@ -771,6 +790,7 @@
item_state = "sheath"
base_icon_state = "sheath"
w_class = WEIGHT_CLASS_BULKY
+ var/sabre_type = /obj/item/melee/sword/sabre
/obj/item/storage/belt/sabre/ComponentInitialize()
. = ..()
@@ -780,7 +800,7 @@
STR.use_sound = null //if youre wondering why this is null, its so you can look in your sheath to prepare to draw, without letting anyone know youre preparing to draw it
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.set_holdable(list(
- /obj/item/melee/sabre
+ sabre_type
))
/obj/item/storage/belt/sabre/examine(mob/user)
@@ -808,7 +828,7 @@
return ..()
/obj/item/storage/belt/sabre/PopulateContents()
- new /obj/item/melee/sabre(src)
+ new sabre_type(src)
update_appearance()
/obj/item/storage/belt/sabre/solgov
@@ -818,21 +838,7 @@
icon_state = "sheath-solgov"
item_state = "sheath-solgov"
w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/solgov/ComponentInitialize()
- AddComponent(component_type)
- AddElement(/datum/element/update_icon_updates_onmob)
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 1
- STR.use_sound = null
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
- /obj/item/melee/sabre/solgov
- ))
-
-/obj/item/storage/belt/sabre/solgov/PopulateContents()
- new /obj/item/melee/sabre/solgov(src)
- update_appearance()
+ sabre_type = /obj/item/melee/sword/sabre/solgov
/obj/item/storage/belt/sabre/suns
name = "SUNS sabre sheath"
@@ -847,22 +853,7 @@
icon_state = "suns-sheath"
item_state = "suns-sheath"
w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/suns/ComponentInitialize()
- AddComponent(component_type)
- AddElement(/datum/element/update_icon_updates_onmob)
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 1
- STR.use_sound = null
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
- /obj/item/melee/sabre/suns
- ))
-
-/obj/item/storage/belt/sabre/suns/PopulateContents()
- new /obj/item/melee/sabre/suns(src)
- update_appearance()
-
+ sabre_type = /obj/item/melee/sword/sabre/suns
/obj/item/storage/belt/sabre/suns/captain
name = "SUNS captain's sabre sheath"
@@ -872,21 +863,7 @@
icon_state = "suns-capsheath"
item_state = "suns-capsheath"
w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/suns/captain/ComponentInitialize()
- AddComponent(component_type)
- AddElement(/datum/element/update_icon_updates_onmob)
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 1
- STR.use_sound = null
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
- /obj/item/melee/sabre/suns/captain
- ))
-
-/obj/item/storage/belt/sabre/suns/captain/PopulateContents()
- new /obj/item/melee/sabre/suns/captain(src)
- update_appearance()
+ sabre_type = /obj/item/melee/sword/sabre/suns/captain
/obj/item/storage/belt/sabre/suns/cmo
name = "SUNS cane sheath"
@@ -902,21 +879,15 @@
icon_state = "suns-cane"
item_state = "suns-cane"
w_class = WEIGHT_CLASS_BULKY
+ sabre_type = /obj/item/melee/sword/sabre/suns/cmo
-/obj/item/storage/belt/sabre/suns/cmo/ComponentInitialize()
- AddComponent(component_type)
- AddElement(/datum/element/update_icon_updates_onmob)
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 1
- STR.use_sound = null
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
- /obj/item/melee/sabre/suns/cmo
- ))
-
-/obj/item/storage/belt/sabre/suns/cmo/PopulateContents()
- new /obj/item/melee/sabre/suns/cmo(src)
- update_appearance()
+/obj/item/storage/belt/sabre/pgf
+ name = "cutlass sheath"
+ desc = "A mass produced thermoplastic-leather sheath made to hold a boarding cutlass."
+ base_icon_state = "sheath-pgf"
+ icon_state = "sheath-pgf"
+ item_state = "sheath-pgf"
+ sabre_type = /obj/item/melee/sword/sabre/pgf
/obj/item/storage/belt/security/webbing/inteq
name = "inteq webbing"
@@ -930,8 +901,18 @@
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/skm_762_40(src)
+/obj/item/storage/belt/security/webbing/inteq/skm_carabine/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/smgm10mm(src)
+
/obj/item/storage/belt/security/webbing/inteq/alt
name = "inteq drop pouch harness"
desc = "A harness with a bunch of pouches attached to them emblazoned in the colors of the IRMG, can hold security gear."
icon_state = "inteq_droppouch"
item_state = "inteq_droppouch"
+
+/obj/item/storage/belt/security/webbing/inteq/alt/bulldog/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m12g_bulldog(src)
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 8aa7b1d9c47..ef5e5cb3119 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -41,6 +41,9 @@
/obj/item/storage/box/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.storage_flags = STORAGE_FLAGS_VOLUME_DEFAULT
+ STR.max_volume = STORAGE_VOLUME_CONTAINER_S
+ STR.max_w_class = WEIGHT_CLASS_SMALL
STR.use_sound = 'sound/items/storage/briefcase.ogg'
/obj/item/storage/box/update_overlays()
@@ -99,6 +102,14 @@
for(var/i in 1 to 7)
new /obj/item/disk/data(src)
+/obj/item/storage/box/holodisc
+ name = "holodisc box"
+ illustration = "disk_kit"
+
+/obj/item/storage/box/holodisc/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/disk/holodisk(src)
+
//guys why are my tests failing
/obj/item/storage/box/disks_plantgene
name = "plant data disks box"
@@ -158,7 +169,7 @@
// Security survival box
/obj/item/storage/box/survival/security
- mask_type = /obj/item/clothing/mask/gas/sechailer
+ mask_type = /obj/item/clothing/mask/gas
// Medical survival box
/obj/item/storage/box/survival/medical
@@ -168,9 +179,13 @@
internal_type = /obj/item/tank/internals/emergency_oxygen/engi //clip actually cares about their personnel
/obj/item/storage/box/survival/clip/balaclava
- mask_type = /obj/item/clothing/mask/gas/sechailer/balaclava
+ mask_type = /obj/item/clothing/mask/balaclava
internal_type = /obj/item/tank/internals/emergency_oxygen/double
+/obj/item/storage/box/survival/inteq
+ mask_type = /obj/item/clothing/mask/balaclava/inteq
+ internal_type = /obj/item/tank/internals/emergency_oxygen/engi
+
/obj/item/storage/box/survival/frontier
mask_type = null // we spawn in gas masks in frontiersmen bags alongside this, so it isn't nessary
internal_type = /obj/item/tank/internals/emergency_oxygen //frontiersmen dont
@@ -455,7 +470,7 @@
/obj/item/storage/box/condimentbottles/PopulateContents()
for(var/i in 1 to 6)
- new /obj/item/reagent_containers/food/condiment(src)
+ new /obj/item/reagent_containers/condiment(src)
/obj/item/storage/box/cups
name = "box of paper cups"
@@ -477,11 +492,6 @@
for(var/i in 1 to 6)
new donktype(src)
-/obj/item/storage/box/donkpockets/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/donkpocket))
-
/obj/item/storage/box/donkpockets/donkpocketspicy
name = "box of spicy-flavoured donk-pockets"
icon_state = "donkpocketboxspicy"
@@ -519,12 +529,6 @@
illustration = null
var/cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
-/obj/item/storage/box/monkeycubes/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 7
- STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/monkeycube))
-
/obj/item/storage/box/monkeycubes/PopulateContents()
for(var/i in 1 to 5)
new cube_type(src)
@@ -539,12 +543,6 @@
icon_state = "monkeycubebox"
illustration = null
-/obj/item/storage/box/gorillacubes/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 3
- STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/monkeycube))
-
/obj/item/storage/box/gorillacubes/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/food/snacks/monkeycube/gorilla(src)
@@ -676,12 +674,6 @@
icon = 'icons/obj/toy.dmi'
icon_state = "spbox"
-/obj/item/storage/box/snappops/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.set_holdable(list(/obj/item/toy/snappop))
- STR.max_items = 8
-
/obj/item/storage/box/snappops/PopulateContents()
SEND_SIGNAL(src, COMSIG_TRY_STORAGE_FILL_TYPE, /obj/item/toy/snappop)
@@ -695,13 +687,7 @@
slot_flags = ITEM_SLOT_BELT
drop_sound = 'sound/items/handling/matchbox_drop.ogg'
pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
- custom_price = 20
-
-/obj/item/storage/box/matches/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 10
- STR.set_holdable(list(/obj/item/match))
+ custom_price = 2
/obj/item/storage/box/matches/PopulateContents()
SEND_SIGNAL(src, COMSIG_TRY_STORAGE_FILL_TYPE, /obj/item/match)
@@ -720,9 +706,10 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
-/obj/item/storage/box/lights/ComponentInitialize()
+/obj/item/storage/box/lights/ComponentInitialize()//holy oversized box. this one can stay the way it is, for now
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.storage_flags = STORAGE_FLAGS_LEGACY_DEFAULT
STR.max_items = 21
STR.set_holdable(list(/obj/item/light/tube, /obj/item/light/bulb))
STR.max_combined_w_class = 21
@@ -758,6 +745,14 @@
for(var/i in 1 to 7)
new /obj/item/flashlight/flare(src)
+/obj/item/storage/box/glowsticks
+ name = "box of glowsticks"
+ illustration = "sparkler"
+
+/obj/item/storage/box/glowsticks/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/effect/spawner/random/decoration/glowstick(src)
+
/obj/item/storage/box/deputy
name = "box of deputy armbands"
desc = "To be issued to those authorized to act as deputy of security."
@@ -768,6 +763,15 @@
for(var/i in 1 to 7)
new /obj/item/clothing/accessory/armband/deputy(src)
+/obj/item/storage/box/smokebombs
+ name = "box of smoke grenades"
+ desc = "Used for rapidly laying cover."
+ illustration = "grenade"
+
+/obj/item/storage/box/smokebombs/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/grenade/smokebomb(src)
+
/obj/item/storage/box/metalfoam
name = "box of metal foam grenades"
desc = "To be used to rapidly seal hull breaches."
@@ -1328,30 +1332,6 @@
/obj/item/screwdriver = 1)
generate_items_inside(items_inside,src)
-//It's a maid costume from the IRMG and Syndicate, what else.
-/obj/item/storage/box/inteqmaid
- name = "IRMG non standard issue maid outfit"
- desc = "A box containing a 'tactical' and 'practical' maid outfit from the IRMG."
-
-/obj/item/storage/box/inteqmaid/PopulateContents()
- var/static/items_inside = list(
- /obj/item/clothing/head/maidheadband/inteq = 1,
- /obj/item/clothing/under/syndicate/inteq/skirt/maid = 1,
- /obj/item/clothing/gloves/combat/maid/inteq = 1,)
- generate_items_inside(items_inside,src)
-
-/obj/item/storage/box/syndimaid
- name = "Syndicate maid outfit"
- desc = "A box containing a 'tactical' and 'practical' maid outfit."
- icon_state = "syndiebox"
-
-/obj/item/storage/box/syndimaid/PopulateContents()
- var/static/items_inside = list(
- /obj/item/clothing/head/maidheadband/syndicate = 1,
- /obj/item/clothing/under/syndicate/skirt/maid = 1,
- /obj/item/clothing/gloves/combat/maid = 1,)
- generate_items_inside(items_inside,src)
-
// because i have no idea where the fuck to put this
/obj/item/storage/box/maid
name = "Maid box"
@@ -1362,7 +1342,8 @@
/obj/item/clothing/head/maidheadband = 1,
/obj/item/clothing/under/costume/maid = 1,
/obj/item/clothing/gloves/maid = 1,
- /obj/item/clothing/neck/maid = 1,)
+ /obj/item/clothing/neck/maid = 1,
+ /obj/item/clothing/accessory/maidapron = 1,)
generate_items_inside(items_inside,src)
/obj/item/storage/box/material
@@ -1474,13 +1455,12 @@
w_class = WEIGHT_CLASS_TINY
illustration = null
foldable = null
- custom_price = 120
+ custom_price = 5
/obj/item/storage/box/gum/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/chewable/bubblegum))
- STR.max_items = 4
+ STR.max_volume = (STORAGE_VOLUME_CONTAINER_S / 2)
/obj/item/storage/box/gum/PopulateContents()
for(var/i in 1 to 4)
@@ -1490,7 +1470,7 @@
name = "nicotine gum packet"
desc = "Designed to help with nicotine addiction and oral fixation all at once without destroying your lungs in the process. Mint flavored!"
icon_state = "bubblegum_nicotine"
- custom_premium_price = 275
+ custom_premium_price = 10
/obj/item/storage/box/gum/nicotine/PopulateContents()
for(var/i in 1 to 4)
@@ -1500,8 +1480,8 @@
name = "HP+ gum packet"
desc = "A seemingly homemade packaging with an odd smell. It has a weird drawing of a smiling face sticking out its tongue."
icon_state = "bubblegum_happiness"
- custom_price = 300
- custom_premium_price = 300
+ custom_price = 10
+ custom_premium_price = 10
/obj/item/storage/box/gum/happiness/Initialize()
. = ..()
diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm
index f55613dd4d2..dfc65846bd1 100644
--- a/code/game/objects/items/storage/briefcase.dm
+++ b/code/game/objects/items/storage/briefcase.dm
@@ -42,10 +42,10 @@
/obj/item/storage/briefcase/sniperbundle/PopulateContents()
..() // in case you need any paperwork done after your rampage
- new /obj/item/gun/ballistic/automatic/marksman/sniper_rifle(src)
+ new /obj/item/gun/ballistic/automatic/marksman/taipan(src)
new /obj/item/clothing/neck/tie/red(src)
new /obj/item/clothing/under/syndicate/sniper(src)
new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
- new /obj/item/suppressor/specialoffer(src)
+ new /obj/item/attachment/silencer(src)
diff --git a/code/game/objects/items/storage/cases.dm b/code/game/objects/items/storage/cases.dm
new file mode 100644
index 00000000000..0a69e5d9afb
--- /dev/null
+++ b/code/game/objects/items/storage/cases.dm
@@ -0,0 +1,63 @@
+// For Cases of all kinds, storage with specific purpose
+
+//Base Case
+/obj/item/storage/case
+ name = "case"
+ desc = "A large case."
+ icon = 'icons/obj/storage.dmi'
+ icon_state = "case_base"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ drop_sound = 'sound/items/handling/toolbox_drop.ogg'
+ pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
+ throw_speed = 3
+ throw_range = 7
+ var/empty = FALSE
+ w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/case/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.use_sound = 'sound/items/storage/toolbox.ogg'
+
+/obj/item/storage/case/surgery
+ name = "surgical case"
+ icon_state = "case_surgery"
+ item_state = "case_surgery"
+ desc = "A large sterile tray with a lid for storing all of the tools you'd need for surgery."
+
+//Surgical Case
+/obj/item/storage/case/surgery/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_w_class = INFINITY //workaround for the differently sized items, case is still limited to 7 items max and to the list.
+ STR.max_combined_w_class = INFINITY //part of the workaround, not setting a max combined weight defaults to some weird number.
+ STR.max_items = 7
+ STR.set_holdable(list(
+ /obj/item/healthanalyzer,
+ /obj/item/healthanalyzer/advanced,
+ /obj/item/scalpel,
+ /obj/item/scalpel/advanced,
+ /obj/item/circular_saw,
+ /obj/item/circular_saw/best, //CODY WUZ HERE
+ /obj/item/surgicaldrill,
+ /obj/item/surgicaldrill/advanced,
+ /obj/item/retractor,
+ /obj/item/retractor/advanced,
+ /obj/item/cautery,
+ /obj/item/hemostat,
+ /obj/item/shears,
+ ))
+
+/obj/item/storage/case/surgery/PopulateContents()
+ if(empty)
+ return
+ var/static/items_inside = list(
+ /obj/item/scalpel = 1,
+ /obj/item/retractor = 1,
+ /obj/item/hemostat = 1,
+ /obj/item/circular_saw = 1,
+ /obj/item/surgicaldrill = 1,
+ /obj/item/cautery = 1,
+ /obj/item/healthanalyzer = 1)
+ generate_items_inside(items_inside,src)
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index d6edfb29461..da8ae670c88 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -196,7 +196,7 @@
slot_flags = ITEM_SLOT_BELT
spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
var/candy = FALSE //for cigarette overlay
- custom_price = 75
+ custom_price = 10
contents_tag = "cigarette"
/obj/item/storage/fancy/cigarettes/ComponentInitialize()
@@ -359,7 +359,7 @@
base_icon_state = "cig_paper_pack"
contents_tag = "rolling paper"
spawn_type = /obj/item/rollingpaper
- custom_price = 25
+ custom_price = 5
/obj/item/storage/fancy/rollingpapers/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm
new file mode 100644
index 00000000000..2193a834e7c
--- /dev/null
+++ b/code/game/objects/items/storage/filled_guncases.dm
@@ -0,0 +1,336 @@
+//Erika here. I did this because guncase.dm was annoying me. It needs better organization at some point.
+
+/* Hunter's Pride */
+
+/obj/item/storage/guncase/pistol/firebrand
+ gun_type = /obj/item/gun/ballistic/revolver/firebrand
+
+/obj/item/storage/guncase/pistol/derringer
+ gun_type = /obj/item/gun/ballistic/derringer
+
+/obj/item/storage/guncase/pistol/montagne
+ gun_type = /obj/item/gun/ballistic/revolver/montagne
+ mag_type = /obj/item/ammo_box/a44roum_speedloader
+
+/obj/item/storage/guncase/pistol/candor
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/candor
+ mag_type = /obj/item/ammo_box/magazine/m45
+
+/obj/item/storage/guncase/pistol/detective
+ gun_type = /obj/item/gun/ballistic/revolver/detective
+ mag_type = /obj/item/ammo_box/c38
+
+/obj/item/storage/guncase/pistol/shadow
+ gun_type = /obj/item/gun/ballistic/revolver/shadow
+
+/obj/item/storage/guncase/pistol/ashhand
+ gun_type = /obj/item/gun/ballistic/revolver/ashhand
+
+/obj/item/storage/guncase/hellfire
+ gun_type = /obj/item/gun/ballistic/shotgun/hellfire
+
+/obj/item/storage/guncase/doublebarrel
+ gun_type = /obj/item/gun/ballistic/shotgun/doublebarrel
+
+/obj/item/storage/guncase/brimstone
+ gun_type = /obj/item/gun/ballistic/shotgun/brimstone
+
+/obj/item/storage/guncase/illestren
+ gun_type = /obj/item/gun/ballistic/rifle/illestren
+ mag_type = /obj/item/ammo_box/magazine/illestren_a850r
+
+/obj/item/storage/guncase/beacon
+ gun_type = /obj/item/gun/ballistic/shotgun/doublebarrel/beacon
+
+/obj/item/storage/guncase/scout
+ gun_type = /obj/item/gun/ballistic/rifle/scout
+ mag_type = /obj/item/ammo_box/a300
+
+/obj/item/storage/guncase/winchester
+ gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow
+
+/obj/item/storage/guncase/conflagration
+ gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow/conflagration
+
+/obj/item/storage/guncase/absolution
+ gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow/absolution
+
+/obj/item/storage/guncase/firestorm
+ gun_type = /obj/item/gun/ballistic/automatic/smg/firestorm
+ mag_type = /obj/item/ammo_box/magazine/c45_firestorm_mag
+
+/obj/item/storage/guncase/vickland
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/vickland
+ mag_type = /obj/item/ammo_box/vickland_a308
+
+/* Scarbourough */
+
+/obj/item/storage/guncase/pistol/a357
+ gun_type = /obj/item/gun/ballistic/revolver/viper
+ mag_type = /obj/item/ammo_box/a357/empty
+
+/obj/item/storage/guncase/pistol/viper
+ gun_type = /obj/item/gun/ballistic/revolver/viper/indie
+ mag_type = /obj/item/ammo_box/a357/empty
+
+/obj/item/storage/guncase/pistol/ringneck
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck/indie
+ mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck
+
+/obj/item/storage/guncase/pistol/pc76
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck
+ mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck
+
+/obj/item/storage/guncase/pistol/asp
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/asp
+ mag_type = /obj/item/ammo_box/magazine/m57_39_asp
+
+/obj/item/storage/guncase/pistol/rattlesnake
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/rattlesnake
+ mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
+
+/obj/item/storage/guncase/cobra
+ gun_type = /obj/item/gun/ballistic/automatic/smg/cobra/indie
+ mag_type = /obj/item/ammo_box/magazine/m45_cobra
+
+/obj/item/storage/guncase/boomslang
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/boomslang/indie
+ mag_type = /obj/item/ammo_box/magazine/boomslang/short
+
+/obj/item/storage/guncase/boomslangmilitary
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/boomslang
+ mag_type = /obj/item/ammo_box/magazine/boomslang/short
+
+/obj/item/storage/guncase/rattlesnake
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/rattlesnake
+ mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
+
+/obj/item/storage/guncase/bulldog
+ gun_type = /obj/item/gun/ballistic/shotgun/automatic/bulldog
+ mag_type = /obj/item/ammo_box/magazine/m12g_bulldog
+
+/obj/item/storage/guncase/sidewinder
+ gun_type = /obj/item/gun/ballistic/automatic/smg/sidewinder
+ mag_type = /obj/item/ammo_box/magazine/m57_39_sidewinder
+
+/obj/item/storage/guncase/hydra
+ gun_type = /obj/item/gun/ballistic/automatic/assault/hydra
+ mag_type = /obj/item/ammo_box/magazine/m556_42_hydra
+
+/obj/item/storage/guncase/sbr80
+ gun_type = /obj/item/gun/ballistic/automatic/assault/hydra/dmr
+ mag_type = /obj/item/ammo_box/magazine/m556_42_hydra/small
+
+/obj/item/storage/guncase/saw80
+ gun_type = /obj/item/gun/ballistic/automatic/assault/hydra/lmg
+ mag_type = /obj/item/ammo_box/magazine/m556_42_hydra/extended
+
+/obj/item/storage/guncase/taipan
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/taipan
+ mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+
+/* Etherbor */
+
+/obj/item/storage/guncase/pistol/kalixpistol
+ gun_type = /obj/item/gun/energy/kalix/pistol
+ mag_type = /obj/item/stock_parts/cell/gun/kalix
+
+/obj/item/storage/guncase/energy/kalixrifle
+ gun_type = /obj/item/gun/energy/kalix
+ mag_type = /obj/item/stock_parts/cell/gun/kalix
+
+/obj/item/storage/guncase/energy/bg16
+ gun_type = /obj/item/gun/energy/kalix/pgf
+ mag_type = /obj/item/stock_parts/cell/gun/pgf
+
+/obj/item/storage/guncase/energy/hbg7
+ gun_type = /obj/item/gun/energy/kalix/pgf/heavy
+ mag_type = /obj/item/stock_parts/cell/gun/pgf
+
+/obj/item/storage/guncase/energy/hbg7l
+ gun_type = /obj/item/gun/energy/kalix/pgf/heavy/sniper
+ mag_type = /obj/item/stock_parts/cell/gun/pgf
+
+/* Serene Outdoors Guns */
+
+/obj/item/storage/guncase/pistol/m17
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/m17
+ mag_type = /obj/item/ammo_box/magazine/m17
+
+/obj/item/storage/guncase/m12
+ gun_type = /obj/item/gun/ballistic/automatic/m12_sporter
+ mag_type = /obj/item/ammo_box/magazine/m12_sporter
+
+/obj/item/storage/guncase/m13
+ gun_type = /obj/item/gun/ballistic/automatic/m12_sporter/mod
+ mag_type = /obj/item/ammo_box/magazine/m12_sporter
+ mag_count = 3
+
+/obj/item/storage/guncase/m15
+ gun_type = /obj/item/gun/ballistic/automatic/m15
+ mag_type = /obj/item/ammo_box/magazine/m15
+
+/obj/item/storage/guncase/buckmaster
+ gun_type = /obj/item/gun/ballistic/shotgun/automatic/m11
+
+/* Solar Armories */
+
+/obj/item/storage/guncase/pistol/modelh
+ gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/modelh
+ mag_type = /obj/item/ammo_box/magazine/modelh
+
+/obj/item/storage/guncase/pistol/pistolec
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/solgov
+ mag_type = /obj/item/ammo_box/magazine/pistol556mm
+
+/obj/item/storage/guncase/ssg669
+ gun_type = /obj/item/gun/ballistic/rifle/solgov
+ mag_type = /obj/item/ammo_box/a858
+
+/obj/item/storage/guncase/claris
+ gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/claris
+ mag_type = /obj/item/ammo_box/amagpellet_claris
+
+/obj/item/storage/guncase/gar
+ gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/gar
+ mag_type = /obj/item/ammo_box/magazine/gar
+
+/* VI */
+
+/obj/item/storage/guncase/pistol/commander
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/commander
+ mag_type = /obj/item/ammo_box/magazine/co9mm
+
+/obj/item/storage/guncase/vector
+ gun_type = /obj/item/gun/ballistic/automatic/smg/vector
+ mag_type = /obj/item/ammo_box/magazine/smgm9mm
+
+/* Sharplite */
+
+/obj/item/storage/guncase/pistol/miniegun
+ gun_type = /obj/item/gun/energy/e_gun/mini
+ mag_type = /obj/item/stock_parts/cell/gun/mini
+
+/obj/item/storage/guncase/energy
+ mag_type = /obj/item/stock_parts/cell/gun
+
+/obj/item/storage/guncase/energy/laser
+ gun_type = /obj/item/gun/energy/laser
+
+/obj/item/storage/guncase/energy/egun
+ gun_type = /obj/item/gun/energy/e_gun
+
+/obj/item/storage/guncase/energy/ultima
+ gun_type = /obj/item/gun/energy/e_gun/iot
+
+/obj/item/storage/guncase/energy/etar
+ gun_type = /obj/item/gun/energy/e_gun/smg
+
+/obj/item/storage/guncase/energy/iongun
+ gun_type = /obj/item/gun/energy/ionrifle
+
+/obj/item/storage/guncase/hades
+ gun_type = /obj/item/gun/energy/e_gun/hades
+ mag_type = /obj/item/stock_parts/cell/gun/upgraded
+
+/* Old NT */
+
+/obj/item/storage/guncase/wt550
+ gun_type = /obj/item/gun/ballistic/automatic/smg/wt550
+ mag_type = /obj/item/ammo_box/magazine/wt550m9
+
+/obj/item/storage/guncase/gauss
+ gun_type = /obj/item/gun/ballistic/automatic/powered/gauss
+ mag_type = /obj/item/ammo_box/magazine/gauss
+
+/obj/item/storage/guncase/saber
+ gun_type = /obj/item/gun/ballistic/automatic/smg/skm_carbine/saber
+ mag_type = /obj/item/ammo_box/magazine/smgm9mm
+
+/* Minutemen */
+
+/obj/item/storage/guncase/pistol/cm23
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/cm23
+ mag_type = /obj/item/ammo_box/magazine/cm23
+
+/obj/item/storage/guncase/pistol/cm70
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/cm70
+ mag_type = /obj/item/ammo_box/magazine/m9mm_cm70
+
+/obj/item/storage/guncase/pistol/cm357
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/cm357
+ mag_type = /obj/item/ammo_box/magazine/cm357
+
+/obj/item/storage/guncase/cm5
+ gun_type = /obj/item/gun/ballistic/automatic/smg/cm5
+ mag_type = /obj/item/ammo_box/magazine/cm5_9mm
+
+/obj/item/storage/guncase/cm82
+ gun_type = /obj/item/gun/ballistic/automatic/assault/cm82
+ mag_type = /obj/item/ammo_box/magazine/p16
+
+/obj/item/storage/guncase/cmf4
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/f4
+ mag_type = /obj/item/ammo_box/magazine/f4_308
+
+/obj/item/storage/guncase/cm15
+ gun_type = /obj/item/gun/ballistic/shotgun/cm15
+ mag_type = /obj/item/ammo_box/magazine/cm15_12g
+
+/obj/item/storage/guncase/cm24
+ gun_type = /obj/item/gun/ballistic/automatic/assault/skm/cm24
+ mag_type = /obj/item/ammo_box/magazine/skm_762_40
+
+/obj/item/storage/guncase/cmf90
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/f90
+ mag_type = /obj/item/ammo_box/magazine/f90
+
+/obj/item/storage/guncase/cm40
+ gun_type = /obj/item/gun/ballistic/automatic/hmg/cm40
+ mag_type = /obj/item/ammo_box/magazine/cm40_762_40_box
+
+/* Inteq */
+
+/obj/item/storage/guncase/skm_inteq
+ gun_type = /obj/item/gun/ballistic/automatic/assault/skm/inteq
+ mag_type = /obj/item/ammo_box/magazine/skm_762_40
+
+/obj/item/storage/guncase/commissioner
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
+ mag_type = /obj/item/ammo_box/magazine/co9mm
+
+/obj/item/storage/guncase/mongrel
+ gun_type = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq
+ mag_type = /obj/item/ammo_box/magazine/smgm10mm
+
+/obj/item/storage/guncase/mastiff
+ gun_type = /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq
+ mag_type = /obj/item/ammo_box/magazine/m12g_bulldog
+
+/obj/item/storage/guncase/kingsnake
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/rattlesnake/inteq
+ mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
+
+/obj/item/storage/guncase/ssg04
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/f4/inteq
+ mag_type = /obj/item/ammo_box/magazine/f4_308
+
+/* idk */
+
+/obj/item/storage/guncase/pistol/disposable
+/obj/item/storage/guncase/pistol/disposable/PopulateContents()
+ new /obj/item/gun/ballistic/automatic/pistol/disposable(src)
+ new /obj/item/gun/ballistic/automatic/pistol/disposable(src)
+
+/obj/item/storage/guncase/skm
+ gun_type = /obj/item/gun/ballistic/automatic/assault/skm
+ mag_type = /obj/item/ammo_box/magazine/skm_762_40
+
+/obj/item/storage/guncase/skm_lmg
+ gun_type = /obj/item/gun/ballistic/automatic/hmg/skm_lmg
+ mag_type = /obj/item/ammo_box/magazine/skm_762_40/drum
+
+/* Eoehoma */
+
+/obj/item/storage/guncase/energy/e10
+ gun_type = /obj/item/gun/energy/laser/e10
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index bac896c0b8d..5cc98e8c609 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -108,7 +108,7 @@
return
var/static/items_inside = list(
/obj/item/healthanalyzer = 1,
- /obj/item/stack/medical/gauze = 1,
+ /obj/item/stack/medical/gauze/twelve = 1,
/obj/item/stack/medical/suture = 2,
/obj/item/stack/medical/mesh = 2,
/obj/item/reagent_containers/hypospray/medipen = 1,
diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm
index 6790a68456a..ea79d87e089 100644
--- a/code/game/objects/items/storage/guncases.dm
+++ b/code/game/objects/items/storage/guncases.dm
@@ -1,8 +1,10 @@
/obj/item/storage/guncase
name = "gun case"
desc = "A large box designed for holding firearms and magazines safely."
- icon = 'icons/obj/guncase_48x32.dmi'
- icon_state = "riflecase"
+ icon = 'icons/obj/guncase.dmi'
+ icon_state = "guncase"
+ lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
item_state = "infiltrator_case"
force = 12
throwforce = 12
@@ -13,28 +15,54 @@
hitsound = 'sound/weapons/smash.ogg'
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
-
-
-/obj/item/storage/guncase/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 10
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
+ custom_materials = list(/datum/material/iron = 500)
+ var/max_items = 10
+ var/max_w_class = WEIGHT_CLASS_BULKY
+ var/gun_type
+ var/mag_type
+ var/mag_count = 2
+ var/ammoless = TRUE
+ var/grab_loc = FALSE
+ var/holdable_items = list(
/obj/item/gun,
/obj/item/ammo_box,
/obj/item/stock_parts/cell/gun
- ))
+ )
-/obj/item/storage/guncase/winchester
-/obj/item/storage/guncase/winchester/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/flamingarrow/no_mag(src)
+/obj/item/storage/guncase/Initialize(mapload)
+ . = ..()
+ if(mapload && grab_loc)
+ var/items_eaten = 0
+ for(var/obj/item/I in loc)
+ if(I.w_class > max_w_class)
+ continue
+ if(is_type_in_list(I, holdable_items))
+ I.forceMove(src)
+ items_eaten++
+ if(items_eaten >= mag_count + 1)
+ break
-/obj/item/storage/guncase/skm
-/obj/item/storage/guncase/skm/PopulateContents()
- new /obj/item/gun/ballistic/automatic/assault/skm/no_mag(src)
- new /obj/item/ammo_box/magazine/skm_762_40/empty(src)
- new /obj/item/ammo_box/magazine/skm_762_40/empty(src)
+/obj/item/storage/guncase/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = max_items
+ STR.max_w_class = max_w_class
+ STR.set_holdable(holdable_items)
+
+/obj/item/storage/guncase/PopulateContents()
+ if(grab_loc)
+ return
+ if(gun_type)
+ new gun_type(src, ammoless)
+ if(mag_type)
+ for(var/i in 1 to mag_count)
+ if(ispath(mag_type, /obj/item/ammo_box) | ispath(mag_type, /obj/item/stock_parts/cell))
+ new mag_type(src, ammoless)
+
+/// Need to double check this in a seperate pr that adds this to a few ships
+/// Eats the items on its tile
+/obj/item/storage/guncase/inherit
+ grab_loc = TRUE
/obj/item/storage/guncase/p16
/obj/item/storage/guncase/p16/PopulateContents()
@@ -42,61 +70,11 @@
new /obj/item/ammo_box/magazine/p16/empty(src)
new /obj/item/ammo_box/magazine/p16/empty(src)
-/obj/item/storage/guncase/beacon
-/obj/item/storage/guncase/beacon/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/doublebarrel/beacon(src)
-
-/obj/item/storage/guncase/scout
-/obj/item/storage/guncase/scout/PopulateContents()
- new /obj/item/gun/ballistic/rifle/scout/no_mag(src)
- new /obj/item/ammo_box/a300/empty(src)
- new /obj/item/ammo_box/a300/empty(src)
-
-/obj/item/storage/guncase/cobra
-/obj/item/storage/guncase/cobra/PopulateContents()
- new /obj/item/gun/ballistic/automatic/smg/c20r/cobra/no_mag(src)
- new /obj/item/ammo_box/magazine/smgm45/empty(src)
- new /obj/item/ammo_box/magazine/smgm45/empty(src)
-
-
-/obj/item/storage/guncase/hellfire
-/obj/item/storage/guncase/hellfire/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/hellfire/no_mag(src)
-
-/obj/item/storage/guncase/doublebarrel
-/obj/item/storage/guncase/doublebarrel/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/doublebarrel/no_mag(src)
-
-/obj/item/storage/guncase/brimstone
-/obj/item/storage/guncase/brimstone/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/brimstone/no_mag(src)
-
-/obj/item/storage/guncase/illestren
-/obj/item/storage/guncase/illestren/PopulateContents()
- new /obj/item/gun/ballistic/rifle/illestren/empty(src)
- new /obj/item/ammo_box/magazine/illestren_a850r/empty(src)
- new /obj/item/ammo_box/magazine/illestren_a850r/empty(src)
-
-/obj/item/storage/guncase/wt550
-/obj/item/storage/guncase/wt550/PopulateContents()
- new /obj/item/gun/ballistic/automatic/smg/wt550(src)
- new /obj/item/ammo_box/magazine/wt550m9/empty(src)
- new /obj/item/ammo_box/magazine/wt550m9/empty(src)
-
-/obj/item/storage/pistolcase
+/obj/item/storage/guncase/pistol
name = "pistol case"
desc = "A large box designed for holding pistols and magazines safely."
- icon = 'icons/obj/guncase.dmi'
- icon_state = "pistolcase"
- item_state = "infiltrator_case"
- force = 12
- throwforce = 12
- throw_speed = 2
- w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("robusted")
- hitsound = 'sound/weapons/smash.ogg'
- drop_sound = 'sound/items/handling/toolbox_drop.ogg'
- pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
+ max_items = 8
+ max_w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/pistolcase/ComponentInitialize()
. = ..()
@@ -118,8 +96,8 @@
/obj/item/storage/pistolcase/stechkin
/obj/item/storage/pistolcase/stechkin/PopulateContents()
new /obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag(src)
- new /obj/item/ammo_box/magazine/m10mm/empty(src)
- new /obj/item/ammo_box/magazine/m10mm/empty(src)
+ new /obj/item/ammo_box/magazine/m10mm_ringneck/empty(src)
+ new /obj/item/ammo_box/magazine/m10mm_ringneck/empty(src)
/obj/item/storage/pistolcase/candor
/obj/item/storage/pistolcase/candor/PopulateContents()
@@ -155,7 +133,7 @@
/obj/item/storage/pistolcase/derringer
/obj/item/storage/pistolcase/derringer/PopulateContents()
- new /obj/item/gun/ballistic/derringer/no_mag(src)
+ new /obj/item/gun/ballistic/derringer/empty(src)
/obj/item/storage/pistolcase/a357
/obj/item/storage/pistolcase/a357/PopulateContents()
@@ -204,3 +182,8 @@
/obj/item/storage/pistolcase/iongun/PopulateContents()
new /obj/item/gun/energy/ionrifle/empty_cell(src)
new /obj/item/stock_parts/cell/gun(src)
+
+/// Need to double check this in a seperate pr that adds this to a few ships
+/// Eats the items on its tile
+/obj/item/storage/guncase/pistol/inherit
+ grab_loc = TRUE
diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm
index 9000d5e4dbd..251cc9e06b1 100644
--- a/code/game/objects/items/storage/holsters.dm
+++ b/code/game/objects/items/storage/holsters.dm
@@ -24,7 +24,7 @@
STR.max_items = 1
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.set_holdable(list(
- /obj/item/gun/ballistic/automatic/pistol/syndicate,
+ /obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
@@ -90,7 +90,7 @@
STR.max_items = 2
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.set_holdable(list(
- /obj/item/gun/ballistic/automatic/pistol/syndicate,
+ /obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/energy/e_gun/mini,
/obj/item/gun/energy/disabler,
diff --git a/code/game/objects/items/storage/ration.dm b/code/game/objects/items/storage/ration.dm
index 482ba202a73..9a9e4a5a261 100644
--- a/code/game/objects/items/storage/ration.dm
+++ b/code/game/objects/items/storage/ration.dm
@@ -9,16 +9,28 @@
resistance_flags = FLAMMABLE
drop_sound = 'sound/items/handling/cardboardbox_drop.ogg'
pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg'
+ var/emblem_icon_state = "null"
+ var/ration_overlay = "null"
/obj/item/storage/ration/Initialize(mapload)
. = ..()
update_icon()
+ update_overlays()
+
+/obj/item/storage/ration/update_overlays()
+ . = ..()
+ var/mutable_appearance/ration_overlay
+ if(emblem_icon_state)
+ ration_overlay = mutable_appearance(icon, emblem_icon_state)
+ add_overlay(ration_overlay)
/obj/item/storage/ration/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 7
- STR.set_holdable(list(/obj/item/reagent_containers/food))
+ STR.set_holdable(list(
+ /obj/item/reagent_containers/food,
+ /obj/item/ration_heater))
STR.locked = TRUE
STR.locked_flavor = "sealed closed"
@@ -38,13 +50,13 @@
/obj/item/storage/ration/vegan_chili
name = "vegan chili with beans ration"
desc = "A complete meal package containing a hearty vegan chili with beans, complemented by vegetable crackers, savory cornbread, flavorful pizza crackers, and more. A perfect choice for plant-based nourishment."
-
+ emblem_icon_state = "emblem_vegan_chili"
/obj/item/storage/ration/vegan_chili/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/vegan_chili = 1,
/obj/item/reagent_containers/food/snacks/ration/side/vegan_crackers = 1,
/obj/item/reagent_containers/food/snacks/ration/side/cornbread = 1,
- /obj/item/reagent_containers/food/snacks/ration/snack/pizza_crackers = 1,
+ /obj/item/reagent_containers/food/snacks/ration/snack/fruit_puree = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/cheese_spread = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/grape_beverage = 1,
/obj/item/ration_heater = 1
@@ -54,7 +66,7 @@
/obj/item/storage/ration/shredded_beef
name = "shredded beef in barbecue sauce ration"
desc = "Enjoy the rich and savory flavors of shredded beef in smoky barbecue sauce with this satisfying ration. Accompanied by a fruit puree, jerky wrap, cinnamon bun, and additional condiments, this ration is perfect for meat lovers."
-
+ emblem_icon_state = "emblem_shredded_beef"
/obj/item/storage/ration/shredded_beef/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/shredded_beef = 1,
@@ -70,7 +82,7 @@
/obj/item/storage/ration/pork_spaghetti
name = "spaghetti with pork and sauce ration"
desc = "Indulge in a comforting meal of spaghetti with tender pork and savory sauce with this ration. Complemented by a toaster pastry, seasoned bread sticks, dried raisins, and other accompaniments, this ration offers a flavorful experience."
-
+ emblem_icon_state = "emblem_pork_spaghetti"
/obj/item/storage/ration/pork_spaghetti/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/pork_spaghetti = 1,
@@ -86,7 +98,7 @@
/obj/item/storage/ration/fried_fish
name = "fried fish chunks ration"
desc = "Experience the crispy delight of fried fish chunks with this ration. Accompanied by an energy bar, tortillas, toasted corn kernels, and more, this ration provides a satisfying combination of flavors and textures."
-
+ emblem_icon_state = "emblem_fried_fish"
/obj/item/storage/ration/fried_fish/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/fried_fish = 1,
@@ -103,7 +115,7 @@
/obj/item/storage/ration/beef_strips
name = "beef strips in tomato sauce ration"
desc = "Savor the deliciousness of tender beef strips in a flavorful tomato sauce with this ration. Enjoy a chocolate pudding, white wheat snack bread, blackberry preserves, and peppermint candy rings as delightful accompaniments."
-
+ emblem_icon_state = "emblem_beef_strips"
/obj/item/storage/ration/beef_strips/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/beef_strips = 1,
@@ -120,7 +132,7 @@
/obj/item/storage/ration/chili_macaroni
name = "chili and macaroni ration"
desc = "Indulge in the comforting combination of chili and macaroni in this flavorful ration. Satisfy your taste buds with a mix of sweet and savory treats."
-
+ emblem_icon_state = "emblem_chili_macaroni"
/obj/item/storage/ration/chili_macaroni/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/chili_macaroni = 1,
@@ -137,7 +149,7 @@
/obj/item/storage/ration/chicken_wings_hot_sauce
name = "chicken wings in hot sauce ration"
desc = "Experience the bold and spicy flavors of chicken wings drenched in hot sauce. This ration also includes a mix of delightful snacks for a well-rounded meal."
-
+ emblem_icon_state = "emblem_chicken_wings_hot_sauce"
/obj/item/storage/ration/chicken_wings_hot_sauce/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/chicken_wings_hot_sauce = 1,
@@ -153,7 +165,7 @@
/obj/item/storage/ration/fish_stew
name = "fish stew ration"
desc = "Dive into the depths of flavor with this fish stew ration. Enjoy a hearty blend of seafood and vegetables, complemented by a selection of tasty accompaniments."
-
+ emblem_icon_state = "emblem_fish_stew"
/obj/item/storage/ration/fish_stew/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/fish_stew = 1,
@@ -170,7 +182,7 @@
/obj/item/storage/ration/lemon_pepper_chicken
name = "lemon pepper chicken ration"
desc = "A tasty Lemon Pepper Chicken ration that combines the flavors of fruit and meat. Perfect for a satisfying meal."
-
+ emblem_icon_state = "emblem_lemon_pepper_chicken"
/obj/item/storage/ration/lemon_pepper_chicken/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/lemon_pepper_chicken = 1,
@@ -186,7 +198,7 @@
/obj/item/storage/ration/sausage_peppers_onions
name = "sausage, peppers and onions ration"
desc = "Indulge in the delightful combination of juicy sausage, peppers, and onions in this hearty ration."
-
+ emblem_icon_state = "emblem_sausage_peppers_onions"
/obj/item/storage/ration/sausage_peppers_onions/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/sausage_peppers_onions = 1,
@@ -202,7 +214,7 @@
/obj/item/storage/ration/pork_dumplings_chili_sauce
name = "pork dumplings in chili sauce ration"
desc = "Savor the rich flavors of pork dumplings in a spicy chili sauce, accompanied by a variety of complementary snacks."
-
+ emblem_icon_state = "emblem_pork_dumplings_chili_sauce"
/obj/item/storage/ration/pork_dumplings_chili_sauce/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/dumplings_chili_sauce = 1,
@@ -218,7 +230,7 @@
/obj/item/storage/ration/battered_fish_sticks
name = "battered fish sticks ration"
desc = "Enjoy the crispy goodness of battered fish sticks, along with a selection of sides and a delectable dessert."
-
+ emblem_icon_state = "emblem_battered_fish_sticks"
/obj/item/storage/ration/battered_fish_sticks/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/battered_fish_sticks = 1,
@@ -234,7 +246,7 @@
/obj/item/storage/ration/assorted_salted_offal
name = "assorted salted offal ration"
desc = "An adventurous choice, this ration offers an assortment of salted offal, providing a unique culinary experience."
-
+ emblem_icon_state = "emblem_assorted_salted_offal"
/obj/item/storage/ration/assorted_salted_offal/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/assorted_salted_offal = 1,
@@ -250,7 +262,7 @@
/obj/item/storage/ration/maple_pork_sausage_patty
name = "maple pork sausage patty ration"
desc = "Start your day with a satisfying breakfast featuring a maple-infused pork sausage patty and a variety of treats."
-
+ emblem_icon_state = "emblem_maple_pork_sausage_patty"
/obj/item/storage/ration/maple_pork_sausage_patty/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/maple_pork_sausage_patty = 1,
@@ -267,7 +279,7 @@
/obj/item/storage/ration/pepper_jack_beef_patty
name = "jalapeno pepper jack beef patty ration"
desc = "Experience a flavorful fusion of jalapeno, pepper jack cheese, and beef in this grilled beef patty ration."
-
+ emblem_icon_state = "emblem_pepper_jack_beef_patty"
/obj/item/storage/ration/pepper_jack_beef_patty/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/pepper_jack_beef_patty = 1,
@@ -284,7 +296,7 @@
/obj/item/storage/ration/beef_goulash
name = "beef goulash ration"
desc = "Delight in the rich flavors of beef goulash, accompanied by a selection of sides and a sweet treat."
-
+ emblem_icon_state = "emblem_beef_goulash"
/obj/item/storage/ration/beef_goulash/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/beef_goulash = 1,
@@ -301,7 +313,7 @@
/obj/item/storage/ration/pepperoni_pizza_slice
name = "pepperoni pizza slice ration"
desc = "Indulge in the classic taste of pepperoni pizza with this ration, complete with sides and a refreshing beverage."
-
+ emblem_icon_state = "emblem_pepperoni_pizza_slice"
/obj/item/storage/ration/pepperoni_pizza_slice/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/pepperoni_pizza_slice = 1,
@@ -317,7 +329,7 @@
/obj/item/storage/ration/blackened_calamari
name = "blackened calamari in red sauce ration"
desc = "Enjoy the savory delight of blackened calamari served in a rich red sauce."
-
+ emblem_icon_state = "emblem_blackened_calamari"
/obj/item/storage/ration/blackened_calamari/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/blackened_calamari = 1,
@@ -334,7 +346,7 @@
/obj/item/storage/ration/elbow_macaroni
name = "elbow macaroni in tomato sauce ration"
desc = "Savor the comforting taste of elbow macaroni in a delicious tomato sauce."
-
+ emblem_icon_state = "emblem_elbow_macaroni"
/obj/item/storage/ration/elbow_macaroni/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/elbow_macaroni = 1,
@@ -351,7 +363,7 @@
/obj/item/storage/ration/cheese_pizza_slice
name = "cheese pizza slice ration"
desc = "Experience the timeless flavor of a classic cheese pizza slice."
-
+ emblem_icon_state = "emblem_cheese_pizza_slice"
/obj/item/storage/ration/cheese_pizza_slice/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/cheese_pizza_slice = 1,
@@ -368,7 +380,7 @@
/obj/item/storage/ration/crayons
name = "military grade crayon ration"
desc = "Proven to increase kill count by atleast 1."
-
+ emblem_icon_state = "emblem_crayons"
/obj/item/storage/ration/crayons/PopulateContents()
var/static/items_inside = list(
/obj/item/toy/crayon/red = 1,
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index 238e39ce931..f46d6eb4c2c 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -173,7 +173,7 @@
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.set_holdable(null, list(/obj/item/storage/secure/briefcase))
- STR.max_w_class = 8 //??
+ STR.max_w_class = 8
/obj/item/storage/secure/safe/PopulateContents()
new /obj/item/paper(src)
@@ -200,9 +200,9 @@
/obj/item/storage/secure/safe/intel/stechkin/PopulateContents()
. = ..()
- new /obj/item/gun/ballistic/automatic/pistol/syndicate(src)
- new /obj/item/ammo_box/magazine/m10mm(src)
- new /obj/item/ammo_box/magazine/m10mm(src)
+ new /obj/item/gun/ballistic/automatic/pistol/ringneck(src)
+ new /obj/item/ammo_box/magazine/m10mm_ringneck(src)
+ new /obj/item/ammo_box/magazine/m10mm_ringneck(src)
/obj/item/storage/secure/safe/suns
name = "Captain's Secure Safe"
@@ -211,3 +211,20 @@
/obj/item/storage/secure/safe/suns/PopulateContents()
. = ..()
new /obj/item/storage/belt/sabre/suns(src)
+
+/obj/item/storage/secure/safe/cybersun
+ name = "Captain's secure safe"
+ desc = "An electronic safe manufactured by Cybersun Virtual Solutions."
+
+/obj/item/storage/secure/safe/cybersun/PopulateContents()
+ new /obj/item/gun/ballistic/automatic/pistol/himehabu/no_mag(src)
+ new /obj/item/ammo_box/magazine/m22lr_himehabu(src)
+ new /obj/item/ammo_box/magazine/m22lr_himehabu(src)
+
+/obj/item/storage/secure/safe/cybersun/solutions/PopulateContents()
+ . = ..()
+ new /obj/item/folder/documents/syndicate/cybersun(src)
+
+/obj/item/storage/secure/safe/cybersun/biodynamics/PopulateContents()
+ . = ..()
+ new /obj/item/folder/documents/syndicate/cybersun/biodynamics(src)
diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm
index c2619eef4c1..f0e5665b446 100644
--- a/code/game/objects/items/storage/storage.dm
+++ b/code/game/objects/items/storage/storage.dm
@@ -28,6 +28,12 @@
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
+/obj/item/storage/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ . = ..()
+ for(var/obj/item/gun/at_risk in get_all_contents())
+ if(at_risk.safety == FALSE && prob(GUN_NO_SAFETY_MALFUNCTION_CHANCE_HIGH))
+ at_risk.discharge("is hits the ground hard")
+
/obj/item/storage/canStrip(mob/who)
. = ..()
if(!. && rummage_if_nodrop)
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 88eb493626d..ba57add3f6f 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -17,12 +17,13 @@
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
material_flags = MATERIAL_COLOR
- var/latches = "single_latch"
+ var/latches = null
var/has_latches = TRUE
/obj/item/storage/toolbox/Initialize()
. = ..()
- if(has_latches)
+ if(has_latches && !latches)
+ latches = "single_latch"
if(prob(10))
latches = "double_latch"
if(prob(1))
@@ -71,12 +72,10 @@
material_flags = NONE
/obj/item/storage/toolbox/mechanical/PopulateContents()
- //WS Edit - Better Tool sprites
if(prob(50))
new /obj/item/wrench(src)
else
new /obj/item/wrench/crescent(src)
- //WS End
new /obj/item/screwdriver(src)
new /obj/item/weldingtool(src)
new /obj/item/crowbar(src)
@@ -158,11 +157,9 @@
new /obj/item/stack/cable_coil(src,MAXCOIL,pickedcolor)
/obj/item/storage/toolbox/syndicate
- name = "suspicious looking toolbox"
+ name = "black and red toolbox"
icon_state = "syndicate"
item_state = "toolbox_syndi"
- force = 15
- throwforce = 18
material_flags = NONE
/obj/item/storage/toolbox/syndicate/ComponentInitialize()
@@ -172,12 +169,12 @@
/obj/item/storage/toolbox/syndicate/PopulateContents()
new /obj/item/screwdriver/nuke(src)
- new /obj/item/wrench/syndie(src) //WS Edit - Cool Syndie Tools
+ new /obj/item/wrench/syndie(src)
new /obj/item/weldingtool/largetank(src)
- new /obj/item/crowbar/syndie(src) //WS Begin - Cool Syndie Tools
+ new /obj/item/crowbar/syndie(src)
new /obj/item/wirecutters/syndie(src)
- new /obj/item/multitool/syndie(src) //WS End
- new /obj/item/clothing/gloves/combat(src)
+ new /obj/item/multitool/syndie(src)
+ new /obj/item/clothing/gloves/color/yellow(src)
/obj/item/storage/toolbox/syndicate/empty
@@ -225,58 +222,6 @@
new /obj/item/stack/cable_coil/cyan(src)
new /obj/item/stack/cable_coil/white(src)
-/obj/item/storage/toolbox/ammo
- name = "ammo can"
- desc = "A metal container for storing multiple boxes of ammunition or grenades."
- icon_state = "ammobox"
- item_state = "ammobox"
- drop_sound = 'sound/items/handling/ammobox_drop.ogg'
- pickup_sound = 'sound/items/handling/ammobox_pickup.ogg'
- material_flags = NONE
- has_latches = FALSE
-
-/obj/item/storage/toolbox/ammo/a850r/PopulateContents()
- name = "ammo can (8x50mmR)"
- icon_state = "ammobox_850"
- for(var/i in 1 to 4)
- new /obj/item/ammo_box/c8x50mm_box(src)
-
-/obj/item/storage/toolbox/ammo/a762_40/PopulateContents()
- name = "ammo can (7.62x40mm CLIP)"
- icon_state = "ammobox_762"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/a762_40(src)
-
-/obj/item/storage/toolbox/ammo/a308/PopulateContents()
- name = "ammo can (.308)"
- icon_state = "ammobox_308"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/a308(src)
-
-/obj/item/storage/toolbox/ammo/c45/PopulateContents()
- name = "ammo can (.45)"
- icon_state = "ammobox_45"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/c45(src)
-
-/obj/item/storage/toolbox/ammo/c9mm/PopulateContents()
- name = "ammo can (9mm)"
- icon_state = "ammobox_9mm"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/c9mm(src)
-
-/obj/item/storage/toolbox/ammo/c10mm/PopulateContents()
- name = "ammo can (10mm)"
- icon_state = "ammobox_10mm"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/c10mm(src)
-
-/obj/item/storage/toolbox/ammo/shotgun/PopulateContents()
- name = "ammo can (12ga)"
- icon_state = "ammobox_12ga"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/a12g(src)
-
/obj/item/storage/toolbox/infiltrator
name = "insidious case"
desc = "Bearing the emblem of the Syndicate, this case contains a full infiltrator stealth suit, and has enough room to fit weaponry if necessary."
@@ -298,8 +243,7 @@
/obj/item/clothing/under/syndicate/bloodred,
/obj/item/clothing/gloves/color/latex/nitrile/infiltrator,
/obj/item/clothing/mask/infiltrator,
- /obj/item/clothing/shoes/combat/sneakboots,
- /obj/item/gun/ballistic/automatic/pistol/syndicate,
+ /obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box
))
@@ -310,7 +254,38 @@
new /obj/item/clothing/under/syndicate/bloodred(src)
new /obj/item/clothing/gloves/color/latex/nitrile/infiltrator(src)
new /obj/item/clothing/mask/infiltrator(src)
- new /obj/item/clothing/shoes/combat/sneakboots(src)
+
+/obj/item/storage/toolbox/bounty
+ name = "defused explosives case"
+ desc = "Store defused landmines in here."
+ icon_state = "infiltrator_case"
+ item_state = "infiltrator_case"
+
+/obj/item/storage/toolbox/bounty/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_combined_w_class = 4
+ STR.max_items = 2
+
+/obj/item/storage/toolbox/bounty/hunt
+ name = "dogtag case"
+ desc = "Store pirate dogtags in here."
+
+/obj/item/storage/toolbox/bounty/hunt/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_combined_w_class = 6
+ STR.max_items = 3
+
+/obj/item/storage/toolbox/bounty/salvage
+ name = "research case"
+ desc = "Store salvaged science equipment in here."
+
+/obj/item/storage/toolbox/bounty/salvage/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_combined_w_class = 2
+ STR.max_items = 1
//floorbot assembly
/obj/item/storage/toolbox/attackby(obj/item/stack/tile/plasteel/T, mob/user, params)
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index bfbc4679af8..26b9b790b2f 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -2,7 +2,7 @@
/obj/item/storage/box/syndicate
/obj/item/storage/box/syndicate/bundle_A/PopulateContents()
- switch (pickweight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1)))
+ switch (pick_weight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1)))
if("recon")
new /obj/item/clothing/glasses/thermal/xray(src) // ~8 tc?
new /obj/item/storage/briefcase/launchpad(src) //6 tc
@@ -22,7 +22,7 @@
new /obj/item/multitool/ai_detect(src) // 1 tc
new /obj/item/encryptionkey/syndicate(src) // 2 tc
new /obj/item/reagent_containers/syringe/mulligan(src) // 4 tc
- new /obj/item/kitchen/knife/switchblade(src) //I'll count this as 2 tc
+ new /obj/item/melee/knife/switchblade(src) //I'll count this as 2 tc
new /obj/item/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals
new /obj/item/flashlight/emp(src) // 2 tc
new /obj/item/chameleon(src) // 7 tc
@@ -38,7 +38,7 @@
new /obj/item/jammer(src)
if("guns")
- new /obj/item/gun/ballistic/revolver/syndicate(src)
+ new /obj/item/gun/ballistic/revolver/viper(src)
new /obj/item/ammo_box/a357(src)
new /obj/item/ammo_box/a357(src)
new /obj/item/card/emag(src)
@@ -56,7 +56,7 @@
new /obj/item/encryptionkey/syndicate(src)
if("murder")
- new /obj/item/melee/transforming/energy/sword/saber(src)
+ new /obj/item/melee/energy/sword/saber(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
new /obj/item/card/emag(src)
new /obj/item/clothing/shoes/chameleon/noslip(src)
@@ -99,7 +99,7 @@
new /obj/item/storage/box/syndie_kit/emp(src)
if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks
- new /obj/item/gun/ballistic/automatic/marksman/sniper_rifle(src) // 12 tc
+ new /obj/item/gun/ballistic/automatic/marksman/taipan(src) // 12 tc
new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
new /obj/item/clothing/gloves/color/latex/nitrile(src)
@@ -108,28 +108,28 @@
if("metaops")
new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
- new /obj/item/gun/ballistic/shotgun/bulldog(src) // 8 tc
+ new /obj/item/gun/ballistic/shotgun/automatic/bulldog(src) // 8 tc
new /obj/item/implanter/explosive(src) // 2 tc
- new /obj/item/ammo_box/magazine/m12g(src) // 2 tc
- new /obj/item/ammo_box/magazine/m12g(src) // 2 tc
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum(src) // 2 tc
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum(src) // 2 tc
new /obj/item/grenade/c4 (src) // 1 tc
new /obj/item/grenade/c4 (src) // 1 tc
new /obj/item/card/emag(src) // 6 tc
/obj/item/storage/box/syndicate/bundle_B/PopulateContents()
- switch (pickweight(list( "bond" = 2, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "bee" = 1, "mr_freeze" = 2, "made_man"= 1)))
+ switch (pick_weight(list( "bond" = 2, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "mr_freeze" = 2, "made_man"= 1)))
if("bond")
- new /obj/item/gun/ballistic/automatic/pistol/syndicate(src)
- new /obj/item/suppressor(src)
- new /obj/item/ammo_box/magazine/m10mm(src)
- new /obj/item/ammo_box/magazine/m10mm(src)
+ new /obj/item/gun/ballistic/automatic/pistol/ringneck(src)
+ new /obj/item/attachment/silencer(src)
+ new /obj/item/ammo_box/magazine/m10mm_ringneck(src)
+ new /obj/item/ammo_box/magazine/m10mm_ringneck(src)
new /obj/item/clothing/under/chameleon(src)
new /obj/item/card/id/syndicate(src)
new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
new /obj/item/reagent_containers/glass/rag(src)
if("ninja")
- new /obj/item/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc?
+ new /obj/item/melee/sword/katana(src)
new /obj/item/implanter/adrenalin(src) // 8 tc
for(var/i in 1 to 6)
new /obj/item/throwing_star(src) // ~5 tc for all 6
@@ -140,14 +140,12 @@
if("darklord")
new /obj/item/dualsaber(src)
new /obj/item/dnainjector/telemut/darkbundle(src)
- new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
new /obj/item/card/id/syndicate(src)
new /obj/item/clothing/shoes/chameleon/noslip(src) //because slipping while being a dark lord sucks
new /obj/item/book/granter/spell/summonitem(src)
if("white_whale_holy_grail") //Unique items that don't appear anywhere else
new /obj/item/pneumatic_cannon/speargun(src)
- new /obj/item/storage/backpack/magspear_quiver(src)
new /obj/item/clothing/suit/space/hardsuit/carp(src)
new /obj/item/clothing/mask/gas/carp(src)
new /obj/item/grenade/spawnergrenade/spesscarp(src)
@@ -167,16 +165,6 @@
new /obj/item/pen/edagger(src)
new /obj/item/gun/energy/decloner(src)
- if("bee")
- new /obj/item/paper/fluff/bee_objectives(src) // 0 tc (motivation)
- new /obj/item/clothing/suit/hooded/bee_costume(src) // 0 tc
- new /obj/item/clothing/mask/rat/bee(src) // 0 tc
- new /obj/item/storage/belt/fannypack/yellow(src) // 0 tc
- new /obj/item/grenade/spawnergrenade/buzzkill(src)
- new /obj/item/grenade/spawnergrenade/buzzkill(src)
- new /obj/item/reagent_containers/glass/bottle/beesease(src) // 10 tc?
- new /obj/item/melee/beesword(src) //priceless
-
if("mr_freeze")
new /obj/item/clothing/glasses/cold(src)
new /obj/item/clothing/gloves/color/black(src)
@@ -190,12 +178,12 @@
new /obj/item/dnainjector/geladikinesis(src)
new /obj/item/dnainjector/cryokinesis(src)
new /obj/item/gun/energy/temperature/security(src)
- new /obj/item/melee/transforming/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue
+ new /obj/item/melee/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue
if("made_man")
- new /obj/effect/spawner/lootdrop/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
+ new /obj/effect/spawner/random/clothing/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
new /obj/item/gun/ballistic/automatic/smg/firestorm/pan(src) // 20 TC, a gun with 50 .45 bullets on a three round burst is kinda outstanding
- new /obj/item/kitchen/knife/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon
+ new /obj/item/melee/knife/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon
new /obj/item/reagent_containers/food/drinks/bottle/vodka (src) // 5 TC, free molotov assemblies
new /obj/item/reagent_containers/food/drinks/bottle/vodka (src)
new /obj/item/reagent_containers/food/drinks/bottle/vodka (src)
@@ -209,14 +197,6 @@
new /obj/item/reagent_containers/food/drinks/flask (src) // 1 TC, I can't believe I forgot about the booze flask AAAAAAA
new /obj/item/storage/secure/briefcase/syndie (src) // 1TC, for bribing the bartender to let you set up shop... amongst other actions.
-
-/obj/item/paper/fluff/bee_objectives
- name = "Objectives of a Bee Liberation Front Operative"
- default_raw_text = "Objective #1. Liberate all bees on the NT transport vessel 2416/B. Success! Objective #2. Escape alive. Failed."
-
-
-
-
/obj/item/storage/box/syndicate/contract_kit
name = "Contract Kit"
desc = "Supplied to Syndicate contractors."
@@ -302,11 +282,10 @@
/obj/item/storage/firstaid/tactical,
/obj/item/encryptionkey/syndicate,
/obj/item/clothing/glasses/thermal/syndi,
- /obj/item/slimepotion/slime/sentience/nuclear,
/obj/item/storage/box/syndie_kit/imp_radio,
/obj/item/storage/box/syndie_kit/imp_uplink,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
- /obj/item/gun/ballistic/automatic/smg/c20r/toy/riot,
+ /obj/item/gun/ballistic/automatic/toy,
/obj/item/reagent_containers/hypospray/medipen/stimulants,
/obj/item/storage/box/syndie_kit/imp_freedom,
/obj/item/toy/eightball/haunted
@@ -521,7 +500,6 @@
/obj/item/storage/box/syndie_kit/mimery/PopulateContents()
new /obj/item/book/granter/spell/mimery_blockade(src)
- new /obj/item/book/granter/spell/mimery_guns(src)
/obj/item/storage/box/syndie_kit/centcom_costume/PopulateContents()
new /obj/item/clothing/under/rank/centcom/official(src)
@@ -581,12 +559,3 @@
/obj/item/storage/box/syndie_kit/signaler/PopulateContents()
for(var/i in 1 to 6)
new /obj/item/assembly/signaler(src)
-
-/obj/item/storage/box/syndie_kit/cultconstructkit
- name = "cult construct kit"
- desc = "A sleek, sturdy box with an ominous, dark energy inside. Yikes."
-
-/obj/item/storage/box/syndie_kit/cultconstructkit/PopulateContents()
- new /obj/item/storage/belt/soulstone/full/purified(src)
- new /obj/item/sbeacondrop/constructshell(src)
- new /obj/item/sbeacondrop/constructshell(src)
diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm
index 002b7263329..2c8fda3ec5d 100644
--- a/code/game/objects/items/storage/wallets.dm
+++ b/code/game/objects/items/storage/wallets.dm
@@ -19,26 +19,21 @@
/obj/item/spacecash/bundle,
/obj/item/holochip,
/obj/item/card,
- /obj/item/clothing/mask/cigarette,
/obj/item/flashlight/pen,
/obj/item/seeds,
- /obj/item/stack/medical,
/obj/item/toy/crayon,
/obj/item/coin,
/obj/item/dice,
/obj/item/disk,
- /obj/item/implanter,
/obj/item/lighter,
+ /obj/item/key/ship,
+ /obj/item/gun/ballistic/derringer,
/obj/item/lipstick,
/obj/item/match,
/obj/item/paper,
/obj/item/pen,
/obj/item/photo,
- /obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/syringe,
- /obj/item/screwdriver,
- /obj/item/stamp),
- list(/obj/item/screwdriver/power))
+ /obj/item/stamp))
/obj/item/storage/wallet/Exited(atom/movable/AM)
. = ..()
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index b8f4451a966..117a6fedb84 100644
--- a/code/game/objects/items/tanks/jetpack.dm
+++ b/code/game/objects/items/tanks/jetpack.dm
@@ -11,7 +11,7 @@
var/gas_type = GAS_O2
var/on = FALSE
var/stabilizers = FALSE
- var/full_speed = TRUE // If the jetpack will have a speedboost in space/nograv or not
+ var/full_speed = TRUE // Whether damage slowdown will affect the jetpack
var/datum/effect_system/trail_follow/ion/ion_trail
/obj/item/tank/jetpack/Initialize()
@@ -28,7 +28,7 @@
if(gas_type)
air_contents.set_moles(gas_type, ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)))
-/obj/item/tank/jetpack/ui_action_click(mob/user, action)
+/obj/item/tank/jetpack/ui_action_click(mob/living/user, action)
if(istype(action, /datum/action/item_action/toggle_jetpack))
cycle(user)
else if(istype(action, /datum/action/item_action/jetpack_stabilization))
@@ -39,7 +39,7 @@
toggle_internals(user)
-/obj/item/tank/jetpack/proc/cycle(mob/user)
+/obj/item/tank/jetpack/proc/cycle(mob/living/user)
if(user.incapacitated())
return
@@ -54,7 +54,7 @@
A.UpdateButtonIcon()
-/obj/item/tank/jetpack/proc/turn_on(mob/user)
+/obj/item/tank/jetpack/proc/turn_on(mob/living/user)
if(!allow_thrust(0.01, user))
return
on = TRUE
@@ -63,18 +63,18 @@
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(move_react))
RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(pre_move_react))
if(full_speed)
- user.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
+ user.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown_flying)
-/obj/item/tank/jetpack/proc/turn_off(mob/user)
+/obj/item/tank/jetpack/proc/turn_off(mob/living/user)
on = FALSE
stabilizers = FALSE
icon_state = initial(icon_state)
ion_trail.stop()
UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
UnregisterSignal(user, COMSIG_MOVABLE_PRE_MOVE)
- user.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
+ user.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown_flying)
-/obj/item/tank/jetpack/proc/move_react(mob/user)
+/obj/item/tank/jetpack/proc/move_react(mob/living/user)
if(!on)//If jet dont work, it dont work
return
if(!user)//Don't allow jet self using
@@ -90,7 +90,7 @@
if(length(user.client.keys_held & user.client.movement_keys))//You use jet when press keys. yes.
allow_thrust(0.01, user)
-/obj/item/tank/jetpack/proc/pre_move_react(mob/user)
+/obj/item/tank/jetpack/proc/pre_move_react(mob/living/user)
ion_trail.oldposition = get_turf(src)
/obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user)
@@ -110,7 +110,7 @@
item_state = "jetpack-sec"
volume = 20 //normal jetpacks have 70 volume
gas_type = null //it starts empty
- full_speed = FALSE //moves at hardsuit jetpack speeds
+ full_speed = FALSE // affected by damage slowdown
/obj/item/tank/jetpack/improvised/allow_thrust(num, mob/living/user)
if(rand(0,250) == 0)
@@ -173,7 +173,7 @@
/obj/item/tank/jetpack/suit
name = "hardsuit jetpack upgrade"
desc = "A modular, compact set of thrusters designed to integrate with a hardsuit. It is fueled by a tank inserted into the suit's storage compartment."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "jetpack_upgrade"
item_state = "jetpack-black"
w_class = WEIGHT_CLASS_NORMAL
@@ -181,7 +181,6 @@
volume = 1
slot_flags = null
gas_type = null
- full_speed = FALSE
custom_price = 2000
var/datum/gas_mixture/temp_air_contents
var/obj/item/tank/internals/tank = null
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index aff73626906..c45911f98f4 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -110,17 +110,6 @@
. += "It feels [descriptive]."
-/obj/item/tank/blob_act(obj/structure/blob/B)
- if(B && B.loc == loc)
- var/turf/location = get_turf(src)
- if(!location)
- qdel(src)
-
- if(air_contents)
- location.assume_air(air_contents)
-
- qdel(src)
-
/obj/item/tank/deconstruct(disassembled = TRUE)
if(!disassembled)
var/turf/T = get_turf(src)
diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index 4095d159ea8..23fe0852c35 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -175,6 +175,39 @@
amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
to_chat(user, "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")
+//radiation cleanup pack
+
+/obj/item/watertank/anti_rad
+ name = "radiation foam pack"
+ desc = "A pressurized backpack tank with sprayer nozzle, intended to clean up radioactive hazards."
+ item_state = "waterbackpackatmos"
+ icon_state = "waterbackpackatmos"
+ volume = 200
+ slowdown = 0.3
+
+/obj/item/watertank/anti_rad/Initialize()
+ . = ..()
+ reagents.add_reagent(/datum/reagent/anti_radiation_foam, 200)
+
+
+/obj/item/reagent_containers/spray/mister/anti_rad
+ name = "spray nozzle"
+ desc = "A heavy duty nozzle attached to a radiation foam tank."
+ icon_state = "atmos_nozzle"
+ item_state = "nozzleatmos"
+ amount_per_transfer_from_this = 5
+ possible_transfer_amounts = list()
+ current_range = 6
+ spray_range = 6
+
+
+/obj/item/watertank/anti_rad/make_noz()
+ return new /obj/item/reagent_containers/spray/mister/anti_rad(src)
+
+/obj/item/reagent_containers/spray/mister/anti_rad/attack_self(mob/user)
+ amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
+ to_chat(user, "You [amount_per_transfer_from_this == 10 ? "tigten" : "loosen"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")
+
//ATMOS FIRE FIGHTING BACKPACK
#define EXTINGUISHER 0
@@ -377,7 +410,7 @@
//Todo : cache these.
/obj/item/reagent_containers/chemtank/worn_overlays(isinhands = FALSE) //apply chemcolor and level
- . = list()
+ . = ..()
//inhands + reagent_filling
if(!isinhands && reagents.total_volume)
var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "backpackmob-10")
diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm
index fd9b3859cd3..5b9da6611bd 100644
--- a/code/game/objects/items/theft_tools.dm
+++ b/code/game/objects/items/theft_tools.dm
@@ -80,12 +80,8 @@
//snowflake screwdriver, works as a key to start nuke theft, traitor only
/obj/item/screwdriver/nuke
- name = "screwdriver"
- desc = "A screwdriver with an ultra thin tip that's carefully designed to boost screwing speed."
-// icon = 'icons/obj/nuke_tools.dmi' WS edit - better tool sprites
icon_state = "screwdriver_nuke"
item_state = "screwdriver_nuke"
- toolspeed = 0.5
random_color = FALSE
/obj/item/paper/guides/antag/nuke_instructions
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index 26509776dd1..c53fb57a8bd 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -117,10 +117,7 @@
toolspeed = 0.5
/obj/item/crowbar/syndie
- name = "suspicious-looking crowbar"
- desc = "It has special counterweights that adjust to the amount of pressure put on it by using a complex array of springs and screws."
icon_state = "crowbar_syndie"
- toolspeed = 0.5
force = 8
/obj/item/crowbar/old
diff --git a/code/game/objects/items/tools/electric_weldingtool.dm b/code/game/objects/items/tools/electric_weldingtool.dm
new file mode 100644
index 00000000000..3611d8ffcd9
--- /dev/null
+++ b/code/game/objects/items/tools/electric_weldingtool.dm
@@ -0,0 +1,84 @@
+/obj/item/weldingtool/electric
+ name = "electrical welding tool"
+ desc = "A welding tool capable of welding functionality through the use of electricity."
+ icon_state = "elwelder"
+ light_power = 1
+ light_color = LIGHT_COLOR_HALOGEN
+ tool_behaviour = NONE
+ toolspeed = 0.5 //twice as fast, but doesn't require welding fuel
+ power_use_amount = POWER_CELL_USE_LOW
+ change_icons = FALSE //we don't use fuel
+ var/cell_override = /obj/item/stock_parts/cell/high
+ var/powered = FALSE
+ max_fuel = 20 //uses fuel anyways like a boss
+
+/obj/item/weldingtool/electric/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/cell, cell_override, CALLBACK(src, PROC_REF(switched_off)))
+
+/obj/item/weldingtool/electric/attack_self(mob/user, modifiers)
+ . = ..()
+ if(!powered)
+ if(!(item_use_power(power_use_amount, user, TRUE) & COMPONENT_POWER_SUCCESS))
+ return
+ powered = !powered
+ playsound(src, 'sound/effects/sparks4.ogg', 100, TRUE)
+
+ if(powered)
+ to_chat(user, span_notice("You turn [src] on."))
+ switched_on()
+ return
+
+ to_chat(user, span_notice("You turn [src] off."))
+ switched_off()
+
+/obj/item/weldingtool/electric/switched_on(mob/user)
+ welding = TRUE
+ tool_behaviour = TOOL_WELDER
+ light_on = TRUE
+ force = 15
+ damtype = BURN
+ hitsound = 'sound/items/welder.ogg'
+ set_light_on(powered)
+ update_appearance()
+ START_PROCESSING(SSobj, src)
+
+/obj/item/weldingtool/electric/switched_off(mob/user)
+ powered = FALSE
+ welding = FALSE
+ light_on = FALSE
+ force = initial(force)
+ damtype = BRUTE
+ set_light_on(powered)
+ tool_behaviour = NONE
+ update_appearance()
+ STOP_PROCESSING(SSobj, src)
+
+/obj/item/weldingtool/electric/process(seconds_per_tick)
+ if(!powered)
+ switched_off()
+ return
+
+ if(!(item_use_power(power_use_amount) & COMPONENT_POWER_SUCCESS))
+ switched_off()
+ return
+
+/obj/item/weldingtool/electric/examine(mob/user)
+ . = ..()
+ //Overwrite the last entry, which normally shows welder fuel usage
+ .[length(.)] = "[src] is currently [powered ? "powered" : "unpowered"]."
+
+// This is what uses fuel in the parent. We override it here to not use fuel
+/obj/item/weldingtool/electric/use(used = 0)
+ return isOn()
+
+/obj/item/weldingtool/electric/examine()
+ . = ..()
+ . += "[src] is currently [powered ? "powered" : "unpowered"]."
+
+/obj/item/weldingtool/electric/update_icon_state()
+ if(powered)
+ mob_overlay_icon = "[initial(mob_overlay_icon)]1"
+ else
+ mob_overlay_icon = "[initial(mob_overlay_icon)]"
+ return ..()
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index 3e4ab0d15de..7c35ddd67d6 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -53,7 +53,7 @@
. += base_overlay
/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file)
- . = list()
+ . = ..()
if(isinhands && random_color)
var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head")
M.appearance_flags = RESET_COLOR
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index c792af38486..fcccb13b4b2 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -39,6 +39,7 @@
var/acti_sound = 'sound/items/welderactivate.ogg'
var/deac_sound = 'sound/items/welderdeactivate.ogg'
var/start_full = TRUE
+ wall_decon_damage = 50
/obj/item/weldingtool/empty
start_full = FALSE
@@ -96,8 +97,6 @@
/obj/item/weldingtool/attackby(obj/item/I, mob/user, params)
if(I.tool_behaviour == TOOL_SCREWDRIVER)
flamethrower_screwdriver(I, user)
- else if(istype(I, /obj/item/stack/rods))
- flamethrower_rods(I, user)
else
. = ..()
update_appearance()
@@ -281,24 +280,10 @@
to_chat(user, "You resecure [src] and close the fuel tank.")
reagents.flags &= ~(OPENCONTAINER)
else
- to_chat(user, "[src] can now be attached, modified, and refuelled.")
+ to_chat(user, "[src] can now be refuelled.")
reagents.flags |= OPENCONTAINER
add_fingerprint(user)
-/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user)
- if(!status)
- var/obj/item/stack/rods/R = I
- if (R.use(1))
- var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc)
- if(!remove_item_from_storage(F))
- user.transferItemToLoc(src, F, TRUE)
- F.weldtool = src
- add_fingerprint(user)
- to_chat(user, "You add a rod to a welder, starting to build a flamethrower.")
- user.put_in_hands(F)
- else
- to_chat(user, "You need one rod to start building a flamethrower!")
-
/obj/item/weldingtool/ignition_effect(atom/A, mob/user)
if(use_tool(A, user, 0, amount=1))
return "[user] casually lights [A] with [src], what a badass."
@@ -348,6 +333,7 @@
light_system = NO_LIGHT_SUPPORT
light_range = 0
change_icons = 0
+ wall_decon_damage = 500
/obj/item/weldingtool/abductor/process()
if(get_fuel() <= max_fuel)
@@ -365,28 +351,6 @@
/obj/item/weldingtool/hugetank/empty
start_full = FALSE
-/obj/item/weldingtool/experimental
- name = "experimental welding tool"
- desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
- icon_state = "exwelder"
- item_state = "exwelder"
- max_fuel = 40
- custom_materials = list(/datum/material/iron=70, /datum/material/glass=120)
- /*WS Begin - Better Tool sprites
- change_icons = 0
- WS End */
- can_off_process = 1
- light_range = 1
- toolspeed = 0.5
- var/last_gen = 0
- var/nextrefueltick = 0
-
-/obj/item/weldingtool/experimental/process()
- ..()
- if(get_fuel() < max_fuel && nextrefueltick < world.time)
- nextrefueltick = world.time + 10
- reagents.add_reagent(/datum/reagent/fuel, 1)
-
/obj/item/weldingtool/old
desc = "A standard edition welder provided by Nanotrasen. This one seems to leak a little bit."
icon = 'icons/obj/tools.dmi'
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index e2dfc9a81dc..383cbd02739 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -85,10 +85,7 @@
random_color = FALSE
/obj/item/wirecutters/syndie
- name = "suspicious-looking wirecutters"
- desc = "The blades of these wirecutters have suspiciously fine serrated teeth."
icon_state = "cutters_syndie"
- toolspeed = 0.5
random_color = FALSE
/obj/item/wirecutters/old
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index 3e9898d8750..b6b99c7c828 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -95,10 +95,7 @@
return ..()
/obj/item/wrench/syndie
- name = "suspicious-looking wrench"
- desc = "It's one of those fancy wrenches that you turn backward without twisting the bolt for faster action."
icon_state = "wrench_syndie"
- toolspeed = 0.5
/obj/item/wrench/crescent
name = "crescent wrench"
diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm
index 2a821c7a831..738cfa83c0f 100644
--- a/code/game/objects/items/toy_mechs.dm
+++ b/code/game/objects/items/toy_mechs.dm
@@ -535,10 +535,10 @@
special_attack_type = SPECIAL_ATTACK_DAMAGE
special_attack_cry = "ROCKET BARRAGE"
-/obj/item/toy/prize/mauler
- name = "toy Mauler"
+/obj/item/toy/prize/touro
+ name = "toy Touro"
desc = "9/13"
- icon_state = "maulertoy"
+ icon_state = "tourotoy"
max_combat_health = 7 //500 integrity
special_attack_type = SPECIAL_ATTACK_DAMAGE
special_attack_cry = "BULLET STORM"
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index b1dfb479b66..84601407f64 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -187,8 +187,8 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "revolver"
item_state = "gun"
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ lefthand_file = GUN_LEFTHAND_ICON
+ righthand_file = GUN_RIGHTHAND_ICON
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_NORMAL
@@ -245,9 +245,9 @@
/obj/item/toy/ammo/gun
name = "capgun ammo"
desc = "Make sure to recyle the box in an autolathe when it gets empty."
- icon = 'icons/obj/ammo.dmi'
+ icon = 'icons/obj/ammunition/ammo.dmi'
icon_state = "357OLD-7"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=10, /datum/material/glass=10)
var/amount_left = 7
@@ -265,7 +265,7 @@
/obj/item/toy/sword
name = "toy sword"
desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
- icon = 'icons/obj/transforming_energy.dmi'
+ icon = 'icons/obj/weapon/energy.dmi'
icon_state = "sword"
item_state = "sword"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -296,7 +296,7 @@
w_class = WEIGHT_CLASS_SMALL
add_fingerprint(user)
-// Copied from /obj/item/melee/transforming/energy/sword/attackby
+// Copied from /obj/item/melee/energy/sword/attackby
/obj/item/toy/sword/attackby(obj/item/W, mob/living/user, params)
if(istype(W, /obj/item/toy/sword))
if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP))
@@ -348,7 +348,7 @@
lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
var/active = FALSE
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
hitsound = 'sound/weapons/smash.ogg'
attack_verb = list("robusted")
@@ -407,7 +407,7 @@
/obj/item/toy/katana
name = "replica katana"
desc = "Woefully underpowered in D20."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/weapon/sword.dmi'
icon_state = "katana"
item_state = "katana"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -542,31 +542,6 @@
/obj/item/toy/talking/AI/generate_messages()
return list(generate_ion_law())
-/obj/item/toy/talking/codex_gigas
- name = "Toy Codex Gigas"
- desc = "A tool to help you write fictional devils!"
- icon = 'icons/obj/library.dmi'
- icon_state = "demonomicon"
- lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
- w_class = WEIGHT_CLASS_SMALL
- recharge_time = 60
-
-/obj/item/toy/talking/codex_gigas/activation_message(mob/user)
- user.visible_message(
- "[user] presses the button on \the [src].",
- "You press the button on \the [src].",
- "You hear a soft click.")
-
-/obj/item/toy/talking/codex_gigas/generate_messages()
- var/datum/fakeDevil/devil = new
- var/list/messages = list()
- messages += "Some fun facts about: [devil.truename]"
- messages += "[GLOB.lawlorify[LORE][devil.obligation]]"
- messages += "[GLOB.lawlorify[LORE][devil.ban]]"
- messages += "[GLOB.lawlorify[LORE][devil.banish]]"
- return messages
-
/obj/item/toy/talking/owl
name = "owl action figure"
desc = "An action figure modeled after 'The Owl', defender of justice."
@@ -1041,7 +1016,8 @@
desc = "A compact ball of snow. Good for throwing at people."
icon = 'icons/obj/toy.dmi'
icon_state = "snowball"
- throwforce = 12 //pelt your enemies to death with lumps of snow
+ throwforce = 1 //pelt your enemies to death with lumps of snow
+ var/stam_dam = 8
/obj/item/toy/snowball/afterattack(atom/target as mob|obj|turf|area, mob/user)
. = ..()
@@ -1050,6 +1026,10 @@
/obj/item/toy/snowball/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(!..())
+ var/caught = hit_atom.hitby(src, FALSE, FALSE, throwingdatum=throwingdatum)
+ if(ishuman(hit_atom) && !caught)//if they are a carbon and they didn't catch it
+ var/mob/living/carbon/human/dorkass = hit_atom
+ dorkass.apply_damage(stam_dam, STAMINA)
playsound(src, 'sound/effects/pop.ogg', 20, TRUE)
qdel(src)
@@ -1285,7 +1265,6 @@
/obj/item/toy/figure/curator
name = "Curator action figure"
icon_state = "curator"
- toysay = "One day while..."
/obj/item/toy/figure/md
name = "Medical Doctor action figure"
@@ -1418,7 +1397,7 @@
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
icon_state = "shell[rand(1,3)]"
- color = pickweight(possible_colors)
+ color = pick_weight(possible_colors)
setDir(pick(GLOB.cardinals))
/obj/item/toy/brokenradio
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index bdcb89796bc..cc67c679578 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -8,11 +8,8 @@
resistance_flags = FLAMMABLE
/obj/item/trash/Initialize(mapload)
- SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
- return ..()
-
-/obj/item/trash/Destroy()
- SSblackbox.record_feedback("tally", "station_mess_destroyed", 1, name)
+ if(!mapload)
+ SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
return ..()
/obj/item/trash/raisins
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
deleted file mode 100644
index 865ca17e7d5..00000000000
--- a/code/game/objects/items/weaponry.dm
+++ /dev/null
@@ -1,788 +0,0 @@
-/obj/item/banhammer
- desc = "A banhammer."
- name = "banhammer"
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "toyhammer"
- slot_flags = ITEM_SLOT_BELT
- throwforce = 0
- force = 1
- w_class = WEIGHT_CLASS_TINY
- throw_speed = 3
- throw_range = 7
- attack_verb = list("banned")
- max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
- resistance_flags = FIRE_PROOF
-
-/*
-oranges says: This is a meme relating to the english translation of the ss13 russian wiki page on lurkmore.
-mrdoombringer sez: and remember kids, if you try and PR a fix for this item's grammar, you are admitting that you are, indeed, a newfriend.
-for further reading, please see: https://github.com/tgstation/tgstation/pull/30173 and https://translate.google.com/translate?sl=auto&tl=en&js=y&prev=_t&hl=en&ie=UTF-8&u=%2F%2Flurkmore.to%2FSS13&edit-text=&act=url
-*/
-/obj/item/banhammer/attack(mob/M, mob/user)
- if(user.zone_selected == BODY_ZONE_HEAD)
- M.visible_message("[user] is stroking the head of [M] with a banhammer.", "[user] is stroking your head with a banhammer.", "You hear a banhammer stroking a head.")
- else
- M.visible_message("[M] has been banned FOR NO REISIN by [user]!", "You have been banned FOR NO REISIN by [user]!", "You hear a banhammer banning someone.")
- playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much
- if(user.a_intent != INTENT_HELP)
- return ..(M, user)
-
-/obj/item/sord
- name = "\improper SORD"
- desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
- icon_state = "sord"
- item_state = "sord"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- slot_flags = ITEM_SLOT_BELT
- force = 2
- throwforce = 1
- w_class = WEIGHT_CLASS_NORMAL
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-
-/obj/item/claymore
- name = "claymore"
- desc = "What are you standing around staring at this for? Get to killing!"
- icon_state = "claymore"
- item_state = "claymore"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- pickup_sound = 'sound/items/handling/knife2_pickup.ogg'
- drop_sound = 'sound/items/handling/metal_drop.ogg'
- hitsound = 'sound/weapons/bladeslice.ogg'
- flags_1 = CONDUCT_1
- slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
- force = 40
- throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- block_chance = 40
- sharpness = IS_SHARP
- max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
- resistance_flags = FIRE_PROOF
-
-/obj/item/claymore/Initialize()
- . = ..()
- AddComponent(/datum/component/butchering, 40, 105)
-
-/obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS
- desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim."
- flags_1 = CONDUCT_1
- item_flags = DROPDEL //WOW BRO YOU LOST AN ARM, GUESS WHAT YOU DONT GET YOUR SWORD ANYMORE //I CANT BELIEVE SPOOKYDONUT WOULD BREAK THE REQUIREMENTS
- slot_flags = null
- block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY
- light_range = 3
- attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS
- var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE
- var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK
-
-/obj/item/claymore/highlander/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER)
- START_PROCESSING(SSobj, src)
-
-/obj/item/claymore/highlander/Destroy()
- if(nuke_disk)
- nuke_disk.forceMove(get_turf(src))
- nuke_disk.visible_message("The nuke disk is vulnerable!")
- nuke_disk = null
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/item/claymore/highlander/process()
- if(ishuman(loc))
- var/mob/living/carbon/human/H = loc
- loc.layer = LARGE_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS)
- H.bleedsuppress = TRUE //AND WE WON'T BLEED OUT LIKE COWARDS
- else
- if(!(flags_1 & ADMIN_SPAWNED_1))
- qdel(src)
-
-
-/obj/item/claymore/highlander/pickup(mob/living/user)
- . = ..()
- to_chat(user, "The power of Scotland protects you! You are shielded from all stuns and knockdowns.")
- user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!")
- user.ignore_slowdown(HIGHLANDER)
-
-/obj/item/claymore/highlander/dropped(mob/living/user)
- . = ..()
- user.unignore_slowdown(HIGHLANDER)
-
-/obj/item/claymore/highlander/examine(mob/user)
- . = ..()
- . += "It has [!notches ? "nothing" : "[notches] notches"] scratched into the blade."
- if(nuke_disk)
- . += "It's holding the nuke disk!"
-
-/obj/item/claymore/highlander/attack(mob/living/target, mob/living/user)
- . = ..()
- if(!QDELETED(target) && iscarbon(target) && target.stat == DEAD && target.mind && target.mind.special_role == "highlander")
- user.fully_heal(admin_revive = FALSE) //STEAL THE LIFE OF OUR FALLEN FOES
- add_notch(user)
- target.visible_message("[target] crumbles to dust beneath [user]'s blows!", "As you fall, your body crumbles to dust!")
- target.dust()
-
-/obj/item/claymore/highlander/attack_self(mob/living/user)
- var/closest_victim
- var/closest_distance = 255
- for(var/mob/living/carbon/human/H in GLOB.player_list - user)
- if(H.mind.special_role == "highlander" && (!closest_victim || get_dist(user, closest_victim) < closest_distance))
- closest_victim = H
- if(!closest_victim)
- to_chat(user, "[src] thrums for a moment and falls dark. Perhaps there's nobody nearby.")
- return
- to_chat(user, "[src] thrums and points to the [dir2text(get_dir(user, closest_victim))].")
-
-/obj/item/claymore/highlander/IsReflect()
- return 1 //YOU THINK YOUR PUNY LASERS CAN STOP ME?
-
-/obj/item/claymore/highlander/proc/add_notch(mob/living/user) //DYNAMIC CLAYMORE PROGRESSION SYSTEM - THIS IS THE FUTURE
- notches++
- force++
- var/new_name = name
- switch(notches)
- if(1)
- to_chat(user, "Your first kill - hopefully one of many. You scratch a notch into [src]'s blade.")
- to_chat(user, "You feel your fallen foe's soul entering your blade, restoring your wounds!")
- new_name = "notched claymore"
- if(2)
- to_chat(user, "Another falls before you. Another soul fuses with your own. Another notch in the blade.")
- new_name = "double-notched claymore"
- add_atom_colour(rgb(255, 235, 235), ADMIN_COLOUR_PRIORITY)
- if(3)
- to_chat(user, "You're beginning torelish the thrill of battle.")
- new_name = "triple-notched claymore"
- add_atom_colour(rgb(255, 215, 215), ADMIN_COLOUR_PRIORITY)
- if(4)
- to_chat(user, "You've lost count ofhow many you've killed.")
- new_name = "many-notched claymore"
- add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY)
- if(5)
- to_chat(user, "Five voices now echo in your mind, cheering the slaughter.")
- new_name = "battle-tested claymore"
- add_atom_colour(rgb(255, 175, 175), ADMIN_COLOUR_PRIORITY)
- if(6)
- to_chat(user, "Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe.")
- new_name = "battle-scarred claymore"
- add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY)
- if(7)
- to_chat(user, "Kill. Butcher. Conquer.")
- new_name = "vicious claymore"
- add_atom_colour(rgb(255, 135, 135), ADMIN_COLOUR_PRIORITY)
- if(8)
- to_chat(user, "IT NEVER GETS OLD. THE SCREAMING. THE BLOOD AS IT SPRAYS ACROSS YOUR FACE.")
- new_name = "bloodthirsty claymore"
- add_atom_colour(rgb(255, 115, 115), ADMIN_COLOUR_PRIORITY)
- if(9)
- to_chat(user, "ANOTHER ONE FALLS TO YOUR BLOWS. ANOTHER WEAKLING UNFIT TO LIVE.")
- new_name = "gore-stained claymore"
- add_atom_colour(rgb(255, 95, 95), ADMIN_COLOUR_PRIORITY)
- if(10)
- user.visible_message("[user]'s eyes light up with a vengeful fire!", \
- "YOU FEEL THE POWER OF VALHALLA FLOWING THROUGH YOU! THERE CAN BE ONLY ONE!!!")
- user.update_icons()
- new_name = "GORE-DRENCHED CLAYMORE OF [pick("THE WHIMSICAL SLAUGHTER", "A THOUSAND SLAUGHTERED CATTLE", "GLORY AND VALHALLA", "ANNIHILATION", "OBLITERATION")]"
- icon_state = "claymore_gold"
- item_state = "cultblade"
- remove_atom_colour(ADMIN_COLOUR_PRIORITY)
-
- name = new_name
- playsound(user, 'sound/items/screwdriver2.ogg', 50, TRUE)
-
-/obj/item/katana
- name = "katana"
- desc = "Woefully underpowered in D20."
- icon_state = "katana"
- item_state = "katana"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- pickup_sound = 'sound/items/handling/knife2_pickup.ogg'
- drop_sound = 'sound/items/handling/metal_drop.ogg'
- flags_1 = CONDUCT_1
- slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
- force = 40
- throwforce = 10
- w_class = WEIGHT_CLASS_HUGE
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- block_chance = 10
- sharpness = IS_SHARP
- max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
- resistance_flags = FIRE_PROOF
- supports_variations = VOX_VARIATION
-
-/obj/item/katana/cursed
- name = "ominous katana"
- desc = "A japanese single-edged blade, once used to contain an ancient evil. The being within is grateful for being released, but beware: generosity has a price."
- icon_state = "ominous_katana"
- item_state = "ominous_katana"
- icon = 'icons/obj/lavaland/artefacts.dmi'
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- force = 35
- armour_penetration = 30
- max_integrity = 500
- resistance_flags = FIRE_PROOF | ACID_PROOF
- var/essence = 0//Used for blade abilities, mainly heals(If I can safely implement this I will nerf the damage slightly, and boost the selfdam)
- var/list/nemesis_factions = list("mining", "boss")
- var/faction_bonus_force = 25
-
-
-/obj/item/katana/cursed/examine(mob/user)
- . = ..()
- . += "To cut into the flesh of your target with this weapon is to feed the gluttonous emptiness within. Burn the blood of your enemies to replenish your own spent essence."
-
-/obj/item/katana/cursed/attack(mob/living/target, mob/living/user)
- . = ..()
- if(isliving(target) && target.stat != DEAD)
- essence += rand(15, 20)
-
-/obj/item/katana/cursed/attack(mob/living/target, mob/living/carbon/human/user)
- var/nemesis_faction = FALSE
- if(LAZYLEN(nemesis_factions))
- for(var/F in target.faction)
- if(F in nemesis_factions)
- nemesis_faction = TRUE
- force += faction_bonus_force
- nemesis_effects(user, target)
- break
- . = ..()
- if(nemesis_faction)
- force -= faction_bonus_force
-
-/obj/item/katana/cursed/proc/nemesis_effects(mob/living/user, mob/living/target)
- return
-
-/obj/item/katana/cursed/attack(mob/target, mob/living/carbon/human/user)
- if(user.mind && user.owns_soul())
- to_chat(user, "You feel a terrible chill as the emptiness within [src] devours on your life force!")
- user.apply_damage(rand(2,3), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_PRECISE_GROIN))
- user.apply_damage(rand(2,3), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_PRECISE_GROIN))
- user.apply_damage(rand(2,3), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_PRECISE_GROIN))
- user.apply_damage(rand(2,3), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_PRECISE_GROIN))
- ..()
-
-/obj/item/wirerod
- name = "wired rod"
- desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit."
- icon_state = "wiredrod"
- item_state = "rods"
- flags_1 = CONDUCT_1
- force = 9
- throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
- custom_materials = list(/datum/material/iron=1150, /datum/material/glass=75)
- attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
-
-/obj/item/wirerod/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/shard))
- var/obj/item/spear/S = new /obj/item/spear
-
- remove_item_from_storage(user)
- if (!user.transferItemToLoc(I, S))
- return
- S.CheckParts(list(I))
- qdel(src)
-
- user.put_in_hands(S)
- to_chat(user, "You fasten the glass shard to the top of the rod with the cable.")
-
- else if(istype(I, /obj/item/assembly/igniter) && !(HAS_TRAIT(I, TRAIT_NODROP)))
- var/obj/item/melee/baton/cattleprod/P = new /obj/item/melee/baton/cattleprod
-
- remove_item_from_storage(user)
-
- to_chat(user, "You fasten [I] to the top of the rod with the cable.")
-
- qdel(I)
- qdel(src)
-
- user.put_in_hands(P)
- else
- return ..()
-
-
-/obj/item/throwing_star
- name = "throwing star"
- desc = "An ancient weapon still used to this day, due to its ease of lodging itself into its victim's body parts."
- icon_state = "throwingstar"
- item_state = "eshield0"
- lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
- force = 2
- throwforce = 20 //20 + 2 (WEIGHT_CLASS_SMALL) * 4 (EMBEDDED_IMPACT_PAIN_MULTIPLIER) = 28 damage on hit due to guaranteed embedding
- throw_speed = 4
- embedding = list("pain_mult" = 4, "embed_chance" = 100, "fall_chance" = 0, "embed_chance_turf_mod" = 15)
- armour_penetration = 40
-
- w_class = WEIGHT_CLASS_SMALL
- sharpness = IS_SHARP
- custom_materials = list(/datum/material/iron=500, /datum/material/glass=500)
- resistance_flags = FIRE_PROOF
-
-/obj/item/throwing_star/stamina
- name = "shock throwing star"
- desc = "An aerodynamic disc designed to cause excruciating pain when stuck inside fleeing targets, hopefully without causing fatal harm."
- throwforce = 5
- embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 0.8, "jostle_pain_mult" = 3)
-
-/obj/item/throwing_star/toy
- name = "toy throwing star"
- desc = "An aerodynamic disc strapped with adhesive for sticking to people, good for playing pranks and getting yourself killed by security."
- sharpness = IS_BLUNT
- force = 0
- throwforce = 0
- embedding = list("pain_mult" = 0, "jostle_pain_mult" = 0, "embed_chance" = 100, "fall_chance" = 0)
-
-/obj/item/throwing_star/magspear
- name = "magnetic spear"
- desc = "A reusable spear that is typically loaded into kinetic spearguns."
- icon = 'icons/obj/ammo_bullets.dmi'
- icon_state = "magspear"
- throwforce = 25 //kills regular carps in one hit
- force = 10
- throw_range = 0 //throwing these invalidates the speargun
- attack_verb = list("stabbed", "ripped", "gored", "impaled")
- embedding = list("pain_mult" = 8, "embed_chance" = 100, "fall_chance" = 0, "impact_pain_mult" = 15) //55 damage+embed on hit
-
-/obj/item/phone
- name = "red phone"
- desc = "Should anything ever go wrong..."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "red_phone"
- force = 3
- throwforce = 2
- throw_speed = 3
- throw_range = 4
- w_class = WEIGHT_CLASS_SMALL
- attack_verb = list("called", "rang")
- hitsound = 'sound/weapons/ring.ogg'
-
-
-/obj/item/cane
- name = "cane"
- desc = "A cane used by a true gentleman. Or a clown."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "cane"
- item_state = "stick"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- force = 5
- throwforce = 5
- w_class = WEIGHT_CLASS_SMALL
- custom_materials = list(/datum/material/iron=50)
- attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
-
-/obj/item/staff
- name = "wizard staff"
- desc = "Apparently a staff used by the wizard."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "staff"
- lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
- force = 3
- throwforce = 5
- throw_speed = 2
- throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
- armour_penetration = 100
- attack_verb = list("bludgeoned", "whacked", "disciplined")
- resistance_flags = FLAMMABLE
-
-/obj/item/staff/broom
- name = "broom"
- desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "broom"
- resistance_flags = FLAMMABLE
-
-/obj/item/staff/stick
- name = "stick"
- desc = "A great tool to drag someone else's drinks across the bar."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "cane"
- item_state = "stick"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- force = 3
- throwforce = 5
- throw_speed = 2
- throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/ectoplasm
- name = "ectoplasm"
- desc = "Spooky."
- gender = PLURAL
- icon = 'icons/obj/wizard.dmi'
- icon_state = "ectoplasm"
-
-
-/obj/item/ectoplasm/angelic
- icon = 'icons/obj/wizard.dmi'
- icon_state = "angelplasm"
-
-/obj/item/mounted_chainsaw
- name = "mounted chainsaw"
- desc = "A chainsaw that has replaced your arm."
- icon_state = "chainsaw_on"
- item_state = "mounted_chainsaw"
- lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
- item_flags = ABSTRACT | DROPDEL
- w_class = WEIGHT_CLASS_HUGE
- force = 24
- throwforce = 0
- throw_range = 0
- throw_speed = 0
- sharpness = IS_SHARP
- attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
- hitsound = 'sound/weapons/chainsawhit.ogg'
- tool_behaviour = TOOL_SAW
- toolspeed = 1
-
-/obj/item/mounted_chainsaw/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
-
-/obj/item/mounted_chainsaw/Destroy()
- var/obj/item/bodypart/part
- new /obj/item/chainsaw(get_turf(src))
- if(iscarbon(loc))
- var/mob/living/carbon/holder = loc
- var/index = holder.get_held_index_of_item(src)
- if(index)
- part = holder.hand_bodyparts[index]
- . = ..()
- if(part)
- part.drop_limb()
-
-/obj/item/statuebust
- name = "bust"
- desc = "A priceless ancient marble bust, the kind that belongs in a museum." //or you can hit people with it
- icon = 'icons/obj/statue.dmi'
- icon_state = "bust"
- force = 15
- throwforce = 10
- throw_speed = 5
- throw_range = 2
- attack_verb = list("busted")
- var/impressiveness = 45
-
-/obj/item/statuebust/Initialize()
- . = ..()
- AddComponent(/datum/component/art, impressiveness)
- AddElement(/datum/element/beauty, 1000)
-
-/obj/item/statuebust/hippocratic
- name = "hippocrates bust"
- desc = "A bust of the famous Greek physician Hippocrates of Kos, often referred to as the father of western medicine."
- icon_state = "hippocratic"
- impressiveness = 50
-
-/obj/item/melee/skateboard
- name = "improvised skateboard"
- desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon."
- icon_state = "skateboard"
- item_state = "skateboard"
- force = 12
- throwforce = 4
- w_class = WEIGHT_CLASS_NORMAL
- attack_verb = list("smacked", "whacked", "slammed", "smashed")
- ///The vehicle counterpart for the board
- var/board_item_type = /obj/vehicle/ridden/scooter/skateboard
-
-/obj/item/melee/skateboard/attack_self(mob/user)
- var/obj/vehicle/ridden/scooter/skateboard/S = new board_item_type(get_turf(user))//this probably has fucky interactions with telekinesis but for the record it wasnt my fault
- S.buckle_mob(user)
- qdel(src)
-
-/obj/item/melee/skateboard/pro
- name = "skateboard"
- desc = "A RaDSTORMz brand professional skateboard. It looks sturdy and well made."
- icon_state = "skateboard2"
- item_state = "skateboard2"
- board_item_type = /obj/vehicle/ridden/scooter/skateboard/pro
- custom_premium_price = 500
-
-/obj/item/melee/skateboard/hoverboard
- name = "hoverboard"
- desc = "A blast from the past, so retro!"
- icon_state = "hoverboard_red"
- item_state = "hoverboard_red"
- board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard
- custom_premium_price = 2015
-
-/obj/item/melee/skateboard/hoverboard/admin
- name = "\improper Board Of Directors"
- desc = "The engineering complexity of a spaceship concentrated inside of a board. Just as expensive, too."
- icon_state = "hoverboard_nt"
- item_state = "hoverboard_nt"
- board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard/admin
-
-/obj/item/melee/baseball_bat
- name = "baseball bat"
- desc = "There ain't a skull in the league that can withstand a swatter."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "baseball_bat"
- item_state = "baseball_bat"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- force = 12
- throwforce = 12
- attack_verb = list("beat", "smacked")
- custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 3.5)
- w_class = WEIGHT_CLASS_HUGE
- var/homerun_ready = 0
- var/homerun_able = 0
-
-/obj/item/melee/baseball_bat/homerun
- name = "home run bat"
- desc = "This thing looks dangerous... Dangerously good at baseball, that is."
- homerun_able = 1
-
-/obj/item/melee/baseball_bat/attack_self(mob/user)
- if(!homerun_able)
- ..()
- return
- if(homerun_ready)
- to_chat(user, "You're already ready to do a home run!")
- ..()
- return
- to_chat(user, "You begin gathering strength...")
- playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, TRUE)
- if(do_after(user, 90, target = src))
- to_chat(user, "You gather power! Time for a home run!")
- homerun_ready = 1
- ..()
-
-/obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user)
- . = ..()
- var/atom/throw_target = get_edge_target_turf(target, user.dir)
- if(homerun_ready)
- user.visible_message("It's a home run!")
- target.throw_at(throw_target, rand(8,10), 14, user)
- SSexplosions.medturf += throw_target
- playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, TRUE)
- homerun_ready = 0
- return
- else if(!target.anchored)
- target.throw_at(throw_target, rand(1,2), 2, user, gentle = TRUE)
-
-/obj/item/melee/baseball_bat/ablative
- name = "metal baseball bat"
- desc = "This bat is made of highly reflective, highly armored material."
- icon_state = "baseball_bat_metal"
- item_state = "baseball_bat_metal"
- force = 12
- throwforce = 15
-
-/obj/item/melee/baseball_bat/bone
- name = "bone club"
- desc = "A long and hard shaft of rock solid bone." // I am the master of comedy
- icon_state = "baseball_bat_bone"
- item_state = "baseball_bat_bone"
-
-/obj/item/melee/baseball_bat/ablative/IsReflect()//some day this will reflect thrown items instead of lasers
- var/picksound = rand(1,2)
- var/turf = get_turf(src)
- if(picksound == 1)
- playsound(turf, 'sound/weapons/effects/batreflect1.ogg', 50, TRUE)
- if(picksound == 2)
- playsound(turf, 'sound/weapons/effects/batreflect2.ogg', 50, TRUE)
- return 1
-
-/obj/item/melee/flyswatter
- name = "flyswatter"
- desc = "Useful for killing insects of all sizes."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "flyswatter"
- item_state = "flyswatter"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- force = 1
- throwforce = 1
- attack_verb = list("swatted", "smacked")
- hitsound = 'sound/effects/snap.ogg'
- w_class = WEIGHT_CLASS_SMALL
- //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc.
- var/list/strong_against
-
-/obj/item/melee/flyswatter/Initialize()
- . = ..()
- strong_against = typecacheof(list(
- /mob/living/simple_animal/hostile/poison/bees/,
- /mob/living/simple_animal/butterfly,
- /mob/living/simple_animal/hostile/cockroach,
- /obj/item/queen_bee
- ))
-
-
-/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)
- . = ..()
- if(proximity_flag)
- if(is_type_in_typecache(target, strong_against))
- new /obj/effect/decal/cleanable/insectguts(target.drop_location())
- to_chat(user, "You easily splat the [target].")
- if(istype(target, /mob/living/))
- var/mob/living/bug = target
- bug.death(1)
- else
- qdel(target)
-
-/obj/item/proc/can_trigger_gun(mob/living/user)
- if(!user.can_use_guns(src))
- return FALSE
- return TRUE
-
-/obj/item/extendohand
- name = "extendo-hand"
- desc = "Futuristic tech has allowed these classic spring-boxing toys to essentially act as a fully functional hand-operated hand prosthetic."
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "extendohand"
- item_state = "extendohand"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- force = 0
- throwforce = 5
- reach = 2
- var/min_reach = 2
-
-/obj/item/extendohand/acme
- name = "\improper ACME Extendo-Hand"
- desc = "A novelty extendo-hand produced by the ACME corporation. Originally designed to knock out roadrunners."
-
-/obj/item/extendohand/attack(atom/M, mob/living/carbon/human/user)
- var/dist = get_dist(M, user)
- if(dist < min_reach)
- to_chat(user, "[M] is too close to use [src] on.")
- return
- M.attack_hand(user)
-
-/obj/item/gohei
- name = "gohei"
- desc = "A wooden stick with white streamers at the end. Originally used by shrine maidens to purify things. Now used by the station's valued weeaboos."
- force = 5
- throwforce = 5
- hitsound = "swing_hit"
- attack_verb = list("whacked", "thwacked", "walloped", "socked")
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "gohei"
- item_state = "gohei"
- lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
-
-//HF blade
-/obj/item/vibro_weapon
- icon_state = "hfrequency0"
- base_icon_state = "hfrequency"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- name = "vibro sword"
- desc = "A potent weapon capable of cutting through nearly anything. Wielding it in two hands will allow you to deflect gunfire."
- armour_penetration = 100
- block_chance = 30
- force = 20
- throwforce = 20
- throw_speed = 4
- sharpness = IS_SHARP
- attack_verb = list("cut", "sliced", "diced")
- w_class = WEIGHT_CLASS_BULKY
- slot_flags = ITEM_SLOT_BACK
- hitsound = 'sound/weapons/bladeslice.ogg'
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/vibro_weapon/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
-
-/obj/item/vibro_weapon/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/butchering, 20, 105)
- AddComponent(/datum/component/two_handed, force_multiplier=2, icon_wielded="[base_icon_state]1")
-
-/// triggered on wield of two handed item
-/obj/item/vibro_weapon/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/vibro_weapon/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
-/obj/item/vibro_weapon/update_icon_state()
- icon_state = "[base_icon_state]0"
- return ..()
-
-/obj/item/vibro_weapon/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(wielded)
- final_block_chance *= 2
- if(wielded || attack_type != PROJECTILE_ATTACK)
- if(prob(final_block_chance))
- if(attack_type == PROJECTILE_ATTACK)
- owner.visible_message("[owner] deflects [attack_text] with [src]!")
- playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)
- return 1
- else
- owner.visible_message("[owner] parries [attack_text] with [src]!")
- return 1
- return 0
-
-/obj/item/legion_staff
- icon_state = "legion_staff"
- lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
- name = "legionnaire staff"
- desc = "The remnants of a legionnaire, reconstructed around a pole of bone. The skulls it produces are loyal to the wielder, seeming to recognize them as their host body."
- icon = 'icons/obj/guns/magic.dmi'
- block_chance = 20
- force = 20
- throwforce = 10
- throw_speed = 4
- attack_verb = list("bit", "gnawed", "chomped")
- w_class = WEIGHT_CLASS_NORMAL
- slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT
- hitsound = 'sound/weapons/bite.ogg'
- var/next_use_time
-
-/obj/item/legion_staff/attack_self(mob/user)
- if(next_use_time > world.time)
- user.visible_message("[src] rattles in [user]'s hands, but nothing happens...")
- to_chat(user, "You need to wait longer to use this again.")
- return
- user.visible_message("[user] raises the [src] and summons a legion skull!")
- for(var/i in 1 to 3)
- var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/staff/LegionSkull = new /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/staff(user.loc)
- LegionSkull.faction = user.faction.Copy()
- LegionSkull.friends += user
- next_use_time = world.time + 6 SECONDS
-
-/obj/item/claymore/bone
- name = "Bone Sword"
- desc = "Jagged pieces of bone are tied to what looks like a goliaths femur."
- icon_state = "bone_sword"
- item_state = "bone_sword"
- icon = 'icons/obj/items_and_weapons.dmi'
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- mob_overlay_icon = 'icons/mob/clothing/back.dmi'
- force = 15
- throwforce = 10
- armour_penetration = 15
-
-
-/obj/item/vibro_weapon/weak
- armour_penetration = 10
- block_chance = 10
- force = 15
- throwforce = 20
-
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 78cfa10a2e0..363a83d965a 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -24,11 +24,8 @@
/obj/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0)
if(damage_flag == "melee" && damage_amount < damage_deflection)
return 0
- switch(damage_type)
- if(BRUTE)
- if(BURN)
- else
- return 0
+ if(damage_type != BRUTE && damage_type != BURN)
+ return 0
var/armor_protection = 0
if(damage_flag)
armor_protection = armor.getRating(damage_flag)
@@ -90,13 +87,6 @@
take_damage(hulk_damage(), BRUTE, "melee", 0, get_dir(src, user))
return TRUE
-/obj/blob_act(obj/structure/blob/B)
- if(isturf(loc))
- var/turf/T = loc
- if(T.intact && HAS_TRAIT(src, TRAIT_T_RAY_VISIBLE))
- return
- take_damage(400, BRUTE, "melee", 0, get_dir(src, B))
-
/obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime
user.do_attack_animation(src)
user.changeNext_move(CLICK_CD_MELEE)
@@ -210,6 +200,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
take_damage(clamp(0.02 * exposed_temperature, 0, 20), BURN, "fire", 0)
if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF))
resistance_flags |= ON_FIRE
+ burning_particles = new(src, /particles/smoke/burning)
SSfire_burning.processing[src] = src
update_appearance()
return 1
@@ -226,6 +217,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
if(resistance_flags & ON_FIRE)
resistance_flags &= ~ON_FIRE
update_appearance()
+ QDEL_NULL(burning_particles)
SSfire_burning.processing -= src
///Called when the obj is hit by a tesla bolt.
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index d4ad3f0e679..0391de85eb3 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -43,6 +43,8 @@
vis_flags = VIS_INHERIT_PLANE //when this be added to vis_contents of something it inherit something.plane, important for visualisation of obj in openspace.
+ var/obj/effect/abstract/particle_holder/burning_particles
+
FASTDMM_PROP(\
pinned_vars = list("name", "dir")\
)
@@ -82,7 +84,9 @@
if(!ismachinery(src))
STOP_PROCESSING(SSobj, src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists
SStgui.close_uis(src)
- . = ..()
+ if(burning_particles)
+ QDEL_NULL(burning_particles)
+ return ..()
/obj/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE)
diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm
index f59e29dd3b9..dba1c510767 100644
--- a/code/game/objects/structures/ai_core.dm
+++ b/code/game/objects/structures/ai_core.dm
@@ -61,8 +61,6 @@
return FALSE
var/turf/T = get_turf(src)
var/area/A = get_area(src)
- if(!(A.area_flags & BLOBS_ALLOWED))
- return FALSE
if(!A.power_equip)
return FALSE
if(!T.virtual_level_trait(ZTRAIT_STATION))
@@ -222,7 +220,6 @@
to_chat(user, "You connect the monitor.")
if(brain)
var/mob/living/brain/B = brain.brainmob
- SSticker.mode.remove_antag_for_borging(B.mind)
var/mob/living/silicon/ai/A = null
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index 15cbb9481f3..4cd16c93444 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -224,7 +224,7 @@
custom_materials = null
flags_1 = 0
icon_state = "frame-empty"
- result_path = /obj/structure/sign/painting
+ result_path = /obj/structure/sign/painting/library
/obj/structure/sign/painting
name = "Painting"
@@ -241,8 +241,8 @@
if(dir)
setDir(dir)
if(building)
- pixel_x = (dir & 3)? 0 : (dir == 4 ? -30 : 30)
- pixel_y = (dir & 3)? (dir ==1 ? -30 : 30) : 0
+ pixel_x = (dir & 3)? 0 : (dir == 4 ? 30 : -30)
+ pixel_y = (dir & 3)? (dir ==1 ? 30 : -30) : 0
//The painting is being loaded by the maploader and SSpersistence has already run. Load a painting ourselves.
if(mapload && SSpersistence.initialized)
load_persistent()
diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm
index 4f132b11af9..ecc050aa8f7 100644
--- a/code/game/objects/structures/beds_chairs/alien_nest.dm
+++ b/code/game/objects/structures/beds_chairs/alien_nest.dm
@@ -14,6 +14,7 @@
buildstacktype = null
flags_1 = NODECONSTRUCT_1
bolts = FALSE
+ swap_lying_with_dir = FALSE
var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/alien.dmi', "nestoverlay", LYING_MOB_LAYER)
/obj/structure/bed/nest/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user)
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 6c5f46e94a3..533f58bdf2a 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -18,10 +18,44 @@
resistance_flags = FLAMMABLE
max_integrity = 100
integrity_failure = 0.35
+
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 2
var/bolts = TRUE
+ /// Whether the bed changes its buckle_lying direction
+ /// (and accordingly the direction in which mobs lie down) based on its current direction.
+ var/swap_lying_with_dir = TRUE
+ /// If non-null, some items (bedsheets) which can be tucked into beds
+ /// will set their layer to this value when they are tucked in, until they are picked up again.
+ var/suggested_tuck_layer = null
+ /// The amount added to the pixel_x value of a tucked-in item.
+ var/tucked_x_shift = 0
+ /// The amount added to the pixel_y value of a tucked-in item.
+ var/tucked_y_shift = 0
+
+/obj/structure/bed/Initialize(...)
+ . = ..()
+ if(swap_lying_with_dir)
+ buckle_lying = get_buckle_angle_from_dir(dir)
+
+/obj/structure/bed/setDir(newdir)
+ . = ..()
+ if(swap_lying_with_dir)
+ buckle_lying = get_buckle_angle_from_dir(newdir)
+ // shuttle rotation etc... ugh.
+ if(has_buckled_mobs())
+ for(var/mob/living/M as anything in buckled_mobs)
+ // this proc already checks to see if the new angle is different from the old one,
+ // so this shouldn't cause any duplicate work or unnecessary animations.
+ M.set_lying_angle(buckle_lying)
+
+/obj/structure/bed/proc/get_buckle_angle_from_dir(some_dir)
+ if(some_dir & (SOUTH|WEST))
+ return 90
+ else
+ return 270
+
/obj/structure/bed/examine(mob/user)
. = ..()
if(bolts)
@@ -37,7 +71,7 @@
return attack_hand(user)
/obj/structure/bed/attackby(obj/item/W, mob/user, params)
- if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
+ if((W.tool_behaviour == TOOL_WRENCH || W.tool_behaviour == TOOL_DECONSTRUCT) && !(flags_1&NODECONSTRUCT_1))
W.play_tool_sound(src)
deconstruct(TRUE)
else
@@ -52,6 +86,9 @@
icon_state = "down"
anchored = FALSE
resistance_flags = NONE
+
+ // no dir states
+ swap_lying_with_dir = FALSE
var/foldabletype = /obj/item/roller
/obj/structure/bed/roller/attackby(obj/item/W, mob/user, params)
@@ -161,8 +198,9 @@
else
to_chat(user, "The dock is empty!")
-//Dog bed
-
+/*
+ * "Dog" beds
+ */
/obj/structure/bed/dogbed
name = "dog bed"
icon_state = "dogbed"
@@ -170,6 +208,9 @@
anchored = TRUE
buildstacktype = /obj/item/stack/sheet/mineral/wood
buildstackamount = 10
+
+ // no dir states
+ swap_lying_with_dir = FALSE
var/mob/living/owner = null
/obj/structure/bed/dogbed/ian
@@ -206,7 +247,9 @@
. = ..()
update_owner(M)
-//Double Beds, for luxurious sleeping, i.e. the captain and maybe heads - no quirky refrence here. Move along
+/*
+ * Double beds, for luxurious sleeping, i.e. the captain and maybe heads - no quirky refrence here. Move along
+ */
/obj/structure/bed/double
name = "double bed"
desc = "A luxurious double bed, for those too important for small dreams."
@@ -232,3 +275,84 @@
name = "double dirty mattress"
desc = "An old grubby king sized mattress. You really try to not think about what could be the cause of those stains."
icon_state = "dirty_mattress_double"
+
+/*
+ * Bunk beds. Comes with an /obj/effect spawner that lets mappers place them down easily.
+ * The base type is the bottom bunk, with the top bunk as a derived type.
+ * Like other beds, the pillow may be on the left or right depending on the direction.
+ */
+/obj/structure/bed/bunk
+ name = "bottom bunk"
+ desc = "The oft-maligned bottom bunk of a compact bunk bed. Heavy sleepers only."
+ icon_state = "bottom_bunk"
+ // just below the top bunk's main layer
+ suggested_tuck_layer = LYING_MOB_LAYER + 0.005
+ /// The amount added to the pixel_y value of mobs lying down, relative to the default shift for that position.
+ var/mob_y_shift = -1
+ // i think it looks best without shifting the bedsheet down, even though the mob gets shifted down some
+
+// alter their pixel offset when they lie down...
+/obj/structure/bed/bunk/post_buckle_mob(mob/living/M)
+ // we shift the lying mob a little so that they line up better with the pillow, but the shift direction changes
+ // depending on the direction they lie down in, controlled by buckle_lying
+ // (which is in turn based on our direction, but we don't need to worry about that directly)
+ var/horz_offset
+ if(buckle_lying == 90)
+ horz_offset = 2
+ else
+ horz_offset = -2
+
+ M.pixel_x = M.get_standard_pixel_x_offset(M.body_position == LYING_DOWN) + horz_offset
+ M.pixel_y = M.get_standard_pixel_y_offset(M.body_position == LYING_DOWN) + mob_y_shift
+
+// ...and reset it when they get off
+/obj/structure/bed/bunk/post_unbuckle_mob(mob/living/M)
+ M.pixel_x = M.get_standard_pixel_x_offset(M.body_position == LYING_DOWN)
+ M.pixel_y = M.get_standard_pixel_y_offset(M.body_position == LYING_DOWN)
+
+
+/obj/structure/bed/bunk/top
+ name = "top bunk"
+ desc = "The top bunk of a compact bunk bed. Few other sleeping accommodations can match its luxury."
+ icon_state = "top_bunk"
+
+ // higher layer, so that it renders on top of people on the bottom bunk
+ layer = LYING_MOB_LAYER + 0.01
+ mob_y_shift = 13
+
+ // above the lying mob, but below the ladder
+ suggested_tuck_layer = LYING_MOB_LAYER + 0.025
+ tucked_y_shift = 14
+
+/obj/structure/bed/bunk/top/Initialize(...)
+ . = ..()
+ // the ladder needs to render above the mob
+ overlays += image(icon = 'icons/obj/objects.dmi', icon_state = "top_bunk_ladder", layer = LYING_MOB_LAYER + 0.03)
+ // and the posts need to render below the bottom bunk
+ overlays += image(icon = 'icons/obj/objects.dmi', icon_state = "top_bunk_posts", layer = TABLE_LAYER)
+
+/obj/structure/bed/bunk/top/post_buckle_mob(mob/living/M)
+ . = ..()
+ M.layer = LYING_MOB_LAYER + 0.02
+
+/obj/structure/bed/bunk/top/post_unbuckle_mob(mob/living/M)
+ . = ..()
+ // honestly not really confident in this, but since standing up takes a do_after
+ // (and thus happens afterwards, resetting the layer), it should be fine...
+ // i'm more worried about altering layers via + and -, since if you figured out ways
+ // of stacking those you could layer yourself under, like, the floor.
+ M.layer = LYING_MOB_LAYER
+
+
+// the spawner
+/obj/effect/spawner/bunk_bed
+ name = "bunk bed spawner"
+ icon_state = "bunk_bed_spawner"
+
+/obj/effect/spawner/bunk_bed/Initialize(...)
+ . = ..()
+ var/obj/structure/bed/bunk/bottom_bunk = new(loc)
+ var/obj/structure/bed/bunk/top/top_bunk = new(loc)
+
+ bottom_bunk.setDir(dir)
+ top_bunk.setDir(dir)
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 045bf39ae9b..40e0d938851 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -60,7 +60,7 @@
qdel(src)
/obj/structure/chair/attackby(obj/item/W, mob/user, params)
- if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
+ if((W.tool_behaviour == TOOL_WRENCH || W.tool_behaviour == TOOL_DECONSTRUCT) && !(flags_1&NODECONSTRUCT_1))
W.play_tool_sound(src)
deconstruct()
else if(istype(W, /obj/item/assembly/shock_kit))
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index d57e31ce951..19aabed4994 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -17,7 +17,7 @@ LINEN BINS
throwforce = 0
throw_speed = 1
throw_range = 2
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
dying_key = DYE_REGISTRY_BEDSHEET
greyscale_icon_state = "bedsheet"
@@ -28,7 +28,7 @@ LINEN BINS
/obj/item/bedsheet/Initialize(mapload)
. = ..()
- AddElement(/datum/element/bed_tuckable, 0, 0, 0)
+ AddElement(/datum/element/bed_tuckable, 0, 0, 0, TRUE, TRUE)
/obj/item/bedsheet/attack_self(mob/user)
if(!user.CanReach(src)) //No telekenetic grabbing.
@@ -132,7 +132,7 @@ LINEN BINS
desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day."
icon_state = "sheetrd"
item_state = "sheetrd"
- dream_messages = list("authority", "a silvery ID", "a bomb", "a mech", "a facehugger", "maniacal laughter", "the research director")
+ dream_messages = list("authority", "a silvery ID", "a bomb", "an exosuit", "a facehugger", "maniacal laughter", "the research director")
/obj/item/bedsheet/medical
name = "medical blanket"
@@ -209,7 +209,7 @@ LINEN BINS
/obj/item/bedsheet/cult
name = "cultist's bedsheet"
- desc = "You might dream of Nar'Sie if you sleep with this. It seems rather tattered and glows of an eldritch presence."
+ desc = "You might dream of elder gods if you sleep with this. It seems rather tattered."
icon_state = "sheetcult"
item_state = "sheetcult"
dream_messages = list("a tome", "a floating red crystal", "a glowing sword", "a bloody symbol", "a massive humanoid figure")
@@ -353,7 +353,7 @@ LINEN BINS
name = "double research director's bedsheet"
icon_state = "double_sheetrd"
item_state = "sheetrd"
- dream_messages = list("authority", "a silvery ID", "a bomb", "a mech", "a facehugger", "maniacal laughter", "the research director")
+ dream_messages = list("authority", "a silvery ID", "a bomb", "an exosuit", "a facehugger", "maniacal laughter", "the research director")
desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day."
/obj/item/bedsheet/double/solgov
@@ -383,7 +383,7 @@ LINEN BINS
/obj/item/bedsheet/dorms/Initialize()
..()
- var/type = pickweight(list("Colors" = 80, "Special" = 20))
+ var/type = pick_weight(list("Colors" = 80, "Special" = 20))
switch(type)
if("Colors")
type = pick(list(/obj/item/bedsheet,
@@ -408,7 +408,7 @@ LINEN BINS
/obj/item/bedsheet/dorms/double/Initialize()
..()
- var/type = pickweight(list("Colors" = 80, "Special" = 20))
+ var/type = pick_weight(list("Colors" = 80, "Special" = 20))
switch(type)
if("Colors")
type = pick(list(/obj/item/bedsheet/double,
diff --git a/code/game/objects/structures/cabinet.dm b/code/game/objects/structures/cabinet.dm
new file mode 100644
index 00000000000..bc89cf1d0bb
--- /dev/null
+++ b/code/game/objects/structures/cabinet.dm
@@ -0,0 +1,214 @@
+/obj/structure/cabinet
+ name = "\improper cabinet"
+ desc = "There is a small label that reads \"For Emergency use only\". Yeah right."
+ icon = 'icons/obj/wallmounts.dmi'
+ icon_state = "fireaxe"
+ anchored = TRUE
+ density = FALSE
+ armor = list("melee" = 50, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
+ max_integrity = 150
+ integrity_failure = 0.33
+ req_one_access_txt = "0"
+ var/locked = TRUE
+ var/open = FALSE
+ var/start_empty = FALSE
+ var/obj/item/stored
+ var/allowed_type
+ var/stored_sprite = "axe"
+
+/obj/structure/cabinet/Initialize()
+ . = ..()
+ if(allowed_type && !start_empty)
+ stored = new allowed_type(src)
+ update_appearance()
+
+/obj/structure/cabinet/Destroy()
+ if(istype(stored))
+ qdel(stored)
+ stored = null
+ return ..()
+
+/obj/structure/cabinet/examine(mob/user)
+ . = ..()
+ if(!open)
+ . += span_notice("Alt-click to [locked ? "unlock" : "lock"] [src]")
+ if(stored)
+ . += span_notice("[stored] is sitting inside, ripe for the taking.")
+
+/obj/structure/cabinet/attackby(obj/item/I, mob/user, params)
+ if(iscyborg(user) || I.tool_behaviour == TOOL_MULTITOOL)
+ hack_lock(user)
+ else if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP && !broken)
+ if(obj_integrity < max_integrity)
+ if(!I.tool_start_check(user, amount=2))
+ return
+ to_chat(user, span_notice("You begin repairing [src]"))
+ if(I.use_tool(src, user, 40, volume=50, amount=2))
+ obj_integrity = max_integrity
+ update_appearance()
+ to_chat(user, span_notice("You repair [src]"))
+ else
+ to_chat(user, span_warning("[src] is already in good condition!"))
+ return
+ else if(istype(I, /obj/item/stack/sheet/glass) && broken)
+ var/obj/item/stack/sheet/glass/G = I
+ if(G.get_amount() < 2)
+ to_chat(user, span_warning("You need two [G.singular_name] to fix [src]!"))
+ return
+ to_chat(user, span_notice("You start fixing [src]..."))
+ if(do_after(user, 20, target = src) && G.use(2))
+ broken = 0
+ obj_integrity = max_integrity
+ update_appearance()
+ else if(open || broken)
+ if(istype(I, allowed_type) && !stored)
+ var/obj/item/storee = I
+ SIGNAL_HANDLER
+ if(storee && HAS_TRAIT(storee, TRAIT_WIELDED))
+ to_chat(user, span_warning("Unwield the [storee.name] first."))
+ return
+ if(!user.transferItemToLoc(I, src))
+ return
+ stored = storee
+ to_chat(user, span_notice("You place the [storee.name] back in the [name]."))
+ update_appearance()
+ return
+ else if(!broken)
+ toggle_open()
+ else
+ return ..()
+
+/obj/structure/cabinet/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ switch(damage_type)
+ if(BRUTE)
+ if(broken)
+ playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 90, TRUE)
+ else
+ playsound(loc, 'sound/effects/glasshit.ogg', 90, TRUE)
+ if(BURN)
+ playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
+
+/obj/structure/cabinet/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
+ if(open)
+ return
+ . = ..()
+ if(.)
+ update_appearance()
+
+/obj/structure/cabinet/obj_break(damage_flag)
+ if(!broken && !(flags_1 & NODECONSTRUCT_1))
+ update_appearance()
+ broken = TRUE
+ playsound(src, 'sound/effects/glassbr3.ogg', 100, TRUE)
+ new /obj/item/shard(loc)
+ new /obj/item/shard(loc)
+
+/obj/structure/cabinet/deconstruct(disassembled = TRUE)
+ if(!(flags_1 & NODECONSTRUCT_1))
+ if(stored && loc)
+ stored.forceMove(loc)
+ stored = null
+ new /obj/item/stack/sheet/metal(loc, 2)
+ qdel(src)
+
+/obj/structure/cabinet/attack_hand(mob/user)
+ . = ..()
+ if(.)
+ return
+ if(open || broken)
+ if(stored)
+ to_chat(user, span_notice("You take [stored] from [name]."))
+ user.put_in_hands(stored)
+ stored = null
+ src.add_fingerprint(user)
+ update_appearance()
+ return
+ if(locked)
+ to_chat(user, span_warning("[name] won't budge!"))
+ return
+ else
+ open = !open
+ update_appearance()
+ return
+
+/obj/structure/cabinet/attack_paw(mob/living/user)
+ return attack_hand(user)
+
+/obj/structure/cabinet/attack_ai(mob/user)
+ toggle_lock(user)
+ return
+
+/obj/structure/cabinet/attack_tk(mob/user)
+ if(locked)
+ to_chat(user, span_warning("[name] won't budge!"))
+ return
+ else
+ open = !open
+ update_appearance()
+ return
+
+/obj/structure/cabinet/update_overlays()
+ . = ..()
+ if(stored)
+ . += "[stored_sprite]"
+ if(open)
+ . += "glass_raised"
+ return
+ var/hp_percent = obj_integrity/max_integrity * 100
+ if(broken)
+ . += "glass4"
+ else
+ switch(hp_percent)
+ if(-INFINITY to 40)
+ . += "glass3"
+ if(40 to 60)
+ . += "glass2"
+ if(60 to 80)
+ . += "glass1"
+ if(80 to INFINITY)
+ . += "glass"
+
+ . += locked ? "locked" : "unlocked"
+
+/obj/structure/cabinet/proc/toggle_lock(mob/user)
+ if(!broken)
+ if(allowed(user))
+ if(iscarbon(user))
+ add_fingerprint(user)
+ locked = !locked
+ user.visible_message(
+ span_notice("[user] [locked ? "locks" : "unlocks"][src]."),
+ span_notice("You [locked ? "lock" : "unlock"] [src]."))
+ update_appearance()
+ else
+ to_chat(user, span_warning("Access denied!"))
+ else if(broken)
+ to_chat(user, span_warning("\The [src] is broken!"))
+
+/obj/structure/cabinet/AltClick(mob/user)
+ ..()
+ if(!user.canUseTopic(src, BE_CLOSE) || !isturf(loc) || open)
+ return
+ else
+ toggle_lock(user)
+
+/obj/structure/cabinet/proc/hack_lock(mob/user)
+ to_chat(user, span_notice("Resetting circuitry..."))
+ playsound(src, 'sound/machines/locktoggle.ogg', 50, TRUE)
+ if(do_after(user, 20, target = src))
+ to_chat(user, span_notice("You [locked ? "disable" : "re-enable"] the locking modules."))
+ locked = !locked
+ update_appearance()
+
+/obj/structure/cabinet/verb/toggle_open()
+ set name = "Open/Close"
+ set category = "Object"
+ set src in oview(1)
+
+ if(locked)
+ visible_message(span_warning("[name] won't budge!"))
+ return
+ else
+ open = !open
+ update_appearance()
+ return
diff --git a/code/game/objects/structures/cabinet_types.dm b/code/game/objects/structures/cabinet_types.dm
new file mode 100644
index 00000000000..c64356ac4db
--- /dev/null
+++ b/code/game/objects/structures/cabinet_types.dm
@@ -0,0 +1,16 @@
+/obj/structure/cabinet/fireaxe
+ name = "\improper fire axe cabinet"
+ desc = "There is a small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
+ icon = 'icons/obj/wallmounts.dmi'
+ icon_state = "fireaxe"
+ stored_sprite = "axe"
+ allowed_type = /obj/item/melee/axe/fire
+ req_one_access_txt = "24"
+
+/obj/structure/cabinet/oneshot
+ name = "\improper rocket launcher cabinet"
+ desc = "There is a small label that reads \"For Emergency use only\" along with a small drawing of how to operate the launcher."
+ icon_state = "rpg"
+ stored_sprite = "launcher"
+ allowed_type = /obj/item/gun/ballistic/rocketlauncher/oneshot
+ req_one_access_txt = "3"
diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm
index 20986f9e6c2..2202e84d70e 100644
--- a/code/game/objects/structures/catwalk.dm
+++ b/code/game/objects/structures/catwalk.dm
@@ -57,7 +57,7 @@
. += "The supporting rods look like they could be welded."
/obj/structure/catwalk/attackby(obj/item/C, mob/user, params)
- if(C.tool_behaviour == TOOL_WELDER && !(resistance_flags & INDESTRUCTIBLE))
+ if((C.tool_behaviour == TOOL_WELDER || C.tool_behaviour == TOOL_DECONSTRUCT) && !(resistance_flags & INDESTRUCTIBLE))
to_chat(user, "You slice off [src]")
deconstruct()
return
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 714129498e4..cd1c880eae7 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -27,7 +27,8 @@
var/max_mob_size = MOB_SIZE_HUMAN //Biggest mob_size accepted by the container
var/mob_storage_capacity = 3 // how many human sized mob/living can fit together inside a closet.
var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
- var/cutting_tool = /obj/item/weldingtool
+ // defaults to welder if null
+ var/cutting_tool = TOOL_WELDER
var/open_sound = 'sound/machines/closet_open.ogg'
var/close_sound = 'sound/machines/closet_close.ogg'
var/open_sound_volume = 35
@@ -254,34 +255,43 @@
if(user in src)
return
if(src.tool_interact(W,user))
- return 1 // No afterattack
+ return TRUE // No afterattack
else
return ..()
+/obj/structure/closet/proc/try_deconstruct(obj/item/W, mob/user)
+ if(W.tool_behaviour == cutting_tool || W.tool_behaviour == TOOL_DECONSTRUCT)
+ if(!W.tool_start_check(user, amount = 0))
+ return
+ to_chat(user, span_notice("You begin cutting \the [src] apart..."))
+ if(W.use_tool(src, user, 40, volume = 50))
+ if(!opened)
+ return
+ user.visible_message(span_notice("[user] slices apart \the [src]."),
+ span_notice("You cut \the [src] apart with \the [W]."),
+ span_hear("You hear welding."))
+ deconstruct(TRUE)
+ return TRUE
+
/obj/structure/closet/proc/tool_interact(obj/item/W, mob/user)//returns TRUE if attackBy call shouldnt be continued (because tool was used/closet was of wrong type), FALSE if otherwise
. = TRUE
if(opened)
- if(istype(W, cutting_tool))
- if(W.tool_behaviour == TOOL_WELDER)
- if(!W.tool_start_check(user, amount=0))
- return
-
- to_chat(user, "You begin cutting \the [src] apart...")
- if(W.use_tool(src, user, 40, volume=50))
- if(!opened)
- return
- user.visible_message("[user] slices apart \the [src].",
- "You cut \the [src] apart with \the [W].",
- "You hear welding.")
- deconstruct(TRUE)
+ if(W.tool_behaviour == cutting_tool && user.a_intent != INTENT_HELP)
+ if(!W.tool_start_check(user, amount=0))
return
- else // for example cardboard box is cut with wirecutters
- user.visible_message("[user] cut apart \the [src].", \
- "You cut \the [src] apart with \the [W].")
+
+ to_chat(user, "You begin cutting \the [src] apart...")
+ if(W.use_tool(src, user, 40, volume=50))
+ if(!opened)
+ return
+ user.visible_message("[user] slices apart \the [src].",
+ "You cut \the [src] apart with \the [W].",
+ "You hear cutting.")
deconstruct(TRUE)
- return
+ return
if(user.transferItemToLoc(W, drop_location())) // so we put in unlit welder too
return
+ return
else if(W.tool_behaviour == TOOL_WELDER && can_weld_shut)
if(!W.tool_start_check(user, amount=0))
return
@@ -304,6 +314,13 @@
user.visible_message("[user] [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.", \
"You [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.", \
"You hear a ratchet.")
+
+ else if(W.tool_behaviour == TOOL_DECONSTRUCT && locked)
+ user.visible_message("[user] is cutting \the [src] open !", "You begin to cut \the [src] open.")
+ if (W.use_tool(src, user, 10 SECONDS, volume=0))
+ bust_open()
+ user.visible_message("[user] busted \the [src] open !", "You finish cutting \the [src] open.")
+
else if(user.a_intent != INTENT_HARM)
var/item_is_id = W.GetID()
if(!item_is_id)
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index a5d7531b0aa..b0674a2d2b6 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -8,7 +8,7 @@
max_integrity = 70
integrity_failure = 0
can_weld_shut = 0
- cutting_tool = /obj/item/wirecutters
+ cutting_tool = TOOL_WIRECUTTER
material_drop = /obj/item/stack/sheet/cardboard
delivery_icon = "deliverybox"
anchorable = FALSE
@@ -20,6 +20,13 @@
var/move_delay = FALSE
var/egged = 0
+/obj/structure/closet/cardboard/try_deconstruct(obj/item/W, mob/user)
+ if(W.tool_behaviour == cutting_tool)
+ user.visible_message(span_notice("[user] cut apart \the [src]."), \
+ span_notice("You cut \the [src] apart with \the [W]."))
+ deconstruct(TRUE)
+ return TRUE
+
/obj/structure/closet/cardboard/relaymove(mob/living/user, direction)
if(opened || move_delay || user.incapacitated() || !isturf(loc) || !has_gravity(loc))
return
@@ -70,7 +77,7 @@
mob_storage_capacity = 5
resistance_flags = NONE
move_speed_multiplier = 2
- cutting_tool = /obj/item/weldingtool
+ cutting_tool = TOOL_WELDER
open_sound = 'sound/machines/crate_open.ogg'
close_sound = 'sound/machines/crate_close.ogg'
open_sound_volume = 35
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index cfea37148e5..626640f5a60 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -14,7 +14,6 @@
desc = "It looks alien!"
icon_state = "alien"
-
/obj/structure/closet/gimmick
name = "administrative supply closet"
desc = "It's a storage unit for things that have no right being here."
@@ -56,7 +55,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/suit/armor/tdome/red(src)
for(var/i in 1 to 3)
- new /obj/item/melee/transforming/energy/sword/saber(src)
+ new /obj/item/melee/energy/sword/saber(src)
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser(src)
for(var/i in 1 to 3)
@@ -75,7 +74,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/suit/armor/tdome/green(src)
for(var/i in 1 to 3)
- new /obj/item/melee/transforming/energy/sword/saber(src)
+ new /obj/item/melee/energy/sword/saber(src)
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser(src)
for(var/i in 1 to 3)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index dac919bb428..6e7de98b21d 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -98,14 +98,9 @@
icon_door = "black"
/obj/structure/closet/wardrobe/chaplain_black/PopulateContents()
- new /obj/item/storage/box/holy(src)
new /obj/item/clothing/accessory/pocketprotector/cosmetology(src)
new /obj/item/clothing/under/rank/civilian/chaplain(src)
new /obj/item/clothing/shoes/sneakers/black(src)
- new /obj/item/clothing/suit/chaplainsuit/nun(src)
- new /obj/item/clothing/head/nun_hood(src)
- new /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit(src)
- new /obj/item/clothing/suit/chaplainsuit/holidaypriest(src)
new /obj/item/storage/backpack/cultpack(src)
new /obj/item/storage/fancy/candle_box(src)
new /obj/item/storage/fancy/candle_box(src)
@@ -250,8 +245,7 @@
/obj/item/clothing/under/rank/medical/geneticist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
- /obj/item/storage/backpack/genetics = 2,
- /obj/item/storage/backpack/satchel/gen = 2)
+ /obj/item/storage/backpack/genetics = 2)
generate_items_inside(items_inside,src)
return
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 0e7ab6e0a52..2bdc4f762dc 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -33,9 +33,9 @@
/obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()
..()
for(var/i = 0, i < 3, i++)
- new /obj/item/reagent_containers/food/condiment/flour(src)
- new /obj/item/reagent_containers/food/condiment/rice(src)
- new /obj/item/reagent_containers/food/condiment/sugar(src)
+ new /obj/item/reagent_containers/condiment/flour(src)
+ new /obj/item/reagent_containers/condiment/rice(src)
+ new /obj/item/reagent_containers/condiment/sugar(src)
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance
name = "maintenance refrigerator"
@@ -45,9 +45,9 @@
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents()
..()
for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/milk(src)
+ new /obj/item/reagent_containers/condiment/milk(src)
for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/soymilk(src)
+ new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/storage/fancy/egg_box(src)
@@ -82,9 +82,9 @@
/obj/structure/closet/secure_closet/freezer/fridge/PopulateContents()
..()
for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/milk(src)
+ new /obj/item/reagent_containers/condiment/milk(src)
for(var/i = 0, i < 5, i++)
- new /obj/item/reagent_containers/food/condiment/soymilk(src)
+ new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/storage/fancy/egg_box(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 8ccc632dbac..98dd6a2b4c8 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -25,12 +25,10 @@
new /obj/item/clothing/head/caphat(src)
new /obj/item/clothing/head/caphat/parade(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/captunic(src)
- new /obj/item/clothing/head/crown/fancy(src)
new /obj/item/cartridge/captain(src)
new /obj/item/storage/box/silver_ids(src)
new /obj/item/radio/headset/heads/captain/alt(src)
new /obj/item/radio/headset/heads/captain(src)
- new /obj/item/clothing/glasses/sunglasses/gar/supergar(src)
new /obj/item/clothing/gloves/color/captain(src)
new /obj/item/storage/belt/sabre(src)
new /obj/item/gun/energy/e_gun(src)
@@ -50,7 +48,6 @@
new /obj/item/clothing/head/beret/hop(src) //WS edit - More Berets
new /obj/item/clothing/under/rank/command/head_of_personnel(src) //WS Edit - Better Command Uniforms
new /obj/item/clothing/under/rank/command/head_of_personnel/skirt(src) //WS Edit - Better Command Uniforms
- new /obj/item/clothing/head/hopcap(src)
new /obj/item/cartridge/head_of_personnel(src)
new /obj/item/radio/headset/heads/head_of_personnel(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
@@ -92,7 +89,6 @@
new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src)
new /obj/item/clothing/head/HoS(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
- new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src)
new /obj/item/clothing/suit/armor/vest/security/hos(src) //WS Edit - Better security jumpsuit sprites
new /obj/item/storage/lockbox/medal/sec(src)
new /obj/item/megaphone/sec(src)
@@ -130,17 +126,17 @@
new /obj/item/clothing/under/rank/security/warden/skirt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/holosign_creator/security(src)
- new /obj/item/clothing/mask/gas/sechailer(src)
+ new /obj/item/clothing/mask/gas(src)
new /obj/item/storage/box/zipties(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/belt/security/full(src)
new /obj/item/flashlight/seclite(src)
- new /obj/item/megaphone/sec(src) //WS edit - Small QoL Brig additions
+ new /obj/item/megaphone/sec(src)
new /obj/item/clothing/gloves/krav_maga/sec(src)
new /obj/item/door_remote/head_of_security(src)
- new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src)
- new /obj/item/gun/ballistic/automatic/pistol/commander(src) //WS edit - free lethals
- new /obj/item/gun_voucher //WS edit - gun gun gun gun gun gun gun
+ new /obj/item/gun/ballistic/shotgun/automatic/m11(src)
+ new /obj/item/gun/ballistic/automatic/pistol/commander(src)
+ new /obj/item/gun_voucher
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
@@ -259,7 +255,6 @@
new /obj/item/paper/fluff/jobs/security/court_judgement (src)
new /obj/item/pen (src)
new /obj/item/clothing/suit/judgerobe (src)
- new /obj/item/clothing/head/powdered_wig (src)
new /obj/item/storage/briefcase(src)
/obj/structure/closet/secure_closet/contraband/armory
@@ -272,6 +267,11 @@
name = "Contraband Locker"
req_access = list(ACCESS_HEADS)
+/obj/structure/closet/secure_closet/armorycage
+ name = "armory locker"
+ req_access = list(ACCESS_ARMORY)
+ icon_state = "shotguncase"
+
/obj/structure/closet/secure_closet/armory1
name = "armory armor locker"
req_access = list(ACCESS_ARMORY)
@@ -321,7 +321,7 @@
..()
new /obj/item/gun/ballistic/automatic/smg/wt550(src)
new /obj/item/clothing/head/helmet/bulletproof(src)
- new /obj/item/clothing/mask/gas/sechailer(src)
+ new /obj/item/clothing/mask/gas/vigilitas(src)
new /obj/item/clothing/suit/armor/vest/bulletproof(src)
/obj/structure/closet/secure_closet/lethalshots
@@ -333,10 +333,10 @@
..()
for(var/i in 1 to 3)
new /obj/item/storage/box/lethalshot(src)
- new /obj/item/ammo_box/magazine/co9mm(src) //WS edit - begin - better safe than sorry
new /obj/item/ammo_box/magazine/co9mm(src)
new /obj/item/ammo_box/magazine/co9mm(src)
- new /obj/item/ammo_box/magazine/co9mm(src) //WS edit - end
+ new /obj/item/ammo_box/magazine/co9mm(src)
+ new /obj/item/ammo_box/magazine/co9mm(src)
/obj/structure/closet/secure_closet/labor_camp_security
name = "labor camp security locker"
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index fc0aae86078..23c5e83e3c5 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -12,7 +12,7 @@
new /obj/item/clothing/under/syndicate/skirt(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/radio/headset/syndicate(src)
- new /obj/item/ammo_box/magazine/m10mm(src)
+ new /obj/item/ammo_box/magazine/m10mm_ringneck(src)
new /obj/item/storage/belt/military(src)
new /obj/item/crowbar/syndie(src)
new /obj/item/clothing/glasses/night(src)
@@ -23,7 +23,7 @@
/obj/structure/closet/syndicate/nuclear/PopulateContents()
for(var/i in 1 to 5)
- new /obj/item/ammo_box/magazine/m10mm(src)
+ new /obj/item/ammo_box/magazine/m10mm_ringneck(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/teargas(src)
new /obj/item/storage/backpack/duffelbag/syndie/med(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index fdc061e9769..fa4fe485015 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -29,7 +29,7 @@
if (prob(40))
new /obj/item/storage/toolbox/emergency(src)
- switch (pickweight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1)))
+ switch (pick_weight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1)))
if ("small")
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/tank/internals/emergency_oxygen(src)
@@ -50,7 +50,7 @@
new /obj/item/clothing/mask/breath(src)
if ("nothing")
- // doot
+ EMPTY_BLOCK_GUARD
// teehee
if ("delete")
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index bca315340a4..e3a8339dce4 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -37,8 +37,6 @@
new /obj/item/clothing/under/color/jumpskirt/black(src)
if(prob(25))
new /obj/item/clothing/suit/jacket/leather(src)
- if(prob(20))
- new /obj/item/clothing/suit/jacket/leather/overcoat(src)
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/black(src)
for(var/i in 1 to 3)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 3729f41af36..3cd9cd13796 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -293,3 +293,21 @@
new /obj/item/clothing/mask/breath(src)
for(var/i in 1 to 3)
new /obj/item/tank/internals/oxygen(src)
+
+/obj/structure/closet/crate/cyborg
+ name = "Cyborg Construction Crate"
+ desc = "A crate containing the parts to build a cyborg frame."
+ icon_state = "scicrate"
+
+/obj/structure/closet/crate/cyborg/PopulateContents()
+ . = ..()
+ new /obj/item/bodypart/l_arm/robot(src)
+ new /obj/item/bodypart/r_arm/robot(src)
+ new /obj/item/bodypart/leg/left/robot(src)
+ new /obj/item/bodypart/leg/right/robot(src)
+ new /obj/item/bodypart/chest/robot(src)
+ new /obj/item/bodypart/head/robot(src)
+ new /obj/item/robot_suit(src)
+ new /obj/item/stock_parts/cell/high(src)
+ for(var/i in 1 to 2)
+ new /obj/item/assembly/flash/handheld(src)
diff --git a/code/game/objects/structures/crates_lockers/crates/graves.dm b/code/game/objects/structures/crates_lockers/crates/graves.dm
new file mode 100644
index 00000000000..dc7eee343d0
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/crates/graves.dm
@@ -0,0 +1,112 @@
+/obj/structure/closet/crate/grave
+ name = "burial mound"
+ desc = "A marked patch of soil, adorned with a wooden cross"
+ icon_state = "grave"
+ dense_when_open = TRUE
+ material_drop = /obj/item/stack/ore/glass/basalt
+ material_drop_amount = 5
+ opened = TRUE
+ anchorable = FALSE
+ anchored = TRUE
+ locked = TRUE
+ breakout_time = 900
+ cutting_tool = TOOL_SHOVEL
+
+/obj/structure/closet/crate/grave/attackby(obj/item/W, mob/user, params)
+ .=..()
+ if(istype(W, /obj/item/screwdriver))
+ if(!user.is_literate())
+ to_chat(user, "You scratch illegibly on [src]!")
+ return
+ var/t = stripped_input(user, "What would you like the inscription to be?", name, null, 53)
+ if(user.get_active_held_item() != W)
+ return
+ if(!user.canUseTopic(src, BE_CLOSE))
+ return
+ if(t)
+ desc = "[t]"
+ return
+
+/obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S, force = FALSE)
+ if(!opened)
+ to_chat(user, "The ground here is too hard to dig up with your bare hands. You'll need a shovel.")
+ else
+ to_chat(user, "The grave has already been dug up.")
+
+/obj/structure/closet/crate/grave/tool_interact(obj/item/S, mob/living/carbon/user)
+ if(user.a_intent == INTENT_HELP) //checks to attempt to dig the grave, must be done on help intent only.
+ if(!opened)
+ if(S.tool_behaviour == cutting_tool)
+ to_chat(user, "You start start to dig open \the [src] with \the [S]...")
+ if (do_after(user,20, target = src))
+ opened = TRUE
+ locked = TRUE
+ dump_contents()
+ update_appearance()
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing)
+ return TRUE
+ return TRUE
+ else
+ to_chat(user, "You can't dig up a grave with \the [S.name].")
+ return TRUE
+ else
+ to_chat(user, "The grave has already been dug up.")
+ return TRUE
+
+ else if((user.a_intent != INTENT_HELP) && opened) //checks to attempt to remove the grave entirely.
+ if(S.tool_behaviour == cutting_tool)
+ to_chat(user, "You start to remove \the [src] with \the [S].")
+ if (do_after(user,15, target = src))
+ to_chat(user, "You remove \the [src] completely.")
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing)
+ deconstruct(TRUE)
+ return TRUE
+ return
+
+/obj/structure/closet/crate/grave/bust_open()
+ ..()
+ opened = TRUE
+ update_appearance()
+ dump_contents()
+ return
+
+/obj/structure/closet/crate/grave/stone
+ name = "burial mound"
+ desc = "A marked patch of soil, adorned with a sandstone slab"
+ icon_state = "grave_lead"
+
+/obj/structure/closet/crate/grave/loot
+ name = "burial mound"
+ desc = "A marked patch of soil, showing signs of a burial long ago. You wouldn't disturb a grave... right?"
+ opened = FALSE
+
+/obj/structure/closet/crate/grave/loot/PopulateContents() //GRAVEROBBING IS NOW A FEATURE
+ ..()
+ new /obj/effect/decal/remains/human/grave(src)
+ switch(rand(1,7))
+ if(1)
+ new /obj/item/spacecash/bundle/smallrand(src)
+ new /obj/item/card/id
+ new /obj/item/storage/wallet(src)
+ if(2)
+ new /obj/item/clothing/head/papersack/smiley(src)
+ if(3)
+ new /obj/item/clothing/under/nanotrasen(src)
+ new /obj/item/clothing/head/nanotrasen(src)
+ if(4)
+ new /obj/item/storage/book/bible/booze(src)
+ if(5)
+ new /obj/item/clothing/neck/stethoscope(src)
+ new /obj/item/scalpel(src)
+ new /obj/item/hemostat(src)
+
+ if(6)
+ new /obj/item/reagent_containers/glass/beaker/large/napalm(src)
+ new /obj/item/clothing/under/frontiersmen(src)
+ if(7)
+ new /obj/item/clothing/glasses/sunglasses(src)
+ new /obj/item/clothing/mask/cigarette/rollie(src)
+ new /obj/item/lighter(src)
+
+/obj/effect/decal/remains/human/grave
+ turf_loc_check = FALSE
diff --git a/code/game/objects/structures/crateshelf.dm b/code/game/objects/structures/crateshelf.dm
index 3b1387f5490..f5f31fb30e3 100644
--- a/code/game/objects/structures/crateshelf.dm
+++ b/code/game/objects/structures/crateshelf.dm
@@ -1,4 +1,5 @@
#define DEFAULT_SHELF_CAPACITY 3 // Default capacity of the shelf
+#define DEFAULT_SHELF_MAX_CAPACITY 4
#define DEFAULT_SHELF_USE_DELAY 1 SECONDS // Default interaction delay of the shelf
#define DEFAULT_SHELF_VERTICAL_OFFSET 10 // Vertical pixel offset of shelving-related things. Set to 10 by default due to this leaving more of the crate on-screen to be clicked.
@@ -12,9 +13,13 @@
max_integrity = 50 // Not hard to break
var/capacity = DEFAULT_SHELF_CAPACITY
+ var/max_capacity = DEFAULT_SHELF_MAX_CAPACITY
var/use_delay = DEFAULT_SHELF_USE_DELAY
var/list/shelf_contents
+/obj/structure/crate_shelf/built
+ capacity = 1
+
/obj/structure/crate_shelf/debug
capacity = 12
@@ -38,6 +43,8 @@
/obj/structure/crate_shelf/examine(mob/user)
. = ..()
+ if(capacity < max_capacity)
+ . += span_notice("You could add another shelf with 2 sheets of metal.")
. += span_notice("There are some bolts holding [src] together.")
if(shelf_contents.Find(null)) // If there's an empty space in the shelf, let the examiner know.
. += span_notice("You could drag and drop a crate into [src].")
@@ -47,12 +54,40 @@
for(var/obj/structure/closet/crate/crate in shelf_contents)
. += " [icon2html(crate, user)] [crate]"
+/obj/structure/crate_shelf/proc/add_shelf(num)
+ if(capacity + num > max_capacity)
+ return FALSE
+ var/stack_layer // This is used to generate the sprite layering of the shelf pieces.
+ var/stack_offset // This is used to generate the vertical offset of the shelf pieces.
+ var/prev_capacity = capacity
+ capacity += num
+ shelf_contents.len = capacity
+ for(var/i in prev_capacity to (capacity - 1))
+ if(i >= 3) // If we're at or above three, we'll be on the way to going off the tile we're on. This allows mobs to be below the shelf when this happens.
+ stack_layer = ABOVE_MOB_LAYER + (0.02 * i) - 0.01
+ else
+ stack_layer = BELOW_OBJ_LAYER + (0.02 * i) - 0.01 // Make each shelf piece render above the last, but below the crate that should be on it.
+ stack_offset = DEFAULT_SHELF_VERTICAL_OFFSET * i // Make each shelf piece physically above the last.
+ overlays += image(icon = 'icons/obj/objects.dmi', icon_state = "shelf_stack", layer = stack_layer, pixel_y = stack_offset)
+
/obj/structure/crate_shelf/attackby(obj/item/item, mob/living/user, params)
if (item.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
item.play_tool_sound(src)
- if(do_after(user, 3 SECONDS, target = src))
+ if(do_after(user, 3 SECONDS, src))
deconstruct(TRUE)
return TRUE
+ if(istype(item, /obj/item/stack/sheet/metal))
+ if(capacity < max_capacity)
+ var/obj/item/stack/sheet/metal/our_sheet = item
+ if(our_sheet.get_amount() >= 2)
+ balloon_alert(user, "adding additional shelf to rack")
+ if(do_after(user, 3 SECONDS, src))
+ add_shelf(1)
+ our_sheet.use(2)
+ return TRUE
+ to_chat(user, span_notice("Adding a shelf to [src] requires more metal."))
+ return FALSE
+ to_chat(user, span_notice("[src] cannot be built any higher!"))
return ..()
/obj/structure/crate_shelf/relay_container_resist_act(mob/living/user, obj/structure/closet/crate)
@@ -123,6 +158,7 @@
crate.SpinAnimation(rand(4,7), 1) // Spin the crates around a little as they fall. Randomness is applied so it doesn't look weird.
switch(pick(1, 1, 1, 1, 2, 2, 3)) // Randomly pick whether to do nothing, open the crate, or break it open.
if(1) // Believe it or not, this does nothing.
+ EMPTY_BLOCK_GUARD
if(2) // Open the crate!
if(crate.open()) // Break some open, cause a little chaos.
crate.visible_message(span_warning("[crate]'s lid falls open!"))
@@ -135,11 +171,15 @@
shelf_contents[shelf_contents.Find(crate)] = null
if(!(flags_1&NODECONSTRUCT_1))
density = FALSE
- var/obj/item/rack_parts/shelf/newparts = new(loc)
- transfer_fingerprints_to(newparts)
+ var/obj/item/rack_parts/shelf/new_parts = new(loc)
+ if(capacity >= 2)
+ var/obj/item/stack/sheet/metal/new_metal = new(loc)
+ new_metal.amount = (capacity-1)*2
+ transfer_fingerprints_to(new_metal)
+ transfer_fingerprints_to(new_parts)
return ..()
/obj/item/rack_parts/shelf
name = "crate shelf parts"
desc = "Parts of a shelf."
- construction_type = /obj/structure/crate_shelf
+ construction_type = /obj/structure/crate_shelf/built
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 4e95b555884..b74c4926ea1 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -185,6 +185,11 @@
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
take_damage(2)
+/obj/structure/displaycase/broken
+ name = "broken display case"
+ desc = "A display case for prized possessions. Or at least it was, until someone smashed it open."
+ broken = 1
+
/obj/structure/displaycase_chassis
anchored = TRUE
density = FALSE
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 4246075e49f..43052f1f0db 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -333,6 +333,14 @@
new mineral_path(T, 2)
qdel(src)
+/obj/structure/door_assembly/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if (I.use_tool(src, user, 3 SECONDS, volume=100))
+ to_chat(user, "You slice [src] apart.")
+ deconstruct(FALSE)
+ return TRUE
/obj/structure/door_assembly/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
if(the_rcd.mode == RCD_DECONSTRUCT)
diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm
index d2bcf77cfda..b77f86be469 100644
--- a/code/game/objects/structures/door_assembly_types.dm
+++ b/code/game/objects/structures/door_assembly_types.dm
@@ -141,20 +141,6 @@
airlock_type = /obj/machinery/door/airlock/shuttle
glass_type = /obj/machinery/door/airlock/shuttle/glass
-/obj/structure/door_assembly/door_assembly_cult
- name = "cult airlock assembly"
- icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi'
- base_name = "cult airlock"
- overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi'
- airlock_type = /obj/machinery/door/airlock/cult
- glass_type = /obj/machinery/door/airlock/cult/glass
-
-/obj/structure/door_assembly/door_assembly_cult/unruned
- icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi'
- overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi'
- airlock_type = /obj/machinery/door/airlock/cult/unruned
- glass_type = /obj/machinery/door/airlock/cult/unruned/glass
-
/obj/structure/door_assembly/door_assembly_viro
name = "virology airlock assembly"
icon = 'icons/obj/doors/airlocks/station/virology.dmi'
diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
index ebfda776726..61944f81198 100644
--- a/code/game/objects/structures/dresser.dm
+++ b/code/game/objects/structures/dresser.dm
@@ -9,14 +9,40 @@
hitsound_type = PROJECTILE_HITSOUND_WOOD
/obj/structure/dresser/attackby(obj/item/I, mob/user, params)
- if(I.tool_behaviour == TOOL_WRENCH)
- to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].")
- if(I.use_tool(src, user, 20, volume=50))
- to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].")
- set_anchored(!anchored)
+ var/list/modifiers = params2list(params)
+ if(user.transferItemToLoc(I, drop_location(), silent = FALSE))
+ //Center the icon where the user clicked.
+ if(!LAZYACCESS(modifiers, ICON_X) || !LAZYACCESS(modifiers, ICON_Y))
+ return
+ //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
+ I.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size/2), world.icon_size/2)
+ I.pixel_y = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2)
+ return TRUE
else
return ..()
+/obj/structure/dresser/wrench_act(mob/living/user, obj/item/I)
+ . = ..()
+ to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].")
+ if(I.use_tool(src, user, 20, volume=50))
+ to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].")
+ set_anchored(!anchored)
+
+/obj/structure/dresser/crowbar_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!anchored)
+ to_chat(user, span_notice("You begin to pull apart [src]."))
+ if(I.use_tool(src, user, 30, volume=50))
+ to_chat(user, span_notice("You successfully deconstruct [src]."))
+ deconstruct()
+
+/obj/structure/dresser/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ to_chat(user, span_notice("You begin to disassemble [src]."))
+ if(I.use_tool(src, user, 10, volume=50))
+ to_chat(user, span_notice("You successfully deconstruct [src]."))
+ deconstruct()
+
/obj/structure/dresser/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
qdel(src)
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index d5a8c3e496c..48bf8817e1e 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -107,9 +107,6 @@
else if(W.tool_behaviour == TOOL_WELDER)
if(W.use_tool(src, user, 0, volume=50))
dismantle(user, TRUE)
- else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
- W.play_tool_sound(src)
- dismantle(user, TRUE)
else
return ..()
diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm
index 8697662ed09..819264eb1ce 100644
--- a/code/game/objects/structures/fence.dm
+++ b/code/game/objects/structures/fence.dm
@@ -111,11 +111,6 @@
cuttable = FALSE
var/open = FALSE
-/obj/structure/fence/door/Initialize()
- . = ..()
-
- update_door_status()
-
/obj/structure/fence/door/opened
icon_state = "door_opened"
open = TRUE
diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
deleted file mode 100644
index f6de885caf7..00000000000
--- a/code/game/objects/structures/fireaxe.dm
+++ /dev/null
@@ -1,185 +0,0 @@
-/obj/structure/fireaxecabinet
- name = "fire axe cabinet"
- desc = "There is a small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
- icon = 'icons/obj/wallmounts.dmi'
- icon_state = "fireaxe"
- anchored = TRUE
- density = FALSE
- armor = list("melee" = 50, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
- max_integrity = 150
- integrity_failure = 0.33
- var/locked = TRUE
- var/open = FALSE
- var/obj/item/fireaxe/fireaxe
-
-/obj/structure/fireaxecabinet/Initialize()
- . = ..()
- fireaxe = new
- update_appearance()
-
-/obj/structure/fireaxecabinet/Destroy()
- if(fireaxe)
- QDEL_NULL(fireaxe)
- return ..()
-
-/obj/structure/fireaxecabinet/attackby(obj/item/I, mob/user, params)
- if(iscyborg(user) || I.tool_behaviour == TOOL_MULTITOOL)
- toggle_lock(user)
- else if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP && !broken)
- if(obj_integrity < max_integrity)
- if(!I.tool_start_check(user, amount=2))
- return
-
- to_chat(user, "You begin repairing [src].")
- if(I.use_tool(src, user, 40, volume=50, amount=2))
- obj_integrity = max_integrity
- update_appearance()
- to_chat(user, "You repair [src].")
- else
- to_chat(user, "[src] is already in good condition!")
- return
- else if(istype(I, /obj/item/stack/sheet/glass) && broken)
- var/obj/item/stack/sheet/glass/G = I
- if(G.get_amount() < 2)
- to_chat(user, "You need two glass sheets to fix [src]!")
- return
- to_chat(user, "You start fixing [src]...")
- if(do_after(user, 20, target = src) && G.use(2))
- broken = 0
- obj_integrity = max_integrity
- update_appearance()
- else if(open || broken)
- if(istype(I, /obj/item/fireaxe) && !fireaxe)
- var/obj/item/fireaxe/F = I
- if(F && F.wielded)
- to_chat(user, "Unwield the [F.name] first.")
- return
- if(!user.transferItemToLoc(F, src))
- return
- fireaxe = F
- to_chat(user, "You place the [F.name] back in the [name].")
- update_appearance()
- return
- else if(!broken)
- toggle_open()
- else
- return ..()
-
-/obj/structure/fireaxecabinet/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
- switch(damage_type)
- if(BRUTE)
- if(broken)
- playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 90, TRUE)
- else
- playsound(loc, 'sound/effects/glasshit.ogg', 90, TRUE)
- if(BURN)
- playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
-
-/obj/structure/fireaxecabinet/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
- if(open)
- return
- . = ..()
- if(.)
- update_appearance()
-
-/obj/structure/fireaxecabinet/obj_break(damage_flag)
- if(!broken && !(flags_1 & NODECONSTRUCT_1))
- update_appearance()
- broken = TRUE
- playsound(src, 'sound/effects/glassbr3.ogg', 100, TRUE)
- new /obj/item/shard(loc)
- new /obj/item/shard(loc)
-
-/obj/structure/fireaxecabinet/deconstruct(disassembled = TRUE)
- if(!(flags_1 & NODECONSTRUCT_1))
- if(fireaxe && loc)
- fireaxe.forceMove(loc)
- fireaxe = null
- new /obj/item/stack/sheet/metal(loc, 2)
- qdel(src)
-
-/obj/structure/fireaxecabinet/blob_act(obj/structure/blob/B)
- if(fireaxe)
- fireaxe.forceMove(loc)
- fireaxe = null
- qdel(src)
-
-/obj/structure/fireaxecabinet/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- if(open || broken)
- if(fireaxe)
- user.put_in_hands(fireaxe)
- fireaxe = null
- to_chat(user, "You take the fire axe from the [name].")
- src.add_fingerprint(user)
- update_appearance()
- return
- if(locked)
- to_chat(user, "The [name] won't budge!")
- return
- else
- open = !open
- update_appearance()
- return
-
-/obj/structure/fireaxecabinet/attack_paw(mob/living/user)
- return attack_hand(user)
-
-/obj/structure/fireaxecabinet/attack_ai(mob/user)
- toggle_lock(user)
- return
-
-/obj/structure/fireaxecabinet/attack_tk(mob/user)
- if(locked)
- to_chat(user, "The [name] won't budge!")
- return
- else
- open = !open
- update_appearance()
- return
-
-/obj/structure/fireaxecabinet/update_overlays()
- . = ..()
- if(fireaxe)
- . += "axe"
- if(open)
- . += "glass_raised"
- return
- var/hp_percent = obj_integrity/max_integrity * 100
- if(broken)
- . += "glass4"
- else
- switch(hp_percent)
- if(-INFINITY to 40)
- . += "glass3"
- if(40 to 60)
- . += "glass2"
- if(60 to 80)
- . += "glass1"
- if(80 to INFINITY)
- . += "glass"
-
- . += locked ? "locked" : "unlocked"
-
-/obj/structure/fireaxecabinet/proc/toggle_lock(mob/user)
- to_chat(user, "Resetting circuitry...")
- playsound(src, 'sound/machines/locktoggle.ogg', 50, TRUE)
- if(do_after(user, 20, target = src))
- to_chat(user, "You [locked ? "disable" : "re-enable"] the locking modules.")
- locked = !locked
- update_appearance()
-
-/obj/structure/fireaxecabinet/verb/toggle_open()
- set name = "Open/Close"
- set category = "Object"
- set src in oview(1)
-
- if(locked)
- to_chat(usr, "The [name] won't budge!")
- return
- else
- open = !open
- update_appearance()
- return
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 0fca2bcca6e..1698f90ec7c 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -1056,3 +1056,39 @@
T.air.adjust_moles(GAS_CO2, -amt)
T.atmos_spawn_air("o2=[amt];TEMP=293.15")
lastcycle = world.time
+
+/obj/structure/fluff/steam_vent
+ name = "steam vent"
+ desc = "A outlet for steam, usually for water coming in contact with steam pipes."
+ icon = 'icons/obj/structures.dmi'
+ icon_state = "steamvent"
+ deconstructible = FALSE
+ layer = GAS_PUMP_LAYER
+
+ var/particle_to_spawn = /particles/smoke/steam/vent
+ var/obj/effect/particle_holder/part_hold
+
+/obj/structure/fluff/steam_vent/Initialize()
+ . = ..()
+ part_hold = new(get_turf(src))
+ part_hold.layer = EDGED_TURF_LAYER
+ part_hold.particles = new particle_to_spawn()
+ underlays.Cut()
+
+/obj/structure/fluff/steam_vent/Destroy()
+ . = ..()
+ QDEL_NULL(part_hold)
+
+/obj/structure/fluff/steam_vent/low
+ particle_to_spawn = /particles/smoke/steam/vent/low
+
+/obj/structure/fluff/steam_vent/high
+ particle_to_spawn = /particles/smoke/steam/vent/high
+
+/obj/effect/particle_holder
+ name = ""
+ anchored = TRUE
+ mouse_opacity = 0
+
+/obj/effect/particle_emitter/Initialize(mapload, time)
+ . = ..()
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index 6a53024a81a..32d6f02721c 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -258,3 +258,13 @@
/obj/structure/fluff/hedge/opaque //useful for mazes and such
opacity = TRUE
+
+/obj/structure/fluff/glowshroom
+ name = "glowshroom"
+ desc = "Mycena bregprox, a species of mushroom that glows in the dark."
+ icon = 'icons/obj/lighting.dmi'
+ icon_state = "glowshroom"
+ layer = ABOVE_NORMAL_TURF_LAYER
+ light_color = "#C3E381"
+ light_range = 2
+ light_power = 1
diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/geyser.dm
similarity index 99%
rename from code/game/objects/structures/lavaland/geyser.dm
rename to code/game/objects/structures/geyser.dm
index af536d2e8c1..d5c7dbeef36 100644
--- a/code/game/objects/structures/lavaland/geyser.dm
+++ b/code/game/objects/structures/geyser.dm
@@ -45,7 +45,7 @@
/obj/structure/geyser/random/Initialize()
. = ..()
- reagent_id = pickweight(options)
+ reagent_id = pick_weight(options)
/obj/item/plunger
name = "plunger"
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index aed3ae724c5..f8893a3e3bc 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -102,58 +102,6 @@
head = /obj/item/clothing/head/helmet/gladiator
uniform = /obj/item/clothing/under/costume/gladiator/ash_walker
-/obj/effect/mob_spawn/human/demonic_friend
- name = "Essence of friendship"
- desc = "Oh boy! Oh boy! A friend!"
- mob_name = "Demonic friend"
- icon = 'icons/obj/cardboard_cutout.dmi'
- icon_state = "cutout_basic"
- outfit = /datum/outfit/demonic_friend
- death = FALSE
- roundstart = FALSE
- random = TRUE
- id_job = "SuperFriend"
- var/obj/effect/proc_holder/spell/targeted/summon_friend/spell
- var/datum/mind/owner
- assignedrole = "SuperFriend"
-
-/obj/effect/mob_spawn/human/demonic_friend/Initialize(mapload, datum/mind/owner_mind, obj/effect/proc_holder/spell/targeted/summon_friend/summoning_spell)
- . = ..()
- owner = owner_mind
- flavour_text = "You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for [owner.p_their()] short mortal coil."
- important_info = "Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell."
- var/area/A = get_area(src)
- if(!mapload && A)
- notify_ghosts("\A friendship shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
- objectives = "Be [owner.name]'s friend, and keep [owner.name] alive, so you don't get sent back to hell."
- spell = summoning_spell
-
-
-/obj/effect/mob_spawn/human/demonic_friend/special(mob/living/L)
- if(!QDELETED(owner.current) && owner.current.stat != DEAD)
- L.fully_replace_character_name(null,"[owner.name]'s best friend")
- soullink(/datum/soullink/oneway, owner.current, L)
- spell.friend = L
- spell.charge_counter = spell.charge_max
- L.mind.hasSoul = FALSE
- var/mob/living/carbon/human/H = L
- var/obj/item/worn = H.wear_id
- var/obj/item/card/id/id = worn.GetID()
- id.registered_name = L.real_name
- id.update_label()
- else
- to_chat(L, "Your owner is already dead! You will soon perish.")
- addtimer(CALLBACK(L, TYPE_PROC_REF(/mob, dust), 150)) //Give em a few seconds as a mercy.
-
-/datum/outfit/demonic_friend
- name = "Demonic Friend"
- uniform = /obj/item/clothing/under/misc/assistantformal
- shoes = /obj/item/clothing/shoes/laceup
- r_pocket = /obj/item/radio
- back = /obj/item/storage/backpack
- implants = list(/obj/item/implant/mindshield) //No revolutionaries, he's MY friend.
- id = /obj/item/card/id
-
/obj/effect/mob_spawn/human/syndicate
name = "Syndicate Operative"
roundstart = FALSE
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 6463282eb6d..5f35e69d098 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -36,26 +36,7 @@
playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
add_fingerprint(user)
- if(istype(W, /obj/item/gun/energy/plasmacutter))
- to_chat(user, "You start slicing apart the girder...")
- if(W.use_tool(src, user, 40, volume=100))
- to_chat(user, "You slice apart the girder.")
- var/obj/item/stack/sheet/metal/M = new (loc, 2)
- M.add_fingerprint(user)
- qdel(src)
-
- return
-
- else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
- to_chat(user, "You smash through the girder!")
- new /obj/item/stack/sheet/metal(get_turf(src))
- W.play_tool_sound(src)
- qdel(src)
-
- return
-
-
- else if(istype(W, /obj/item/stack))
+ if(istype(W, /obj/item/stack))
if(iswallturf(loc))
to_chat(user, "There is already a wall present!")
return
@@ -231,6 +212,15 @@
else
return ..()
+/obj/structure/girder/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if(I.use_tool(src, user, 3 SECONDS, volume=0))
+ to_chat(user, "You cut apart \the [src].", "You cut apart \the [src].")
+ deconstruct()
+ return TRUE
+
// Screwdriver behavior for girders
/obj/structure/girder/screwdriver_act(mob/user, obj/item/tool)
if(..())
@@ -324,10 +314,6 @@
new remains(loc)
qdel(src)
-/obj/structure/girder/narsie_act()
- new /obj/structure/girder/cult(loc)
- qdel(src)
-
/obj/structure/girder/displaced
name = "displaced girder"
icon_state = "displaced"
@@ -349,68 +335,6 @@
new remains(loc, 2)
qdel(src)
-
-
-//////////////////////////////////////////// cult girder //////////////////////////////////////////////
-
-/obj/structure/girder/cult
- name = "runed girder"
- desc = "Framework made of a strange and shockingly cold metal. It doesn't seem to have any bolts."
- icon = 'icons/obj/cult.dmi'
- icon_state= "cultgirder"
- can_displace = FALSE
-
-/obj/structure/girder/cult/attackby(obj/item/W, mob/user, params)
- add_fingerprint(user)
- if(istype(W, /obj/item/melee/cultblade/dagger) && iscultist(user)) //Cultists can demolish cult girders instantly with their tomes
- user.visible_message("[user] strikes [src] with [W]!", "You demolish [src].")
- new /obj/item/stack/sheet/mineral/hidden/hellstone(drop_location(), 1)
- qdel(src)
-
- else if(W.tool_behaviour == TOOL_WELDER)
- if(!W.tool_start_check(user, amount=0))
- return
-
- to_chat(user, "You start slicing apart the girder...")
- if(W.use_tool(src, user, 40, volume=50))
- to_chat(user, "You slice apart the girder.")
- var/obj/item/stack/sheet/mineral/hidden/hellstone/R = new(drop_location(), 1)
- transfer_fingerprints_to(R)
- qdel(src)
-
- else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
- to_chat(user, "Your jackhammer smashes through the girder!")
- var/obj/item/stack/sheet/mineral/hidden/hellstone/R = new(drop_location(), 2)
- transfer_fingerprints_to(R)
- W.play_tool_sound(src)
- qdel(src)
-
- else if(istype(W, /obj/item/stack/sheet/mineral/hidden/hellstone))
- var/obj/item/stack/sheet/mineral/hidden/hellstone/R = W
- if(R.get_amount() < 1)
- to_chat(user, "You need at least one sheet of runed metal to construct a runed wall!")
- return 0
- user.visible_message("[user] begins laying runed metal on [src]...", "You begin constructing a runed wall...")
- if(do_after(user, 50, target = src))
- if(R.get_amount() < 1)
- return
- user.visible_message("[user] plates [src] with runed metal.", "You construct a runed wall.")
- R.use(1)
- var/turf/T = get_turf(src)
- T.PlaceOnTop(/turf/closed/wall/mineral/cult)
- qdel(src)
-
- else
- return ..()
-
-/obj/structure/girder/cult/narsie_act()
- return
-
-/obj/structure/girder/cult/deconstruct(disassembled = TRUE)
- if(!(flags_1 & NODECONSTRUCT_1))
- new /obj/item/stack/sheet/mineral/hidden/hellstone(drop_location(), 1)
- qdel(src)
-
/obj/structure/girder/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
switch(the_rcd.mode)
if(RCD_FLOORWALL)
@@ -452,13 +376,6 @@
transfer_fingerprints_to(B)
qdel(src)
- else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
- to_chat(user, "Your jackhammer smashes through the girder!")
- var/obj/item/stack/tile/bronze/B = new(drop_location(), 2)
- transfer_fingerprints_to(B)
- W.play_tool_sound(src)
- qdel(src)
-
else if(istype(W, /obj/item/stack/tile/bronze))
var/obj/item/stack/tile/bronze/B = W
if(B.get_amount() < 2)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 5bca53e84dd..b1897ee661d 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -227,6 +227,15 @@
qdel(src)
..()
+/obj/structure/grille/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if (I.use_tool(src, user, 1 SECONDS, volume=100))
+ to_chat(user, "You slice [src] apart.")
+ deconstruct(FALSE)
+ return TRUE
+
/obj/structure/grille/obj_break()
if(!broken && !(flags_1 & NODECONSTRUCT_1))
new broken_type(src.loc)
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 59ef31fafa4..83bae84fc57 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -154,7 +154,7 @@
else
H.apply_damage(15 * blade_sharpness, BRUTE, head)
log_combat(user, H, "dropped the blade on", src, " non-fatally")
- H.emote("scream")
+ H.force_scream()
if (blade_sharpness > 1)
blade_sharpness -= 1
diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm
index c42983a5e0e..5dbaa4a1e7c 100644
--- a/code/game/objects/structures/headpike.dm
+++ b/code/game/objects/structures/headpike.dm
@@ -6,7 +6,7 @@
density = FALSE
anchored = TRUE
var/bonespear = FALSE
- var/obj/item/spear/spear
+ var/obj/item/melee/spear/spear
var/obj/item/bodypart/head/victim
/obj/structure/headpike/bone //for bone spears
@@ -24,9 +24,9 @@
victim = new(src)
victim.real_name = random_unique_name(prob(50))
- spear = locate(bonespear ? /obj/item/spear/bonespear : /obj/item/spear) in parts_list
+ spear = locate(bonespear ? /obj/item/melee/spear/bone : /obj/item/melee/spear) in parts_list
if(!spear)
- spear = bonespear ? new/obj/item/spear/bonespear(src) : new/obj/item/spear(src)
+ spear = bonespear ? new/obj/item/melee/spear/bone(src) : new/obj/item/melee/spear(src)
update_appearance()
return ..()
diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm
deleted file mode 100644
index 00124d781d8..00000000000
--- a/code/game/objects/structures/hivebot.dm
+++ /dev/null
@@ -1,112 +0,0 @@
-/obj/structure/hivebot_beacon
- name = "beacon"
- desc = "Some odd beacon thing."
- icon = 'icons/mob/hivebot.dmi'
- icon_state = "def_radar-off"
- anchored = TRUE
- density = TRUE
- var/bot_type = "norm"
- var/bot_amt = 10
- var/spawn_time_min
- var/spawn_time_max
-
-/obj/structure/hivebot_beacon/Initialize()
- . = ..()
- var/datum/effect_system/smoke_spread/smoke = new
- smoke.set_up(2, loc)
- smoke.start()
- visible_message("[src] warps in!")
- playsound(src.loc, 'sound/effects/empulse.ogg', 25, TRUE)
- addtimer(CALLBACK(src, PROC_REF(warpbots)), rand(spawn_time_min, spawn_time_max))
-
-/obj/structure/hivebot_beacon/proc/warpbots()
- icon_state = "def_radar"
- visible_message("[src] turns on!")
- while(bot_amt > 0)
- bot_amt--
- switch(bot_type)
- if("norm")
- new /mob/living/simple_animal/hostile/hivebot(get_turf(src))
- if("range")
- new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
- if("rapid")
- new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
-
- sleep(100)
- visible_message("[src] warps out!")
- playsound(src.loc, 'sound/effects/empulse.ogg', 25, TRUE)
- qdel(src)
- return
-
-/obj/structure/spawner/wasteplanet/hivebot
- name = "hivebot fabricator"
- desc = "An active fabricator, creating hivebots out of resources from below the surface."
-
- icon = 'icons/obj/machines/bsm.dmi'
- icon_state = "bsm_on"
-
- faction = list("mining")
- max_mobs = 5
- max_integrity = 250
- mob_types = list(
- /mob/living/simple_animal/hostile/hivebot/wasteplanet = 40,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 40,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 10,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 5,
- /mob/living/simple_animal/hostile/hivebot/mechanic = 5
- )
- spawn_text = "crawls out of"
- spawn_sound = list('sound/effects/suitstep2.ogg')
- move_resist = INFINITY
- anchored = TRUE
- resistance_flags = FIRE_PROOF | LAVA_PROOF
- var/obj/effect/light_emitter/hivespawner/emitted_light
-
-/obj/structure/spawner/wasteplanet/hivebot/Initialize()
- . = ..()
- emitted_light = new(loc)
-
-/obj/structure/spawner/wasteplanet/hivebot/deconstruct(disassembled)
- destroy_effect()
- drop_loot()
- return ..()
-
-/obj/structure/spawner/wasteplanet/hivebot/Destroy()
- QDEL_NULL(emitted_light)
- return ..()
-
-/obj/structure/spawner/wasteplanet/hivebot/proc/destroy_effect()
- playsound(loc,'sound/effects/explosionfar.ogg', 200, TRUE)
- visible_message("[src] begins to rattle and shake, sparks flying off of it!")
-
-
-/obj/structure/spawner/wasteplanet/hivebot/proc/drop_loot()
- var/datum/effect_system/smoke_spread/smoke = new
- smoke.set_up(2, loc)
- smoke.start()
- new /obj/effect/particle_effect/sparks(loc)
- new /obj/effect/spawner/lootdrop/waste/hivebot/beacon(loc)
-
-/obj/effect/light_emitter/hivespawner
- set_luminosity = 4
- set_cap = 2.5
- light_color = COLOR_RED_LIGHT
-
-
-/obj/structure/spawner/wasteplanet/hivebot/low_threat
- max_mobs = 4
- spawn_time = 300
-
-/obj/structure/spawner/wasteplanet/hivebot/medium_threat
- max_mobs = 5
- spawn_time = 250
-
-/obj/structure/spawner/wasteplanet/hivebot/high_threat
- max_mobs = 7
- spawn_time = 200
-
-/obj/structure/spawner/wasteplanet/hivebot/extreme_threat
- max_mobs = 10
- spawn_time = 150
-
-
diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm
deleted file mode 100644
index 4bb23877462..00000000000
--- a/code/game/objects/structures/icemoon/cave_entrance.dm
+++ /dev/null
@@ -1,1014 +0,0 @@
-GLOBAL_LIST_INIT(ore_probability, list(
- /obj/item/stack/ore/uranium = 50,
- /obj/item/stack/ore/iron = 50,
- /obj/item/stack/ore/plasma = 75,
- /obj/item/stack/ore/silver = 50,
- /obj/item/stack/ore/gold = 50,
- /obj/item/stack/ore/diamond = 25,
- /obj/item/stack/ore/titanium = 75,
- /obj/item/pickaxe/diamond = 15,
- /obj/item/borg/upgrade/modkit/cooldown = 5,
- /obj/item/borg/upgrade/modkit/damage = 5,
- /obj/item/borg/upgrade/modkit/range = 5,
- /obj/item/t_scanner/adv_mining_scanner/lesser = 15,
- /obj/item/kinetic_crusher = 15,
- /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 25,
- /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 25,
- /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 25,
- /obj/item/tank/jetpack/suit = 10,
- /obj/item/survivalcapsule = 15,
- /obj/item/reagent_containers/hypospray/medipen/survival = 15,
- /obj/item/gps/mining = 10,
- /obj/item/extraction_pack = 10,
- /obj/item/reagent_containers/food/drinks/beer = 15,
- ))
-
-/obj/structure/spawner/ice_moon
- name = "cave entrance"
- desc = "A hole in the ground, filled with monsters ready to defend it."
- faction = list("mining")
- max_mobs = 3
- max_integrity = 250
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/wolf)
- move_resist = INFINITY
- anchored = TRUE
-
-/obj/structure/spawner/ice_moon/Initialize()
- . = ..()
- clear_rock()
-
-/**
- * Clears rocks around the spawner when it is created
- *
- */
-/obj/structure/spawner/ice_moon/proc/clear_rock()
- for(var/turf/F in RANGE_TURFS(2, src))
- if(abs(src.x - F.x) + abs(src.y - F.y) > 3)
- continue
- if(ismineralturf(F))
- var/turf/closed/mineral/M = F
- M.ScrapeAway(null, CHANGETURF_IGNORE_AIR)
-
-/obj/structure/spawner/ice_moon/deconstruct(disassembled)
- destroy_effect()
- drop_loot()
- return ..()
-
-/**
- * Effects and messages created when the spawner is destroyed
- *
- */
-/obj/structure/spawner/ice_moon/proc/destroy_effect()
- playsound(loc,'sound/effects/explosionfar.ogg', 200, TRUE)
- visible_message("[src] collapses, sealing everything inside!\nOres fall out of the cave as it is destroyed!")
-
-/**
- * Drops items after the spawner is destroyed
- *
- */
-/obj/structure/spawner/ice_moon/proc/drop_loot()
- for(var/type in GLOB.ore_probability)
- var/chance = GLOB.ore_probability[type]
- if(!prob(chance))
- continue
- new type(loc, rand(5, 10))
-
-/obj/structure/spawner/ice_moon/polarbear
- max_mobs = 1
- spawn_time = 60 SECONDS
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/polarbear)
-
-/obj/structure/spawner/ice_moon/polarbear/clear_rock()
- for(var/turf/F in RANGE_TURFS(1, src))
- if(ismineralturf(F))
- var/turf/closed/mineral/M = F
- M.ScrapeAway(null, CHANGETURF_IGNORE_AIR)
-
-/obj/structure/spawner/ice_moon/demonic_portal
- name = "demonic portal"
- desc = "A portal that goes to another world, normal creatures couldn't survive there. When it collapses, who knows where it will go?"
- icon_state = "nether"
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/ice_demon)
- light_range = 1
- light_color = COLOR_SOFT_RED
- spawn_time = 300
-
-/obj/structure/spawner/ice_moon/demonic_portal/clear_rock()
- for(var/turf/F in RANGE_TURFS(3, src))
- if(abs(src.x - F.x) + abs(src.y - F.y) > 5)
- continue
- if(ismineralturf(F))
- var/turf/closed/mineral/M = F
- M.ScrapeAway(null, CHANGETURF_IGNORE_AIR)
-
-/obj/structure/spawner/ice_moon/demonic_portal/Initialize()
- . = ..()
-
-/obj/structure/spawner/ice_moon/demonic_portal/destroy_effect()
- new /obj/effect/collapsing_demonic_portal(loc)
-
-/obj/structure/spawner/ice_moon/demonic_portal/drop_loot()
- return
-
-/obj/structure/spawner/ice_moon/rockplanet
- name = "gruboid den"
- desc = "Though gruboid are typically nomadic creatures, they gather in small surface caves to reproduce. They're unlikely to be happy about being disturbed."
- max_mobs = 3
- spawn_time = 60 SECONDS
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/rockplanet, /mob/living/simple_animal/hostile/asteroid/elite/broodmother_child/rockplanet)
-
-/obj/structure/spawner/ice_moon/rockplanet/clear_rock()
- for(var/turf/F in RANGE_TURFS(1, src))
- if(ismineralturf(F))
- var/turf/closed/mineral/M = F
- M.ScrapeAway(null, CHANGETURF_IGNORE_AIR)
-
-/obj/effect/collapsing_demonic_portal
- name = "collapsing demonic portal"
- desc = "It's slowly fading! Get ready to fight whatever comes through!"
- layer = TABLE_LAYER
- icon = 'icons/mob/nest.dmi'
- icon_state = "nether"
- anchored = TRUE
- density = TRUE
-
-/obj/effect/collapsing_demonic_portal/Initialize()
- . = ..()
- playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE)
- visible_message("[src] begins to collapse! As it fails, it connects to a random dimensional point and pulls through what it finds!")
- animate(src, transform = matrix().Scale(0, 1), alpha = 50, time = 5 SECONDS)
- addtimer(CALLBACK(src, PROC_REF(collapse)), 5 SECONDS)
-
-/**
- * Handles portal deletion
- *
- */
-/obj/effect/collapsing_demonic_portal/proc/collapse()
- drop_loot()
- qdel(src)
-
-//portal types go here
-
-/obj/structure/spawner/ice_moon/demonic_portal/brimdemon
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/brimdemon)
-
-/obj/structure/spawner/ice_moon/demonic_portal/ice_whelp
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/ice_whelp)
-
-/obj/structure/spawner/ice_moon/demonic_portal/snowlegion
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/tendril)
-
-/obj/structure/spawner/ice_moon/demonic_portal/low_threat
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/brimdemon = 35,
- /mob/living/simple_animal/hostile/asteroid/ice_whelp = 15,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/tendril = 35,
- /mob/living/simple_animal/hostile/asteroid/ice_demon = 15
- )
- max_mobs = 5
- spawn_time = 300
-
-/obj/structure/spawner/ice_moon/demonic_portal/medium_threat
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/brimdemon = 25,
- /mob/living/simple_animal/hostile/asteroid/ice_whelp = 25,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/tendril = 25,
- /mob/living/simple_animal/hostile/asteroid/ice_demon = 25
- )
- max_mobs = 7
- spawn_time = 300
-/obj/structure/spawner/ice_moon/demonic_portal/high_threat
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/brimdemon = 15,
- /mob/living/simple_animal/hostile/asteroid/ice_whelp = 35,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/tendril = 15,
- /mob/living/simple_animal/hostile/asteroid/ice_demon = 35
- )
- max_mobs = 7
- spawn_time = 200
-
-/obj/structure/spawner/ice_moon/demonic_portal/extreme_threat
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/brimdemon = 10,
- /mob/living/simple_animal/hostile/asteroid/ice_whelp = 25,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/tendril = 15,
- /mob/living/simple_animal/hostile/asteroid/ice_demon = 50
- )
- max_mobs = 10
- spawn_time = 200
-
-//I think there's room to make portal types drop loot/spawn monsters based on the loot list but that's out of scope for what I'm doing
-
-/**
- * Drops loot from the portal. Uses variable difficulty based on drops- more valulable rewards will also add additional enemies to the attack wave.
- * If you manage to win big and get a bunch of major rich loot, you will also be faced with a big mob of angries.
- * Absolutely deranged use of probability code below, trigger warning
- */
-/obj/effect/collapsing_demonic_portal/proc/drop_loot()
- visible_message("Something slips out of [src]!")
- var/loot = rand(1, 21)
- switch(loot)
- if(1)//Clown hell. God help you if you roll this.
- visible_message("You can hear screaming and joyful honking.")//now THIS is what we call a critical failure
- playsound(loc,'sound/spookoween/ghosty_wind.ogg', 100, FALSE, 50, TRUE, TRUE)
- playsound(loc,'sound/spookoween/scary_horn3.ogg', 100, FALSE, 50, TRUE, TRUE)
- if(prob(15))
- new /mob/living/simple_animal/hostile/clown/clownhulk(loc)
- new /mob/living/simple_animal/hostile/clown/longface(loc)
- new /mob/living/simple_animal/hostile/clown/clownhulk/chlown(loc)
- new /obj/item/shield/energy/bananium(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/clown/banana(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/clown/fleshclown(loc)
- new /mob/living/simple_animal/hostile/clown/clownhulk/chlown
- new /mob/living/simple_animal/hostile/clown/honkling(loc)
- if(prob(25))
- new /obj/item/grenade/spawnergrenade/clown(loc)
- new /obj/item/grenade/spawnergrenade/clown(loc)
- new /mob/living/simple_animal/hostile/clown/clownhulk(loc)
- if(prob(10))
- new /mob/living/simple_animal/hostile/clown/mutant/blob(loc)//oh god oh fuck
- new /obj/machinery/syndicatebomb/badmin/clown(loc)
- if(prob(35))
- new /obj/item/storage/backpack/duffelbag/clown/syndie(loc)
- new /mob/living/simple_animal/hostile/clown/fleshclown(loc)
- new /mob/living/simple_animal/hostile/clown/honkling(loc)
- else
- new /obj/item/storage/backpack/duffelbag/clown/cream_pie(loc)
- new /mob/living/simple_animal/hostile/clown/honkling(loc)
- if(prob(25))
- new /obj/item/borg/upgrade/transform/clown(loc)
- new /mob/living/simple_animal/hostile/clown/stacked(loc)
- if(prob(35))
- new /obj/item/megaphone/clown(loc)
- new /mob/living/simple_animal/hostile/clown/stacked(loc)
- if(prob(25))
- new /obj/item/reagent_containers/spray/waterflower/lube(loc)
- new /mob/living/simple_animal/hostile/clown/fleshclown(loc)
- new /mob/living/simple_animal/hostile/clown/fleshclown(loc)
- if(prob(35))
- new /obj/item/clothing/suit/space/hardsuit/clown(loc)
- new /mob/living/simple_animal/hostile/clown/fleshclown(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/clown/fleshclown(loc)
- if(prob(25))
- new /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat(loc)
- new /mob/living/simple_animal/hostile/clown/fleshclown(loc)
- if(prob(25))//you lost
- new /obj/item/circlegame(loc)
- new /obj/item/stack/sheet/mineral/hidden/hellstone(loc)
- if(2)//basic demonic incursion
- visible_message("You glimpse an indescribable abyss in the portal. Horrifying monsters appear in a gout of flame.")
- playsound(loc,'sound/hallucinations/wail.ogg', 200, FALSE, 50, TRUE, TRUE)
- if(prob(35))
- new /obj/item/clothing/glasses/godeye(loc)
- new /mob/living/simple_animal/hostile/netherworld/migo(loc)
- new /mob/living/simple_animal/hostile/netherworld/blankbody(loc)
- if(prob(45))
- new /obj/item/pickaxe/drill/jackhammer/demonic(loc)
- new /mob/living/simple_animal/hostile/netherworld/migo(loc)
- new /mob/living/simple_animal/hostile/netherworld/blankbody(loc)
- if(prob(45))
- new /obj/item/wisp_lantern(loc)
- new /mob/living/simple_animal/hostile/netherworld/blankbody(loc)
- new /mob/living/simple_animal/hostile/netherworld(loc)
- if(prob(25))
- new /mob/living/simple_animal/hostile/netherworld(loc)
- new /mob/living/simple_animal/hostile/netherworld/blankbody(loc)
- if(prob(5))
- new /mob/living/simple_animal/hostile/netherworld/migo(loc)
- new /mob/living/simple_animal/hostile/netherworld/blankbody(loc)
- new /mob/living/simple_animal/hostile/netherworld/migo(loc)
- if(prob(45))
- new /obj/item/nullrod/staff(loc)
- new /mob/living/simple_animal/hostile/netherworld/migo(loc)
- if(prob(30))
- new /obj/item/clothing/suit/space/hardsuit/quixote/dimensional(loc)
- new /mob/living/simple_animal/hostile/netherworld/migo(loc)
- else
- new /obj/item/immortality_talisman(loc)
- new /mob/living/simple_animal/hostile/netherworld/migo(loc)
- if(prob(30))
- new /obj/item/shared_storage/red(loc)
- new /mob/living/simple_animal/hostile/netherworld(loc)
- new /mob/living/simple_animal/hostile/netherworld/blankbody(loc)
- if(prob(30))
- new /mob/living/simple_animal/hostile/netherworld/blankbody(loc)
- if(prob(30))
- new /obj/item/book/granter/spell/traps(loc)
- new /mob/living/simple_animal/hostile/netherworld/blankbody(loc)
- new /mob/living/simple_animal/hostile/netherworld/migo(loc)
- if(prob(30))
- new /mob/living/simple_animal/hostile/netherworld/blankbody(loc)
- new /mob/living/simple_animal/hostile/netherworld(loc)
- new /mob/living/simple_animal/hostile/netherworld/migo(loc)
- new /mob/living/simple_animal/hostile/netherworld(loc)
- new /turf/open/indestructible/necropolis(loc)
- if(3)//skeleton/religion association, now accepting YOUR BONES
- visible_message("Bones rattle and strained voices chant a forgotten god's name.")
- playsound(loc,'sound/ambience/ambiholy.ogg', 100, FALSE, 50, TRUE, TRUE)
- if(prob(30))
- new /obj/item/reagent_containers/glass/bottle/potion/flight(loc)
- new /mob/living/simple_animal/hostile/human/skeleton/templar(loc)
- else
- new /obj/item/clothing/neck/memento_mori(loc)
- new /mob/living/simple_animal/hostile/human/skeleton(loc)
- new /mob/living/simple_animal/hostile/human/skeleton/templar(loc)
- if(prob(35))
- new /obj/item/storage/box/holy_grenades(loc)
- new /mob/living/simple_animal/hostile/human/skeleton/templar(loc)
- new /mob/living/simple_animal/hostile/human/skeleton/templar(loc)
- if(prob(40))
- new /obj/item/claymore(loc)
- new /mob/living/simple_animal/hostile/human/skeleton/templar(loc)
- if(prob(45))
- new /obj/item/gun/ballistic/bow(loc)
- new /obj/item/storage/bag/quiver(loc)
- new /obj/item/ammo_casing/caseless/arrow/bronze(loc)
- new /obj/item/ammo_casing/caseless/arrow/bronze(loc)
- new /obj/item/ammo_casing/caseless/arrow/bronze(loc)
- new /obj/item/ammo_casing/caseless/arrow/bronze(loc)
- new /obj/item/ammo_casing/caseless/arrow/bronze(loc)
- new /mob/living/simple_animal/hostile/human/skeleton/templar(loc)
- new /mob/living/simple_animal/hostile/human/skeleton(loc)
- if(prob(30))
- new /obj/item/stack/sheet/mineral/wood/fifty(loc)
- new /mob/living/simple_animal/hostile/human/skeleton(loc)
- new /mob/living/simple_animal/hostile/human/skeleton(loc)
- if(prob(35))
- new /obj/item/staff/bostaff(loc)
- new /mob/living/simple_animal/hostile/human/skeleton(loc)
- new /mob/living/simple_animal/hostile/human/skeleton(loc)
- if(prob(25))
- new /obj/item/shield/riot/roman(loc)
- new /mob/living/simple_animal/hostile/human/skeleton(loc)
- if(prob(55))
- new /obj/item/clothing/suit/armor/riot/knight/blue(loc)
- new /obj/item/clothing/head/helmet/knight/blue(loc)
- new /mob/living/simple_animal/hostile/human/skeleton(loc)
- new /mob/living/simple_animal/hostile/human/skeleton(loc)
- new /obj/item/instrument/trombone(loc)
- new /obj/item/stack/sheet/bone(loc)
- new /obj/item/stack/sheet/bone(loc)
- new /obj/item/stack/sheet/bone(loc)
- new /obj/item/stack/sheet/bone(loc)
- new /mob/living/simple_animal/hostile/human/skeleton/templar(loc)
- new /turf/open/floor/mineral/silver(loc)
- if(4)//syndicate incursion. Again, high-quality loot at low chances, this time with excessive levels of danger
- visible_message("Radio chatter echoes out from the portal. Red-garbed figures step through, weapons raised.")
- playsound(loc,'sound/effects/radiohiss.ogg', 200, FALSE, 50, TRUE, TRUE)
- playsound(loc,'sound/ambience/antag/tatoralert.ogg', 75, FALSE, 50, TRUE, TRUE)
- if(prob(35))
- if(prob(15))
- new /obj/item/clothing/suit/space/hardsuit/syndi/elite(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
- else
- if(prob(50))
- new /obj/item/clothing/suit/space/hardsuit/syndi(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
- else
- new /obj/item/clothing/suit/space/hardsuit/syndi(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
- if(prob(25))//the real prize
- new /obj/effect/spawner/lootdrop/donkpockets(loc)
- new /obj/effect/spawner/lootdrop/donkpockets(loc)
- new /obj/effect/spawner/lootdrop/donkpockets(loc)
- if(prob(35))
- new /obj/item/clothing/shoes/magboots/syndie(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
- if(prob(25))
- new /obj/item/gun/ballistic/automatic/pistol/syndicate(loc)
- new /obj/item/ammo_box/magazine/
- new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc)
- if(prob(25))
- new /obj/item/gun/ballistic/automatic/pistol/tec9(loc)
- new /obj/item/ammo_box/magazine/tec9(loc)
- new /obj/item/ammo_box/magazine/tec9(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc)
- if(prob(35))
- new /obj/item/clothing/gloves/rapid(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/melee/sword/space(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
- if(prob(35))
- new /obj/item/wrench/combat(loc)
- new /obj/item/storage/toolbox/syndicate(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/melee/sword/space(loc)
- if(prob(35))
- new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(loc)
- if(prob(35))
- new /obj/item/borg/upgrade/transform/assault(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg(loc)
- if(prob(25))
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
- if(prob(25))
- new /mob/living/simple_animal/hostile/human/syndicate/melee/sword/space(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
- if(prob(25))
- new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc)
- new /obj/item/storage/backpack/duffelbag/syndie/c4(loc)
- if(prob(35))
- new /obj/item/storage/belt/military(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg(loc)
- if(prob(35))
- new /obj/item/kinetic_crusher/syndie_crusher(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
- if(prob(25))
- new /obj/item/card/id/syndicate/anyone(loc)
- if(prob(35))
- new /obj/item/clothing/glasses/thermal/syndi(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc)
- if(prob(35))
- new /obj/item/reagent_containers/hypospray(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc)
- if(prob(25))
- new /obj/item/card/emag(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/melee/sword(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space(loc)
- new /mob/living/simple_animal/hostile/human/syndicate/melee/sword/space(loc)
- new /turf/open/floor/mineral/plastitanium/red(loc)
- if(5)//;HELP BLOB IN MEDICAL
- visible_message("You hear a robotic voice saying something about a \"Delta-level biohazard\".")
- playsound(loc,'sound/ai/outbreak5.ogg', 100, FALSE, 50, TRUE, TRUE)
- playsound(loc,'sound/misc/bloblarm.ogg', 50, FALSE, 50, TRUE, TRUE)
- if(prob(35))
- new /obj/item/circuitboard/machine/chem_dispenser(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- if(prob(35))
- new /obj/item/storage/box/hypospray/CMO(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- if(prob(15))
- new /mob/living/simple_animal/hostile/blob/blobbernaut/independent(loc)
- if(prob(45))
- new /obj/item/defibrillator(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- if(prob(45))
- new /obj/item/circuitboard/machine/stasis(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- if(prob(45))
- new /obj/item/stack/medical/suture/medicated(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- if(prob(45))
- new /obj/item/stack/medical/mesh/advanced(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- if(prob(35))
- new /obj/item/gun/syringe/syndicate(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- if(prob(25))
- new /obj/item/healthanalyzer/advanced(loc)
- if(prob(35))
- new /obj/item/storage/firstaid/advanced(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- if(prob(35))
- new /obj/item/storage/firstaid/tactical(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- new /mob/living/simple_animal/hostile/blob/blobbernaut/independent(loc)
- else
- new /obj/item/storage/firstaid/regular(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- if(prob(35))
- new /obj/effect/mob_spawn/human/corpse/solgov/sonnensoldner(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- else
- new /obj/effect/mob_spawn/human/doctor(loc)
- if(prob(35))
- new /obj/effect/mob_spawn/human/corpse/solgov/sonnensoldner(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- else
- new /obj/effect/mob_spawn/human/doctor(loc)
- if(prob(35))
- new /obj/effect/mob_spawn/human/corpse/solgov/sonnensoldner(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- else
- new /obj/effect/mob_spawn/human/doctor(loc)
- new /obj/item/healthanalyzer(loc)
- new /turf/open/floor/carpet/nanoweave/beige(loc)
- new /mob/living/simple_animal/hostile/blob/blobbernaut/independent(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- new /mob/living/simple_animal/hostile/blob/blobspore/weak(loc)
- if(6)//teleporty ice world. Incomplete.
- visible_message("You glimpse a frozen, empty plane. Something stirs in the fractal abyss.")
- playsound(loc,'sound/ambience/ambisin3.ogg', 150, FALSE, 50, TRUE, TRUE)
- if(prob(45))
- new /obj/item/warp_cube/red(loc)
- new /mob/living/simple_animal/hostile/asteroid/ice_demon(loc)
- if(prob(45))
- new /obj/item/clothing/suit/drfreeze_coat(loc)
- new /obj/item/clothing/under/costume/drfreeze(loc)
- new /mob/living/simple_animal/hostile/asteroid/ice_demon(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/asteroid/ice_demon(loc)
- new /mob/living/simple_animal/hostile/bear/snow(loc)
- if(prob(45))
- new /obj/item/freeze_cube(loc)
- new /mob/living/simple_animal/hostile/asteroid/ice_demon(loc)
- if(prob(55))
- new /obj/item/clothing/shoes/winterboots/ice_boots(loc)
- new /mob/living/simple_animal/hostile/bear/snow(loc)
- new /obj/effect/decal/remains/human(loc)
- new /mob/living/simple_animal/hostile/asteroid/ice_demon(loc)
- new /turf/open/floor/plating/ice/smooth(loc)
- if(7)//FUCK FUCK HELP SWARMERS IN VAULT
- visible_message("Something beeps. Small, glowing forms spill out of the portal en masse!")
- playsound(loc,'sound/ambience/ambitech.ogg', 150, FALSE, 50, TRUE, TRUE)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- if(prob(45))
- new /obj/item/construction/rcd/loaded(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- if(prob(35))
- new /obj/item/holosign_creator/atmos(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/vendor(loc)
- new /obj/item/vending_refill/engivend(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- if(prob(45))
- new /obj/item/tank/jetpack/oxygen(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- if(prob(25))
- new /obj/item/stack/sheet/metal/fifty(loc)
- new /obj/item/grenade/chem_grenade/smart_metal_foam(loc)
- new /obj/item/grenade/chem_grenade/smart_metal_foam(loc)
- new /obj/item/grenade/chem_grenade/smart_metal_foam(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- if(prob(35))
- new /obj/item/stack/sheet/metal/fifty(loc)
- new /obj/item/clothing/glasses/meson/engine(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- if(prob(25))
- new /obj/item/stack/sheet/metal/twenty(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- if(prob(25))
- new /obj/item/storage/toolbox/infiltrator(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- if(prob(25))
- new /obj/machinery/portable_atmospherics/canister/oxygen(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- new /obj/item/clothing/gloves/color/latex/engineering(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/swarmer/ai(loc)
- new /obj/item/clothing/gloves/color/latex/engineering(loc)
- new /obj/effect/mob_spawn/human/engineer(loc)
- new /turf/open/floor/circuit/telecomms(loc)
- if(8)//Literally blood-drunk.
- visible_message("Blood sprays from the portal. An ichor-drenched figure steps through!")
- playsound(loc,'sound/magic/enter_blood.ogg', 150, FALSE, 50, TRUE, TRUE)
- new /obj/effect/gibspawner/human(loc)
- new /obj/effect/gibspawner/human(loc)
- new /obj/effect/gibspawner/human(loc)
- new /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/doom(loc)
- if(prob(50))
- new /obj/item/gem/bloodstone(loc)
- if(prob(25))
- new /obj/item/seeds/tomato/blood(loc)
- new /turf/open/floor/plating/asteroid/basalt(loc)
- if(9)//Now's your chance to be a [[BIG SHOT]]
- visible_message("You hear the sound of big money and bigger avarice.")
- playsound(loc,'sound/lavaland/cursed_slot_machine_jackpot.ogg', 150, FALSE, 50, TRUE, TRUE)
- new /obj/structure/cursed_slot_machine(loc)
- if(prob(35))
- new /obj/item/spacecash/bundle/mediumrand(loc)
- new /obj/item/spacecash/bundle/mediumrand(loc)
- new /obj/item/coin/gold(loc)
- new /mob/living/simple_animal/hostile/faithless(loc)
- if(prob(35))
- new /obj/item/clothing/mask/spamton(loc)
- new /mob/living/simple_animal/hostile/faithless(loc)
- if(prob(35))
- new /obj/item/gem/fdiamond(loc)
- new /mob/living/simple_animal/hostile/faithless(loc)
- else
- new /obj/item/gem/rupee(loc)
- if(prob(35))
- new /obj/item/coin/gold(loc)
- new /obj/item/coin/gold(loc)
- new /obj/item/stack/sheet/mineral/gold/twenty(loc)
- new /mob/living/simple_animal/hostile/faithless(loc)
- if(prob(35))
- new /obj/item/storage/fancy/cigarettes/cigpack_robustgold(loc)
- new /mob/living/simple_animal/hostile/faithless(loc)
- if(prob(35))
- new /obj/item/clothing/head/collectable/petehat(loc)
- new /mob/living/simple_animal/hostile/faithless(loc)
- new /mob/living/simple_animal/hostile/faithless(loc)
- new /mob/living/simple_animal/hostile/faithless(loc)
- new /turf/open/floor/mineral/gold(loc)
- if(10)//hivebot factory
- visible_message("You catch a brief glimpse of a vast production complex. One of the assembly lines outputs through the portal!")
- playsound(loc,'sound/ambience/antag/clockcultalr.ogg', 100, FALSE, 50, TRUE, TRUE)
- if(prob(45))
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /mob/living/simple_animal/hostile/hivebot(loc)
- if(prob(35))
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /mob/living/simple_animal/hostile/hivebot(loc)
- if(prob(25))
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /mob/living/simple_animal/hostile/hivebot/strong(loc)
- if(prob(35))
- new /obj/item/stack/sheet/mineral/silver/twenty(loc)
- new /obj/item/stack/sheet/mineral/titanium/twenty(loc)
- new /obj/item/stack/sheet/mineral/gold/twenty(loc)
- new /mob/living/simple_animal/hostile/hivebot/strong(loc)
- if(prob(35))
- new /obj/item/circuitboard/computer/solar_control(loc)
- new /obj/item/electronics/tracker(loc)
- new /obj/item/solar_assembly(loc)
- new /obj/item/solar_assembly(loc)
- new /obj/item/solar_assembly(loc)
- new /obj/item/solar_assembly(loc)
- if(prob(45))
- new /obj/item/stack/circuit_stack(loc)
- new /mob/living/simple_animal/hostile/hivebot/mechanic(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/hivebot/range(loc)
- if(prob(45))
- new /obj/item/circuitboard/machine/dna_vault(loc)
- new /mob/living/simple_animal/hostile/hivebot/mechanic(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/recycler(loc)
- new /mob/living/simple_animal/hostile/hivebot/mechanic(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/recharger(loc)
- new /mob/living/simple_animal/hostile/hivebot/mechanic(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/smoke_machine(loc)
- new /mob/living/simple_animal/hostile/hivebot/mechanic(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/ore_silo(loc)
- new /mob/living/simple_animal/hostile/hivebot/mechanic(loc)
- if(prob(35))
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /obj/item/stack/sheet/mineral/hidden/hellstone/ten(loc)
- new /mob/living/simple_animal/hostile/hivebot/strong(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/medipen_refiller(loc)
- new /mob/living/simple_animal/hostile/hivebot(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/stasis(loc)
- new /mob/living/simple_animal/hostile/hivebot(loc)
- if(prob(50))
- new /obj/item/stack/sheet/metal/fifty(loc)
- new /obj/item/stack/sheet/glass/fifty(loc)
- new /obj/item/stack/cable_coil/yellow(loc)
- new /obj/item/storage/box/lights/bulbs(loc)
- new /mob/living/simple_animal/hostile/hivebot(loc)
- new /mob/living/simple_animal/hostile/hivebot(loc)
- new /mob/living/simple_animal/hostile/hivebot/strong(loc)
- new /obj/machinery/conveyor(loc)
- new /turf/open/floor/circuit/red(loc)
- if(11)//miner's last moments
- visible_message("The familiar sound of an ash storm greets you. A miner steps through the portal, stumbles, and collapses.")
- playsound(loc,'sound/weather/ashstorm/outside/weak_end.ogg', 150, FALSE, 50, TRUE, TRUE)
- if(prob(35))
- new /obj/item/disk/design_disk/modkit_disc/resonator_blast(loc)
- if(prob(25))
- new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(loc)
- if(prob(25))
- new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(loc)
- if(prob(25))
- new /obj/item/disk/design_disk/modkit_disc/bounty(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/vending/mining_equipment(loc)
- if(prob(45))
- new /obj/item/vending_refill/mining_equipment(loc)
- new /mob/living/simple_animal/hostile/asteroid/goliath/beast(loc)
- if(prob(35))
- new /obj/item/reagent_containers/hypospray/medipen/survival(loc)
- if(prob(35))
- new /obj/item/fulton_core(loc)
- new /obj/item/extraction_pack(loc)
- new /mob/living/simple_animal/hostile/asteroid/goliath/beast(loc)
- if(prob(45))
- new /obj/item/t_scanner/adv_mining_scanner/lesser(loc)
- new /mob/living/simple_animal/hostile/asteroid/goliath/beast(loc)
- if(prob(45))
- new /obj/item/gibtonite(loc)
- new /mob/living/simple_animal/hostile/asteroid/goliath/beast(loc)
- if(prob(45))
- new /obj/item/clothing/glasses/meson/night(loc)
- new /mob/living/simple_animal/hostile/asteroid/goliath/beast(loc)
- if(prob(50))
- new /obj/item/kinetic_crusher(loc)
- else
- new /obj/item/gun/energy/kinetic_accelerator(loc)
- new /mob/living/simple_animal/hostile/asteroid/goliath/beast(loc)
- new /mob/living/simple_animal/hostile/asteroid/goliath/beast(loc)
- new /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient(loc)
- new /obj/effect/mob_spawn/human/miner(loc)
- new /turf/open/floor/plating/asteroid/basalt(loc)
- if(12)//sailing the ocean blue
- visible_message("Water pours out of the portal, followed by a strange vessel. It's occupied.")
- playsound(loc,'sound/ambience/shore.ogg', 150, FALSE, 50, TRUE, TRUE)
- new /obj/vehicle/ridden/lavaboat/dragon(loc)
- new /obj/item/oar(loc)
- if(prob(50))
- new /obj/item/clothing/under/costume/sailor(loc)
- if(prob(50))
- new /obj/item/pneumatic_cannon/speargun(loc)
- new /obj/item/storage/backpack/magspear_quiver(loc)
- new /obj/item/throwing_star/magspear(loc)
- new /obj/item/throwing_star/magspear(loc)
- new /obj/item/throwing_star/magspear(loc)
- new /obj/item/throwing_star/magspear(loc)
- new /obj/item/throwing_star/magspear(loc)
- new /mob/living/simple_animal/hostile/carp(loc)
- if(prob(45))
- new /obj/item/clothing/suit/space/hardsuit/carp(loc)
- new /mob/living/simple_animal/hostile/carp(loc)
- if(prob(45))
- new /mob/living/simple_animal/hostile/carp(loc)
- if(prob(45))
- new /obj/item/reagent_containers/food/snacks/fishmeat/carp(loc)
- new /obj/item/reagent_containers/food/snacks/fishmeat/carp(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/carp/megacarp(loc)
- if(prob(25))
- new /obj/item/book/granter/martial/carp(loc)
- new /mob/living/simple_animal/hostile/carp/megacarp(loc)
- if(prob(35))
- new /obj/item/grenade/spawnergrenade/spesscarp(loc)
- new /mob/living/simple_animal/hostile/carp/megacarp(loc)
- new /mob/living/simple_animal/hostile/carp/megacarp(loc)
- new /mob/living/simple_animal/hostile/carp(loc)
- new /turf/open/water(loc)
- if(13)//hydroponics forest
- visible_message("You catch a glimpse of a strange forest. Smells like weed and bad choices.")
- playsound(loc,'sound/ambience/shore.ogg', 150, FALSE, 50, TRUE, TRUE)
- if(prob(45))
- new /obj/item/circuitboard/machine/biogenerator(loc)
- new /mob/living/simple_animal/hostile/venus_human_trap(loc)
- if(prob(35))
- new /obj/item/gun/energy/floragun(loc)
- new /mob/living/simple_animal/hostile/venus_human_trap(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/seed_extractor(loc)
- new /mob/living/simple_animal/hostile/venus_human_trap(loc)
- if(prob(45))
- new /obj/item/circuitboard/machine/plantgenes(loc)
- else
- new /obj/item/circuitboard/machine/hydroponics(loc)
- if(prob(15))
- new /obj/item/circuitboard/machine/hydroponics(loc)
- new /mob/living/simple_animal/hostile/venus_human_trap(loc)
- if(prob(15))
- new /obj/item/circuitboard/machine/hydroponics(loc)
- if(prob(5))
- new /obj/item/seeds/gatfruit(loc)
- new /mob/living/simple_animal/hostile/venus_human_trap(loc)
- if(prob(45))
- new /obj/item/seeds/random(loc)
- if(prob(45))
- new /obj/item/seeds/random(loc)
- new /mob/living/simple_animal/hostile/venus_human_trap(loc)
- if(prob(45))
- new /obj/item/seeds/random(loc)
- if(prob(45))
- new /obj/item/seeds/random(loc)
- new /mob/living/simple_animal/hostile/venus_human_trap(loc)
- if(prob(50))
- new /obj/item/seeds/random(loc)
- if(prob(45))
- new /obj/item/seeds/cannabis(loc)
- new /obj/item/clothing/gloves/botanic_leather(loc)
- new /obj/item/cultivator/rake(loc)
- new /obj/structure/spacevine(loc)
- new /mob/living/simple_animal/hostile/venus_human_trap(loc)
- new /turf/open/floor/plating/grass(loc)
- if(14)//fallout ss13
- visible_message("You hear a geiger counter click and smell ash.")
- playsound(loc,'sound/items/radiostatic.ogg', 100, FALSE, 50, TRUE, TRUE)
- if(prob(50))
- new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola(loc)
- new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola(loc)
- new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola(loc)
- new /mob/living/simple_animal/hostile/cockroach/glockroach(loc)
- if(prob(50))
- new /obj/structure/radioactive/stack(loc)
- new /mob/living/simple_animal/hostile/cockroach/glockroach(loc)
- if(prob(45))
- new /obj/item/stack/sheet/mineral/uranium/twenty(loc)
- new /mob/living/simple_animal/hostile/cockroach/glockroach(loc)
- if(prob(35))
- new /obj/item/clothing/head/radiation(loc)
- new /obj/item/clothing/suit/radiation(loc)
- if(prob(45))
- new /obj/item/gun/energy/decloner(loc)
- new /mob/living/simple_animal/hostile/cockroach/glockroach(loc)
- new /obj/item/geiger_counter(loc)
- new /mob/living/simple_animal/hostile/cockroach/glockroach(loc)
- new /turf/open/floor/plating/dirt(loc)
- if(15)//the backroom freezer
- visible_message("The faint hallogen glow of a faraway kitchen greets you.")
- if(prob(45))
- new /obj/item/kitchen/knife/bloodletter(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- if(prob(55))
- new /obj/item/clothing/gloves/butchering(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- if(prob(45))
- new /obj/item/reagent_containers/food/snacks/store/bread/meat(loc)
- new /obj/item/reagent_containers/food/snacks/store/bread/meat(loc)
- new /obj/item/reagent_containers/food/snacks/store/bread/meat(loc)
- if(prob(55))
- new /obj/item/reagent_containers/food/snacks/store/cake/trumpet(loc)
- if(prob(35))
- new /obj/item/reagent_containers/food/snacks/pizza/dank(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- if(prob(25))
- new /obj/item/reagent_containers/food/snacks/meat/steak/gondola(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- if(prob(35))
- new /obj/item/reagent_containers/food/snacks/burger/roburgerbig(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- if(prob(35))
- new /obj/item/kitchen/knife/butcher(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- if(prob(35))
- new /obj/item/flamethrower/full(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- if(prob(45))
- new /obj/item/sharpener(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- if(prob(25))
- new /obj/item/sharpener/super(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/gibber(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/chem_master/condi(loc)
- new /mob/living/simple_animal/hostile/killertomato(loc)
- new /mob/living/simple_animal/hostile/alien/maid(loc)
- new /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor(loc)
- if(16)//legion miniboss
- visible_message("The ground quakes. An immense figure reaches through the portal, crouching to squeeze through.")
- playsound(loc,'sound/magic/knock.ogg', 100, FALSE, 50, TRUE, TRUE)
- new /mob/living/simple_animal/hostile/big_legion(loc)
- if(prob(75))
- new /obj/structure/closet/crate/necropolis/tendril/greater(loc)
- new /turf/open/indestructible/necropolis(loc)
- if(17)//xenobiologist's hubris
- visible_message("You catch a glimpse of a wobbling sea of slimy friends. An abused-looking keeper slips through the portal.")
- playsound(loc,'sound/effects/footstep/slime1.ogg', 100, FALSE, 50, TRUE, TRUE)
- if(prob(25))
- new /obj/item/slime_extract/adamantine(loc)
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(35))
- new /obj/item/slime_extract/gold(loc)
- if(prob(25))
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(45))
- new /obj/item/extinguisher/advanced(loc)
- if(prob(25))
- new /obj/item/slimepotion/slime/renaming(loc)
- new /mob/living/simple_animal/slime/random(loc)
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(25))
- new /obj/item/slimepotion/slime/sentience(loc)
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(25))
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(45))
- new /obj/item/circuitboard/computer/xenobiology(loc)
- new /obj/item/slime_extract/grey(loc)
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(45))
- new /obj/item/circuitboard/machine/processor/slime(loc)
- new /mob/living/simple_animal/slime/random(loc)
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(25))
- new /obj/item/shield/adamantineshield(loc)
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(45))
- new /obj/item/slime_cookie/purple(loc)
- new /obj/item/slime_cookie/purple(loc)
- new /obj/item/slime_cookie/purple(loc)
- if(prob(45))
- new /obj/item/storage/box/monkeycubes(loc)
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(35))
- new /obj/item/slimepotion/speed(loc)
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(45))
- new /obj/item/slimepotion/slime/slimeradio(loc)
- new /mob/living/simple_animal/slime/random(loc)
- if(prob(35))
- new /mob/living/simple_animal/pet/dog/corgi/puppy/slime(loc)
- new /obj/effect/mob_spawn/human/scientist(loc)
- new /turf/open/floor/mineral/titanium/purple(loc)
- new /mob/living/simple_animal/slime/random(loc)
- if(18)//hey, free elite tumor!
- visible_message("A large, pulsating structure falls through the portal and crashes to the floor.")
- playsound(loc,'sound/effects/break_stone.ogg', 100, FALSE, 50, TRUE, TRUE)
- new /obj/structure/elite_tumor(loc)
- new /turf/open/floor/plating/asteroid/basalt(loc)
- if(19)//*you flush the toilet.*
- visible_message("You hear the faint noise of a long flush.")
- new /obj/structure/toilet(loc)
- new /obj/effect/decal/remains(loc)
- new /obj/item/newspaper(loc)
- new /turf/open/floor/plastic(loc)
- new /obj/item/clothing/head/papersack/smiley(loc) //welcome to the bathroom
- if(20)//Research & Zombies
- visible_message("Flashing lights and quarantine alarms echo through the portal. You smell rotting flesh and plasma.")
- playsound(loc,'sound/misc/bloblarm.ogg', 120, FALSE, 50, TRUE, TRUE)
- if(prob(35))
- new /obj/item/storage/box/rndboards(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- if(prob(35))
- new /obj/item/storage/box/stockparts/deluxe(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- if(prob(15))
- new /obj/effect/spawner/lootdrop/stockparts(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- if(prob(15))
- new /obj/effect/spawner/lootdrop/stockparts(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- if(prob(15))
- new /obj/effect/spawner/lootdrop/stockparts(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- if(prob(15))
- new /obj/effect/spawner/lootdrop/stockparts(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- if(prob(30))
- new /obj/item/circuitboard/machine/rdserver(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- if(prob(35))
- new /obj/item/research_notes/loot/big(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- else
- new /obj/item/research_notes/loot/medium(loc)
- if(prob(35))
- new /obj/item/research_notes/loot/medium(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- else
- new /obj/item/research_notes/loot/small(loc)
- if(prob(35))
- new /obj/item/pneumatic_cannon(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- if(prob(45))
- new /obj/item/research_notes/loot/medium(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- else
- new /obj/item/research_notes/loot/small(loc)
- new/turf/open/floor/mineral/titanium/purple(loc)
- new /mob/living/simple_animal/hostile/human/zombie(loc)
- if(21)//Silverback's locker room
- visible_message("You catch a glimpse of verdant green. Smells like a locker room.")
- playsound(loc,'sound/creatures/gorilla.ogg', 75, FALSE, 50, TRUE, TRUE)
- new /mob/living/simple_animal/hostile/gorilla(loc)
- new /mob/living/simple_animal/hostile/gorilla(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/dnascanner(loc)
- if(prob(35))
- new /obj/item/circuitboard/computer/scan_consolenew(loc)
- if(prob(25))
- new /obj/item/reagent_containers/hypospray/medipen/magillitis(loc)
- new /mob/living/simple_animal/hostile/gorilla(loc)
- if(prob(35))
- new /obj/item/dnainjector/thermal(loc)
- new /mob/living/simple_animal/hostile/gorilla(loc)
- if(prob(35))
- new /obj/item/storage/box/gorillacubes(loc)
- new /mob/living/simple_animal/hostile/gorilla(loc)
- if(prob(35))
- new /obj/item/dnainjector/hulkmut(loc)
- new /mob/living/simple_animal/hostile/gorilla(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/gorilla(loc)
- if(prob(35))
- new /obj/item/dnainjector/gigantism(loc)
- if(prob(45))
- new /obj/item/dnainjector/dwarf(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/gorilla(loc)
- if(prob(35))
- new /mob/living/simple_animal/hostile/gorilla(loc)
- new /obj/item/dnainjector/telemut/darkbundle(loc)
- if(prob(35))
- new /obj/item/dnainjector/insulated(loc)
- new /mob/living/simple_animal/hostile/gorilla(loc)
- new /obj/item/sequence_scanner(loc)
- new /obj/structure/flora/grass/jungle(loc)
- new /turf/open/floor/plating/grass/jungle(loc)
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index 6512a068394..1840c27f927 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -74,7 +74,7 @@
playsound(src.loc, 'sound/effects/splat.ogg', 25, TRUE)
L.visible_message("[user] slams [L] onto the meat spike!", "[user] slams you onto the meat spike!", "You hear a squishy wet noise.")
L.forceMove(drop_location())
- L.emote("scream")
+ L.force_scream()
L.add_splatter_floor()
L.adjustBruteLoss(30)
L.setDir(2)
@@ -128,7 +128,7 @@
M.adjustBruteLoss(30)
src.visible_message(text("[M] falls free of [src]!"))
unbuckle_mob(M,force=1)
- M.emote("scream")
+ M.force_scream()
M.AdjustParalyzed(20)
/obj/structure/kitchenspike/Destroy()
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 5815bcc475e..9aaefb8c014 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -30,9 +30,6 @@
if(LAT != src)
QDEL_IN(LAT, 0)
-/obj/structure/lattice/blob_act(obj/structure/blob/B)
- return
-
/obj/structure/lattice/attackby(obj/item/C, mob/user, params)
if(resistance_flags & INDESTRUCTIBLE)
return
@@ -43,6 +40,15 @@
var/turf/T = get_turf(src)
return T.attackby(C, user) //hand this off to the turf instead (for building plating, catwalks, etc)
+/obj/structure/lattice/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if(I.use_tool(src, user, 1 SECONDS, volume=0))
+ to_chat(user, "You cut apart \the [src].", "You cut apart \the [src].")
+ deconstruct()
+ return TRUE
+
/obj/structure/lattice/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
new build_material(get_turf(src), number_of_mats)
diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm
deleted file mode 100644
index b3c9a8cbf23..00000000000
--- a/code/game/objects/structures/lavaland/necropolis_tendril.dm
+++ /dev/null
@@ -1,187 +0,0 @@
-//Necropolis Tendrils, which spawn lavaland monsters and break into a chasm when killed
-/obj/structure/spawner/lavaland
- name = "necropolis tendril"
- desc = "A vile tendril of corruption, originating deep underground. Terrible monsters are pouring out of it."
-
- icon_state = "tendril"
-
- faction = list("mining")
- max_mobs = 5
- max_integrity = 450
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril)
-
- move_resist = INFINITY // just killing it tears a massive hole in the ground, let's not move it
- anchored = TRUE
- resistance_flags = FIRE_PROOF | LAVA_PROOF
-
- hitsound_type = PROJECTILE_HITSOUND_FLESH
-
- var/gps = null
- var/obj/effect/light_emitter/tendril/emitted_light
-
-GLOBAL_LIST_INIT(tendrils, list())
-/obj/structure/spawner/lavaland/Initialize()
- . = ..()
- emitted_light = new(loc)
- for(var/F in RANGE_TURFS(1, src))
- if(ismineralturf(F))
- var/turf/closed/mineral/M = F
- M.ScrapeAway(null, CHANGETURF_IGNORE_AIR)
- GLOB.tendrils += src
-
-/obj/structure/spawner/lavaland/deconstruct(disassembled)
- new /obj/effect/collapse(loc)
- new /obj/structure/closet/crate/necropolis/tendril(loc)
- return ..()
-
-
-/obj/structure/spawner/lavaland/Destroy()
- var/last_tendril = TRUE
- if(GLOB.tendrils.len>1)
- last_tendril = FALSE
-
- if(last_tendril && !(flags_1 & ADMIN_SPAWNED_1))
- if(SSachievements.achievements_enabled)
- for(var/mob/living/L in view(7,src))
- if(L.stat || !L.client)
- continue
- L.client.give_award(/datum/award/achievement/boss/tendril_exterminator, L)
- L.client.give_award(/datum/award/score/tendril_score, L) //Progresses score by one
- GLOB.tendrils -= src
- QDEL_NULL(emitted_light)
- return ..()
-
-/obj/effect/light_emitter/tendril
- set_luminosity = 4
- set_cap = 2.5
- light_color = LIGHT_COLOR_LAVA
-
-/obj/effect/collapse
- name = "collapsing necropolis tendril"
- desc = "Get clear!"
- layer = TABLE_LAYER
- icon = 'icons/mob/nest.dmi'
- icon_state = "tendril"
- anchored = TRUE
- density = TRUE
- var/obj/effect/light_emitter/tendril/emitted_light
-
-/obj/effect/collapse/Initialize()
- . = ..()
- emitted_light = new(loc)
- visible_message("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!")
- visible_message("Something falls free of the tendril!")
- playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE)
- addtimer(CALLBACK(src, PROC_REF(collapse)), 50)
-
-/obj/effect/collapse/Destroy()
- QDEL_NULL(emitted_light)
- return ..()
-
-/obj/effect/collapse/proc/collapse()
- for(var/mob/M in range(7,src))
- shake_camera(M, 15, 1)
- playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, TRUE)
- visible_message("The tendril falls inward, the ground around it erupting into bubbling lava!") //WS edit.
- for(var/turf/T in range(2,src))
- if(!T.density)
- T.TerraformTurf(/turf/open/lava/smooth/lava_land_surface, /turf/open/lava/smooth/lava_land_surface, flags = CHANGETURF_INHERIT_AIR) //WS edit, instead of chasms this produces lava instead.
- qdel(src)
-
- //these are good for mappers and already see use in some maps.
-
-/obj/structure/spawner/lavaland/goliath
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril)
-
-/obj/structure/spawner/lavaland/legion
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril)
-
-/obj/structure/spawner/lavaland/icewatcher
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing)
-
-/obj/structure/spawner/lavaland/whitesandsbasilisk
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/whitesands)
-
- //these are ones that we want to see spawning on worlds.
-
-/obj/structure/spawner/lavaland/low_threat //this is the most common one, it shouldn't be a huge issue for most players.
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 27,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 26,
- /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril = 26,
- /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing = 1,
- /mob/living/simple_animal/hostile/asteroid/brimdemon = 20
- )
- max_mobs = 4
- spawn_time = 300
-
-/obj/structure/spawner/lavaland/medium_threat //this is less common. It starts getting dangerous here.
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 27,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 26,
- /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril = 26,
- /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing = 1,
- /mob/living/simple_animal/hostile/asteroid/brimdemon = 20
- )
- max_mobs = 6
- spawn_time = 200 //they spawn a little faster
-
-/obj/structure/spawner/lavaland/high_threat //this should be rare. People will have trouble with this.
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 27,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 26,
- /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril = 26,
- /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing = 1,
- /mob/living/simple_animal/hostile/asteroid/brimdemon = 20
- )
- max_mobs = 9
- spawn_time = 200
-
-/obj/structure/spawner/lavaland/extreme_threat //extremely rare
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 27,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 26,
- /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril = 26,
- /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing = 1,
- /mob/living/simple_animal/hostile/asteroid/brimdemon = 20
- )
- max_mobs = 12
- spawn_time = 150 //bring a friend and some automatic weapons
-
-//and sand world ones. More legions, no brimdemons, no icewings.
-
-/obj/structure/spawner/lavaland/sand_world/low_threat
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 20,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 40,
- /mob/living/simple_animal/hostile/asteroid/basilisk/whitesands = 40
- )
- max_mobs = 5
- spawn_time = 300
-
-/obj/structure/spawner/lavaland/sand_world/medium_threat
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 20,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 40,
- /mob/living/simple_animal/hostile/asteroid/basilisk/whitesands = 40
- )
- max_mobs = 7
- spawn_time = 200
-
-/obj/structure/spawner/lavaland/sand_world/high_threat
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 20,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 40,
- /mob/living/simple_animal/hostile/asteroid/basilisk/whitesands = 40
- )
- max_mobs = 10
- spawn_time = 200
-
-/obj/structure/spawner/lavaland/sand_world/extreme_threat
- mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 20,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 40,
- /mob/living/simple_animal/hostile/asteroid/basilisk/whitesands = 40
- )
- max_mobs = 12
- spawn_time = 150
diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm
index e0f6e22f3e7..637f2deeb51 100644
--- a/code/game/objects/structures/manned_turret.dm
+++ b/code/game/objects/structures/manned_turret.dm
@@ -214,7 +214,7 @@
/obj/item/gun_control
name = "turret controls"
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "offhand"
w_class = WEIGHT_CLASS_HUGE
item_flags = ABSTRACT | NOBLUDGEON | DROPDEL
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 2e8c7508d59..ae1f50f0624 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -264,7 +264,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
for(var/mob/living/M in conts)
if (M.stat != DEAD)
- M.emote("scream")
+ M.force_scream()
if(user)
log_combat(user, M, "cremated")
else
diff --git a/code/game/objects/structures/plaques/static_plaques.dm b/code/game/objects/structures/plaques/static_plaques.dm
index 1ac3ec7546d..00944c19741 100644
--- a/code/game/objects/structures/plaques/static_plaques.dm
+++ b/code/game/objects/structures/plaques/static_plaques.dm
@@ -47,3 +47,11 @@
name = "\improper Mr. Deempisi portrait"
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"
icon_state = "monkey_painting"
+
+/obj/structure/plaque/listeningpost
+ name = "Listening Post Commemoration Plaque"
+ engraved = TRUE
+
+/obj/structure/plaque/listeningpost/Initialize()
+ . = ..()
+ desc = "Cybersun Virtual Solutions - Field Listening Post #[rand(107,356)]. Proudly built in [rand(478, 497)]."
diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm
new file mode 100644
index 00000000000..c6ede0166d1
--- /dev/null
+++ b/code/game/objects/structures/platforms.dm
@@ -0,0 +1,172 @@
+/obj/structure/platform
+ name = "platform"
+ desc = "An elevated platform meant to make someone feel more important."
+ icon = 'icons/obj/platform.dmi'
+ icon_state = "platform"
+ flags_1 = ON_BORDER_1
+ layer = RAILING_LAYER
+ pass_flags_self = LETPASSTHROW
+ density = TRUE
+ anchored = TRUE
+ climbable = TRUE
+
+/obj/structure/platform/Initialize()
+ . = ..()
+ if(density && flags_1 & ON_BORDER_1)
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_EXIT = PROC_REF(on_exit),
+ )
+ AddElement(/datum/element/connect_loc, loc_connections)
+ update_appearance()
+
+/obj/structure/platform/update_appearance(updates)
+ . = ..()
+ if(dir == 1)
+ layer = 2.89
+ else
+ layer = 3.08
+
+
+/obj/structure/platform/corner
+ icon_state = "platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/industrial
+ icon_state = "industrial_platform"
+
+/obj/structure/platform/industrial/corner
+ icon_state = "ind_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/industrial_alt
+ icon_state = "industrial2_platform"
+
+/obj/structure/platform/industrial_alt/corner
+ icon_state = "ind2_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/military
+ icon_state = "military_platform"
+
+/obj/structure/platform/military/corner
+ icon_state = "mil_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/ship
+ icon_state = "ship_platform"
+
+/obj/structure/platform/ship/corner
+ icon_state = "ship_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/ship_two
+ icon_state = "ship2_platform"
+
+/obj/structure/platform/ship_two/corner
+ icon_state = "ship2_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/ship_three
+ icon_state = "ship3_platform"
+
+/obj/structure/platform/ship_three/corner
+ icon_state = "ship3_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/ship_four
+ icon_state = "ship4_platform"
+
+/obj/structure/platform/ship_four/corner
+ icon_state = "ship4_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/wood
+ name = "wooden platform"
+ icon_state = "wood_platform"
+ resistance_flags = FLAMMABLE
+
+/obj/structure/platform/wood/corner
+ icon_state = "wood_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/wood_two
+ name = "wooden platform"
+ icon_state = "fancy_wood_platform"
+ resistance_flags = FLAMMABLE
+
+/obj/structure/platform/wood_two/corner
+ icon_state = "fwood_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/attackby(obj/item/I, mob/living/user, params)
+ ..()
+ add_fingerprint(user)
+
+ if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP)
+ if(obj_integrity < max_integrity)
+ if(!I.tool_start_check(user, amount=0))
+ return
+
+ to_chat(user, span_notice("You begin repairing [src]..."))
+ if(I.use_tool(src, user, 40, volume=50))
+ obj_integrity = max_integrity
+ to_chat(user, span_notice("You repair [src]."))
+ else
+ to_chat(user, span_warning("[src] is already in good condition!"))
+ return
+
+/obj/structure/platform/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if(I.use_tool(src, user, 3 SECONDS, volume=0))
+ to_chat(user, span_warning("You cut apart the platform."))
+ deconstruct()
+ return TRUE
+
+/obj/structure/platform/deconstruct(disassembled)
+ . = ..()
+ if(!loc) //quick check if it's qdeleted already.
+ return
+ if(!(flags_1 & NODECONSTRUCT_1))
+ qdel(src)
+
+/obj/structure/platform/CanPass(atom/movable/mover, border_dir)
+ . = ..()
+ if(border_dir & dir)
+ return . || mover.throwing || mover.movement_type & (FLYING | FLOATING)
+ return TRUE
+
+/obj/structure/platform/proc/on_exit(datum/source, atom/movable/leaving, direction)
+ SIGNAL_HANDLER
+
+ if(leaving == src)
+ return // Let's not block ourselves.
+
+ if(!(direction & dir))
+ return
+
+ if(!density)
+ return
+
+ if(leaving.throwing)
+ return
+
+ if(leaving.movement_type & (PHASING | FLYING | FLOATING))
+ return
+
+ if(leaving.move_force >= MOVE_FORCE_EXTREMELY_STRONG)
+ return
+
+ leaving.Bump(src)
+ return COMPONENT_ATOM_BLOCK_EXIT
diff --git a/code/game/objects/structures/poddoor_assembly.dm b/code/game/objects/structures/poddoor_assembly.dm
index 5909e0f666b..f06610ddbc5 100644
--- a/code/game/objects/structures/poddoor_assembly.dm
+++ b/code/game/objects/structures/poddoor_assembly.dm
@@ -56,6 +56,14 @@
return
created_name = new_name
+ else if(item_used.tool_behaviour == TOOL_DECONSTRUCT)
+ if(!item_used.tool_start_check(user, amount=0))
+ return
+ user.visible_message(span_notice("[user] cuts apart [src]."), span_notice("You start to slice apart [src]..."))
+ if(item_used.use_tool(src, user, 4 SECONDS, volume=50))
+ to_chat(user, span_notice("You disassemble [src]."))
+ deconstruct(TRUE)
+
else if(item_used.tool_behaviour == TOOL_WELDER)
if(!item_used.tool_start_check(user, amount=0))
return
diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm
index 95c24145399..16905af7517 100644
--- a/code/game/objects/structures/railings.dm
+++ b/code/game/objects/structures/railings.dm
@@ -65,6 +65,15 @@
deconstruct()
return TRUE
+/obj/structure/railing/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if (I.use_tool(src, user, 3 SECONDS, volume=0))
+ to_chat(user, "You cut apart the railing.")
+ deconstruct()
+ return TRUE
+
/obj/structure/railing/deconstruct(disassembled)
. = ..()
if(!loc) //quick check if it's qdeleted already.
@@ -97,16 +106,16 @@
if(!(direction & dir))
return
- if (!density)
+ if(!density)
return
- if (leaving.throwing)
+ if(leaving.throwing)
return
- if (leaving.movement_type & (PHASING | FLYING | FLOATING))
+ if(leaving.movement_type & (PHASING | FLYING | FLOATING))
return
- if (leaving.move_force >= MOVE_FORCE_EXTREMELY_STRONG)
+ if(leaving.move_force >= MOVE_FORCE_EXTREMELY_STRONG)
return
leaving.Bump(src)
@@ -133,12 +142,12 @@
/obj/structure/railing/wood
name = "wooden railing"
- color = "#A47449"
+ icon_state = "wood_railing_thin"
buildstack = /obj/item/stack/sheet/mineral/wood
/obj/structure/railing/corner/wood
name = "wooden railing"
- color = "#A47449"
+ icon_state = "wood_corners_thin"
buildstack = /obj/item/stack/sheet/mineral/wood
/obj/structure/railing/modern
@@ -187,3 +196,15 @@
density = FALSE
climbable = FALSE
buildstackamount = 1
+
+/obj/structure/railing/thick
+ icon_state = "railing_thick"
+
+/obj/structure/railing/thick/corner
+ icon_state = "railing_thick_corner"
+
+/obj/structure/railing/thin
+ icon_state = "railing_thin"
+
+/obj/structure/railing/thin/corner
+ icon_state = "railing_thin_corner"
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 0df440340ee..0ea49b44933 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -75,13 +75,17 @@ FLOOR SAFES
if(istype(I, /obj/item/clothing/neck/stethoscope))
attack_hand(user)
return
+
+ else if(I.tool_behaviour == TOOL_DECONSTRUCT)
+ user.visible_message("[user] begin to cut through the lock of \the [src].","You start cutting trough the lock of [src].")
+ if(I.use_tool(src, user, 45 SECONDS))
+ broken = TRUE
+ user.visible_message("[user] successfully cuts trough the lock of \the [src].","You successfully cut trough the lock of [src].")
+
else
to_chat(user, "You can't put [I] into the safe while it is closed!")
return
-/obj/structure/safe/blob_act(obj/structure/blob/B)
- return
-
/obj/structure/safe/ex_act(severity, target)
if(((severity == 2 && target == src) || severity == 1) && explosion_count < BROKEN_THRESHOLD)
explosion_count++
diff --git a/code/game/objects/structures/salvaging.dm b/code/game/objects/structures/salvaging.dm
index ebefc58e5c0..ccb76bd81c4 100644
--- a/code/game/objects/structures/salvaging.dm
+++ b/code/game/objects/structures/salvaging.dm
@@ -34,6 +34,16 @@
qdel(src)
return TRUE
+/obj/structure/salvageable/deconstruct_act(mob/living/user, obj/item/tool)
+ . = ..()
+ user.visible_message("[user] starts slicing [src].", \
+ "You start salvaging anything useful from [src]...")
+ if(tool.use_tool(src, user, 6 SECONDS))
+ user.visible_message("[user] dismantles [src].", \
+ "You salvage [src].")
+ dismantle(user)
+ qdel(src)
+ return TRUE
//Types themself, use them, but not the parent object
@@ -46,16 +56,16 @@
/obj/item/stack/ore/salvage/scrapgold/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
- /obj/effect/spawner/lootdrop/salvage_capacitor = 50,
- /obj/effect/spawner/lootdrop/salvage_capacitor = 50,
- /obj/effect/spawner/lootdrop/salvage_scanning = 50,
- /obj/effect/spawner/lootdrop/salvage_scanning = 50,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 40,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 40,
- /obj/effect/spawner/lootdrop/salvage_laser = 40,
- /obj/effect/spawner/lootdrop/salvage_laser = 40,
+ /obj/effect/spawner/random/salvage_capacitor = 50,
+ /obj/effect/spawner/random/salvage_capacitor = 50,
+ /obj/effect/spawner/random/salvage_scanning = 50,
+ /obj/effect/spawner/random/salvage_scanning = 50,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_manipulator = 40,
+ /obj/effect/spawner/random/salvage_manipulator = 40,
+ /obj/effect/spawner/random/salvage_laser = 40,
+ /obj/effect/spawner/random/salvage_laser = 40,
)
/obj/structure/salvageable/computer
@@ -69,7 +79,7 @@
/obj/item/stack/ore/salvage/scrapgold/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
- /obj/effect/spawner/lootdrop/salvage_capacitor = 60,
+ /obj/effect/spawner/random/salvage_capacitor = 60,
/obj/item/computer_hardware/battery = 40,
/obj/item/computer_hardware/battery = 40,
@@ -81,8 +91,8 @@
/obj/item/computer_hardware/card_slot = 40,
/obj/item/computer_hardware/network_card/advanced = 20,
- /obj/effect/spawner/lootdrop/random_computer_circuit_common = 50,
- /obj/effect/spawner/lootdrop/random_computer_circuit_rare = 5,
+ /obj/effect/spawner/random/circuit/computer/common = 50,
+ /obj/effect/spawner/random/circuit/computer/rare = 5,
/obj/item/research_notes/loot/tiny = 10,
)
@@ -96,11 +106,10 @@
/obj/item/stack/ore/salvage/scraptitanium/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
-
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_manipulator = 30,
/obj/item/circuitboard/machine/autolathe = 35,
@@ -124,17 +133,17 @@
/obj/item/stack/ore/salvage/scrapplasma/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_manipulator = 30,
+ /obj/effect/spawner/random/salvage_manipulator = 30,
- /obj/effect/spawner/lootdrop/tool_engie_proto = 45,
- /obj/effect/spawner/lootdrop/tool_surgery_proto = 55,
- /obj/effect/spawner/lootdrop/beaker_loot_spawner = 45,
- /obj/effect/spawner/lootdrop/random_prosthetic = 25,
- /obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop = 5, //:flushed:
- /obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop = 5,
+ /obj/effect/spawner/random/engineering/tool = 45,
+ /obj/effect/spawner/random/medical/surgery_tool = 55,
+ /obj/effect/spawner/random/medical/beaker = 45,
+ /obj/effect/spawner/random/medical/prosthetic = 25,
+ /obj/effect/spawner/random/random_gun_protolathe_lootdrop = 5, //:flushed:
+ /obj/effect/spawner/random/random_ammo_protolathe_lootdrop = 5,
/obj/item/storage/part_replacer = 20,
/obj/item/storage/part_replacer/bluespace = 1,
@@ -162,13 +171,13 @@
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
/obj/item/stack/ore/salvage/scrapbluespace = 60,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_manipulator = 30,
/obj/item/stack/circuit_stack = 50, //this might be the only way in the game to get a poly circuit, and the only way for many ships to get essensial electronics. huh.
- /obj/effect/spawner/lootdrop/random_machine_circuit_mech = 45, //with all the wonderful broken mechs lying around, this might be a chance to get something stupidly overpowered.
- /obj/effect/spawner/lootdrop/random_machine_circuit_common = 50, //well.... "common"
- /obj/effect/spawner/lootdrop/random_machine_circuit_rare = 5,
+ /obj/effect/spawner/random/circuit/machine/mech = 45, //with all the wonderful broken mechs lying around, this might be a chance to get something stupidly overpowered.
+ /obj/effect/spawner/random/circuit/machine/common = 50, //well.... "common"
+ /obj/effect/spawner/random/circuit/machine/rare = 5,
/obj/item/stack/sheet/metal/five = 15, //same as above but more geared towards stuff used by circuit imprinter
/obj/item/stack/sheet/glass/five = 15,
@@ -189,12 +198,12 @@
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
/obj/item/stack/ore/salvage/scrapplasma = 60,
- /obj/effect/spawner/lootdrop/salvage_scanning = 40,
- /obj/effect/spawner/lootdrop/salvage_laser = 30,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
+ /obj/effect/spawner/random/salvage_scanning = 40,
+ /obj/effect/spawner/random/salvage_laser = 30,
+ /obj/effect/spawner/random/salvage_manipulator = 30,
/obj/item/storage/toolbox/syndicate/empty = 80,
- /obj/effect/spawner/lootdrop/destructive_anal_loot = 65,
+ /obj/effect/spawner/random/destructive_anal_loot = 65,
/obj/item/stack/sheet/metal/five = 15, //same as above but more geared towards stuff used by circuit imprinter
/obj/item/stack/sheet/glass/five = 15,
@@ -242,7 +251,6 @@
/obj/item/research_notes/loot/medium = 20,
/obj/item/research_notes/loot/big = 5, //you have a chance at summoning god damn ripley lobster from this thing, might as well
- /obj/item/disk/tech_disk/major = 3,
/obj/item/disk/tech_disk = 20,
/obj/item/disk/data = 20,
/obj/item/disk/holodisk = 20,
@@ -303,7 +311,6 @@
/obj/item/research_notes/loot/medium = 20,
/obj/item/research_notes/loot/big = 5,
- /obj/item/disk/tech_disk/major = 3,
/obj/item/disk/tech_disk = 20,
/obj/item/disk/data = 20,
/obj/item/disk/holodisk = 20,
@@ -334,11 +341,11 @@
color = "#808080"
salvageable_parts = list(
- /obj/effect/spawner/lootdrop/seeded = 80,
- /obj/effect/spawner/lootdrop/seeded = 80,
- /obj/effect/spawner/lootdrop/seeded = 80,
- /obj/effect/spawner/lootdrop/seeded = 80,
- /obj/effect/spawner/lootdrop/seeded = 80,
+ /obj/effect/spawner/random/food_or_drink/seed = 80,
+ /obj/effect/spawner/random/food_or_drink/seed = 80,
+ /obj/effect/spawner/random/food_or_drink/seed = 80,
+ /obj/effect/spawner/random/food_or_drink/seed = 80,
+ /obj/effect/spawner/random/food_or_drink/seed = 80,
/obj/item/seeds/random = 80,
/obj/item/seeds/random = 40,
/obj/item/seeds/random = 40,
@@ -462,239 +469,3 @@
/obj/item/stack/ore/salvage/scrapbluespace/five
amount = 5
-
-//loot spawners as shown above
-
-//GENERIC
-/obj/effect/spawner/lootdrop/salvage_capacitor
- loot = list(
- /obj/item/stock_parts/capacitor = 120,
- /obj/item/stock_parts/capacitor/adv = 20,
- /obj/item/stock_parts/capacitor/super = 5,
- )
-
-/obj/effect/spawner/lootdrop/salvage_scanning
- loot = list(
- /obj/item/stock_parts/scanning_module = 120,
- /obj/item/stock_parts/scanning_module/adv = 20,
- /obj/item/stock_parts/scanning_module/phasic = 5,
- )
-
-/obj/effect/spawner/lootdrop/salvage_manipulator
- loot = list(
- /obj/item/stock_parts/manipulator = 120,
- /obj/item/stock_parts/manipulator/nano = 20,
- /obj/item/stock_parts/manipulator/pico = 5,
- )
-
-/obj/effect/spawner/lootdrop/salvage_matter_bin
- loot = list(
- /obj/item/stock_parts/matter_bin = 120,
- /obj/item/stock_parts/matter_bin/adv = 20,
- /obj/item/stock_parts/matter_bin/super = 5,
- )
-
-/obj/effect/spawner/lootdrop/salvage_laser
- loot = list(
- /obj/item/stock_parts/micro_laser = 120,
- /obj/item/stock_parts/micro_laser/high = 20,
- /obj/item/stock_parts/micro_laser/ultra = 5,
- )
-
-//PROTOLATHE
-/obj/effect/spawner/lootdrop/tool_engie_proto
- loot = list(
- /obj/effect/spawner/lootdrop/tool_engie_common = 120,
- /obj/effect/spawner/lootdrop/tool_engie_sydnie = 20,
- /obj/effect/spawner/lootdrop/tool_engie_adv = 5,
- )
-
-/obj/effect/spawner/lootdrop/tool_engie_common
- loot = list(
- /obj/item/wrench/crescent = 1,
- /obj/item/screwdriver = 1,
- /obj/item/weldingtool = 1,
- /obj/item/crowbar = 1,
- /obj/item/wirecutters = 1,
- /obj/item/multitool = 1,
- )
-
-/obj/effect/spawner/lootdrop/tool_engie_sydnie
- loot = list(
- /obj/item/wrench/syndie = 1,
- /obj/item/screwdriver/nuke = 1,
- /obj/item/weldingtool/largetank = 1,
- /obj/item/crowbar/syndie = 1,
- /obj/item/wirecutters/syndie = 1,
- /obj/item/multitool/syndie = 1,
- )
-
-/obj/effect/spawner/lootdrop/tool_engie_adv
- loot = list(
- /obj/item/screwdriver/power = 1,
- /obj/item/weldingtool/experimental = 1,
- /obj/item/crowbar/power = 1,
- )
-
-/obj/effect/spawner/lootdrop/tool_surgery_proto
- loot = list(
- /obj/effect/spawner/lootdrop/tool_surgery_common = 120,
- /obj/effect/spawner/lootdrop/tool_surgery_adv = 10,
- )
-
-/obj/effect/spawner/lootdrop/tool_surgery_common
- loot = list(
- /obj/item/scalpel = 1,
- /obj/item/hemostat = 1,
- /obj/item/cautery = 1,
- /obj/item/retractor = 1,
- /obj/item/circular_saw = 1,
- /obj/item/surgicaldrill = 1,
- )
-
-/obj/effect/spawner/lootdrop/tool_surgery_adv
- loot = list(
- /obj/item/scalpel/advanced = 1,
- /obj/item/retractor/advanced = 1,
- /obj/item/surgicaldrill/advanced = 1,
- )
-
-/obj/effect/spawner/lootdrop/beaker_loot_spawner
- loot = list(
- /obj/item/reagent_containers/glass/beaker = 300,
- /obj/item/reagent_containers/glass/beaker/large = 200,
- /obj/item/reagent_containers/glass/beaker/plastic = 50,
- /obj/item/reagent_containers/glass/beaker/meta = 10,
- /obj/item/reagent_containers/glass/beaker/noreact = 5,
- /obj/item/reagent_containers/glass/beaker/bluespace = 1,
- )
-/obj/effect/spawner/lootdrop/random_prosthetic
- loot = list(
- /obj/item/bodypart/l_arm/robot/surplus = 1,
- /obj/item/bodypart/r_arm/robot/surplus = 1,
- /obj/item/bodypart/leg/left/robot/surplus = 1,
- /obj/item/bodypart/leg/right/robot/surplus = 1,
- )
-/obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop
- loot = list(
- /obj/item/gun/energy/lasercannon = 1,
- /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 1,
- /obj/item/gun/energy/temperature/security = 1,
- )
-/obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop
- loot = list(
- /obj/item/stock_parts/cell/gun/upgraded = 5,
- /obj/item/ammo_box/magazine/smgm9mm = 7,
- )
-
-//CIRCUIT IMPRINTER
-/obj/effect/spawner/lootdrop/random_machine_circuit_common
- loot = list(
- /obj/item/circuitboard/machine/autolathe = 5,
- /obj/item/circuitboard/machine/bepis = 5,
- /obj/item/circuitboard/machine/biogenerator = 5,
- /obj/item/circuitboard/machine/cell_charger = 5,
- /obj/item/circuitboard/machine/chem_heater = 5,
- /obj/item/circuitboard/machine/chem_master = 5,
- /obj/item/circuitboard/machine/clonescanner = 5,
- /obj/item/circuitboard/machine/cryo_tube = 5,
- /obj/item/circuitboard/machine/cyborgrecharger = 5,
- /obj/item/circuitboard/machine/deep_fryer = 5,
- /obj/item/circuitboard/machine/experimentor = 5,
- /obj/item/circuitboard/machine/holopad = 5,
- /obj/item/circuitboard/machine/hydroponics = 5,
- /obj/item/circuitboard/machine/limbgrower = 5,
- /obj/item/circuitboard/machine/ltsrbt = 5,
- /obj/item/circuitboard/machine/mech_recharger = 5,
- /obj/item/circuitboard/machine/mechfab = 5,
- /obj/item/circuitboard/machine/medical_kiosk = 5,
- /obj/item/circuitboard/machine/medipen_refiller = 5,
- /obj/item/circuitboard/machine/microwave = 5,
- /obj/item/circuitboard/machine/monkey_recycler = 5,
- /obj/item/circuitboard/machine/ore_redemption = 5,
- /obj/item/circuitboard/machine/ore_silo = 5,
- /obj/item/circuitboard/machine/reagentgrinder = 5,
- /obj/item/circuitboard/machine/recharger = 5,
- /obj/item/circuitboard/machine/seed_extractor = 5,
- /obj/item/circuitboard/machine/selling_pad = 5,
- /obj/item/circuitboard/machine/emitter = 5,
- )
-
-/obj/effect/spawner/lootdrop/random_machine_circuit_rare
- loot = list(
- /obj/item/circuitboard/aicore = 5,
- /obj/item/circuitboard/machine/chem_dispenser = 5,
- /obj/item/circuitboard/machine/circuit_imprinter = 5,
- /obj/item/circuitboard/machine/protolathe = 5,
- /obj/item/circuitboard/machine/clonepod/experimental = 5,
- /obj/item/circuitboard/machine/rad_collector = 5,
- /obj/item/circuitboard/machine/launchpad = 5,
- )
-
-/obj/effect/spawner/lootdrop/random_machine_circuit_mech
- loot = list(
- /obj/item/circuitboard/mecha/ripley/main = 100,
- /obj/item/circuitboard/mecha/ripley/peripherals = 100,
- /obj/item/circuitboard/mecha/honker/main = 5,
- /obj/item/circuitboard/mecha/honker/peripherals = 5,
- /obj/item/circuitboard/mecha/odysseus/main = 5,
- /obj/item/circuitboard/mecha/odysseus/peripherals = 5,
- /obj/item/circuitboard/mecha/gygax/main = 1,
- /obj/item/circuitboard/mecha/gygax/peripherals = 1,
- /obj/item/circuitboard/mecha/gygax/targeting = 1,
- /obj/item/circuitboard/mecha/durand/main = 1,
- /obj/item/circuitboard/mecha/durand/peripherals = 1,
- /obj/item/circuitboard/mecha/durand/targeting = 1,
- )
-
-//COMPUTER
-/obj/effect/spawner/lootdrop/random_computer_circuit_common
- loot = list(
- /obj/item/circuitboard/computer/aifixer = 5,
- /obj/item/circuitboard/computer/arcade/amputation = 5,
- /obj/item/circuitboard/computer/arcade/battle = 5,
- /obj/item/circuitboard/computer/arcade/orion_trail = 5,
- /obj/item/circuitboard/computer/atmos_alert = 5,
- /obj/item/circuitboard/computer/card = 5,
- /obj/item/circuitboard/computer/cloning = 5,
- /obj/item/circuitboard/computer/communications = 5,
- /obj/item/circuitboard/computer/launchpad_console = 5,
- /obj/item/circuitboard/computer/mech_bay_power_console = 5,
- /obj/item/circuitboard/computer/pandemic = 5,
- /obj/item/circuitboard/computer/powermonitor/secret = 5,
- /obj/item/circuitboard/computer/prototype_cloning = 5,
- /obj/item/circuitboard/computer/stationalert = 5,
- /obj/item/circuitboard/computer/xenobiology = 5,
- /obj/item/circuitboard/computer/teleporter = 5,
- /obj/item/circuitboard/computer/operating = 5,
- /obj/item/circuitboard/computer/crew = 5,
- /obj/item/circuitboard/computer/scan_consolenew = 5,
- )
-
-/obj/effect/spawner/lootdrop/random_computer_circuit_rare
- loot = list(
- /obj/item/circuitboard/computer/cargo/express = 5,
- /obj/item/circuitboard/computer/communications = 5,
- /obj/item/circuitboard/computer/shuttle/helm = 5,
- /obj/item/circuitboard/computer/med_data = 5,
- )
-
-//DESTRUCTIVE ANAL //i'm killing you
-/obj/effect/spawner/lootdrop/destructive_anal_loot //what do people usually put in these things anayways
- loot = list(
- /obj/item/storage/toolbox/syndicate/empty = 650,
- /obj/item/gun/ballistic/automatic/pistol/syndicate = 500,
- /obj/item/camera_bug = 500,
- /obj/item/clothing/gloves/combat = 200,
- /obj/item/clothing/head/chameleon = 200,
- /obj/item/pen/sleepy = 200,
- /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 100,
-
- /obj/item/grenade/c4 = 100,
-
- /obj/item/wrench/syndie = 30,
- /obj/item/screwdriver/nuke = 30,
- /obj/item/crowbar/syndie = 30,
- /obj/item/wirecutters/syndie = 30,
- /obj/item/multitool/syndie = 30,
- )
diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm
index 475f2e00bcb..5165e9ed649 100644
--- a/code/game/objects/structures/showcase.dm
+++ b/code/game/objects/structures/showcase.dm
@@ -69,14 +69,14 @@
icon_state = "showcase_7"
/obj/structure/showcase/mecha/marauder
- name = "combat mech exhibit"
- desc = "A stand with an empty old Nanotrasen Corporation combat mech bolted to it. It is described as the premier unit used to defend corporate interests and employees."
+ name = "combat exosuit exhibit"
+ desc = "A stand with an empty old Nanotrasen Corporation combat exosuit bolted to it. It is described as the premier unit used to defend corporate interests and employees."
icon = 'icons/mecha/mecha.dmi'
icon_state = "marauder"
/obj/structure/showcase/mecha/ripley
- name = "construction mech exhibit"
- desc = "A stand with a retired construction mech bolted to it. The clamps are rated at 9300PSI. It seems to be falling apart."
+ name = "construction exosuit exhibit"
+ desc = "A stand with a retired construction exosuit bolted to it. The clamps are rated at 9300PSI. It seems to be falling apart."
icon = 'icons/mecha/mecha.dmi'
icon_state = "firefighter"
diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
index 16cf7af6ce8..b7c6285d796 100644
--- a/code/game/objects/structures/shower.dm
+++ b/code/game/objects/structures/shower.dm
@@ -134,11 +134,11 @@
if(current_temperature == SHOWER_FREEZING)
if(iscarbon(L))
- C.adjust_bodytemperature(-80, 80)
+ C.adjust_bodytemperature(-5, 280)
to_chat(L, "[src] is freezing!")
else if(current_temperature == SHOWER_BOILING)
if(iscarbon(L))
- C.adjust_bodytemperature(35, 0, 500)
+ C.adjust_bodytemperature(5, 0, 350)
L.adjustFireLoss(5)
to_chat(L, "[src] is searing!")
diff --git a/code/game/objects/structures/signs/signs_flags.dm b/code/game/objects/structures/signs/signs_flags.dm
index 415bce3bf6f..48eb38cafa3 100644
--- a/code/game/objects/structures/signs/signs_flags.dm
+++ b/code/game/objects/structures/signs/signs_flags.dm
@@ -43,6 +43,12 @@
icon_state = "flag_suns"
item_flag = /obj/item/sign/flag/suns
+/obj/structure/sign/flag/ngr
+ name = "\improper New Gorlexian flag"
+ desc = "The New Gorlex Republic's colors: Red for the martyrs of Old Gorlex, Black for the endless Frontier, and tan for the sands of New Gorlex."
+ icon_state = "flag_ngr"
+ item_flag = /obj/item/sign/flag/ngr
+
// ITEM FLAGS - THE THINGS YOU HOLD AND PLACE
/obj/item/sign/flag
@@ -63,3 +69,9 @@
desc = "A folded up purple Flag. Something about this flag makes you think of chemistry."
icon_state = "folded_suns"
sign_path = /obj/structure/sign/flag/suns
+
+/obj/item/sign/flag/ngr
+ name = "folded New Gorlexian flag"
+ desc = "A folded up NGR flag. Something about this flag makes you think of explosives."
+ icon_state = "folded_ngr"
+ sign_path = /obj/structure/sign/flag/ngr
diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm
deleted file mode 100644
index d44606a1a57..00000000000
--- a/code/game/objects/structures/spawner.dm
+++ /dev/null
@@ -1,153 +0,0 @@
-GLOBAL_LIST_INIT(astroloot, list(
- /obj/item/stack/ore/uranium = 50,
- /obj/item/stack/ore/iron = 50,
- /obj/item/stack/ore/plasma = 75,
- /obj/item/stack/ore/silver = 50,
- /obj/item/stack/ore/gold = 50,
- /obj/item/stack/ore/diamond = 25,
- /obj/item/stack/ore/hellstone = 5,
- /obj/item/stack/ore/titanium = 75,
- /obj/item/pickaxe/diamond = 15,
- /obj/item/borg/upgrade/modkit/cooldown = 5,
- /obj/item/borg/upgrade/modkit/damage = 5,
- /obj/item/borg/upgrade/modkit/range = 5,
- /obj/item/t_scanner/adv_mining_scanner/lesser = 15,
- /obj/item/kinetic_crusher = 15,
- /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 25,
- /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 25,
- /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 25,
- /obj/item/tank/jetpack/suit = 10,
- /obj/item/survivalcapsule = 15,
- /obj/item/reagent_containers/hypospray/medipen/survival = 15,
- /obj/item/gps/mining = 10,
- /obj/item/extraction_pack = 10,
- /obj/item/reagent_containers/food/drinks/beer = 15,
- ))
-
-/obj/structure/spawner
- name = "monster nest"
- icon = 'icons/mob/nest.dmi'
- icon_state = "hole"
- max_integrity = 100
-
- move_resist = MOVE_FORCE_EXTREMELY_STRONG
- anchored = TRUE
- density = TRUE
-
- var/max_mobs = 5
- var/spawn_time = 300 //30 seconds default
- var/mob_types = list(/mob/living/simple_animal/hostile/carp)
- var/spawn_text = "emerges from"
- var/faction = list("hostile")
- var/spawn_sound = list('sound/effects/break_stone.ogg')
- var/spawner_type = /datum/component/spawner
- var/spawn_distance_min = 1
- var/spawn_distance_max = 1
-
-/obj/structure/spawner/Initialize()
- . = ..()
- AddComponent(spawner_type, mob_types, spawn_time, faction, spawn_text, max_mobs, spawn_sound, spawn_distance_min, spawn_distance_max)
-
-/obj/structure/spawner/attack_animal(mob/living/simple_animal/M)
- if(faction_check(faction, M.faction, FALSE)&&!M.client)
- return
- ..()
-
-
-/obj/structure/spawner/syndicate
- name = "warp beacon"
- icon = 'icons/obj/device.dmi'
- icon_state = "syndbeacon"
- spawn_text = "warps in from"
- mob_types = list(/mob/living/simple_animal/hostile/human/syndicate/ranged)
- faction = list(ROLE_SYNDICATE)
-
-/obj/structure/spawner/skeleton
- name = "bone pit"
- desc = "A pit full of bones, and some still seem to be moving..."
- max_integrity = 150
- max_mobs = 15
- spawn_time = 150
- mob_types = list(/mob/living/simple_animal/hostile/human/skeleton)
- spawn_text = "climbs out of"
- faction = list("skeleton")
-
-/obj/structure/spawner/clown
- name = "Laughing Larry"
- desc = "A laughing, jovial figure. Something seems stuck in his throat."
- icon_state = "clownbeacon"
- icon = 'icons/obj/device.dmi'
- max_integrity = 200
- max_mobs = 15
- spawn_time = 150
- mob_types = list(/mob/living/simple_animal/hostile/retaliate/clown, /mob/living/simple_animal/hostile/retaliate/clown/fleshclown, /mob/living/simple_animal/hostile/retaliate/clown/clownhulk, /mob/living/simple_animal/hostile/retaliate/clown/longface, /mob/living/simple_animal/hostile/retaliate/clown/clownhulk/chlown, /mob/living/simple_animal/hostile/retaliate/clown/clownhulk/honcmunculus, /mob/living/simple_animal/hostile/retaliate/clown/mutant/blob, /mob/living/simple_animal/hostile/retaliate/clown/banana, /mob/living/simple_animal/hostile/retaliate/clown/honkling, /mob/living/simple_animal/hostile/retaliate/clown/lube)
- spawn_text = "climbs out of"
- faction = list("clown")
-
-/obj/structure/spawner/carp
- name = "carp spawn" //the non game spawn meaning
- desc = "A puddle, which appears to be full of carp"
- icon_state = "puddle"
- icon = 'icons/obj/watercloset.dmi'
- max_integrity = 150
- max_mobs = 5
- spawn_time = 1200
- mob_types = list(/mob/living/simple_animal/hostile/carp)
- spawn_text = "climbs out of"
- faction = list("carp")
-
-/obj/structure/spawner/mining/proc/adestroy_effect()
- playsound(loc,'sound/effects/explosionfar.ogg', 200, TRUE)
- visible_message("[src] collapses, sealing everything inside!\nOres fall out of the cave as it is destroyed!")
-
-/obj/structure/spawner/mining
- name = "monster den"
- desc = "A hole dug into the ground, harboring all kinds of monsters found within most caves or mining asteroids."
- max_mobs = 3
- spawn_text = "crawls out of"
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/goldgrub, /mob/living/simple_animal/hostile/asteroid/goliath, /mob/living/simple_animal/hostile/asteroid/hivelord, /mob/living/simple_animal/hostile/asteroid/basilisk, /mob/living/simple_animal/hostile/asteroid/fugu)
- faction = list("mining")
- density = 0
-
-/obj/structure/spawner/mining/deconstruct(disassembled)
- adestroy_effect()
- drop_astroloot()
- return ..()
-
-/obj/structure/spawner/mining/proc/drop_astroloot()
- for(var/type in GLOB.astroloot)
- var/chance = GLOB.astroloot[type]
- if(!prob(chance))
- continue
- new type(loc, rand(5, 17))
-
-/obj/structure/spawner/mining/goldgrub
- name = "goldgrub den"
- desc = "A den housing a nest of goldgrubs, annoying but arguably much better than anything else you'll find in a nest."
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/goldgrub)
-
-/obj/structure/spawner/mining/goliath
- name = "goliath den"
- desc = "A den housing a nest of goliaths, oh god why?"
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/goliath)
-
-/obj/structure/spawner/mining/hivelord
- name = "hivelord den"
- desc = "A den housing a nest of hivelords."
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord)
-
-/obj/structure/spawner/mining/basilisk
- name = "basilisk den"
- desc = "A den housing a nest of basilisks, bring a coat."
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk)
-
-/obj/structure/spawner/mining/wumborian
- name = "wumborian fugu den"
- desc = "A den housing a nest of wumborian fugus, how do they all even fit in there?"
- mob_types = list(/mob/living/simple_animal/hostile/asteroid/fugu)
-
-/obj/structure/spawner/mining/carp
- name = "carp den"
- desc = "A den housing a nest of space carp, seems fishy!"
- mob_types = list(/mob/living/simple_animal/hostile/carp)
- spawn_text = "emerges from"
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 9f51ba34476..4d9b3b783ce 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -62,11 +62,6 @@
desc = "This is a grand statue of a Nuclear Explosive. It has a sickening green colour."
icon_state = "nuke"
-/obj/structure/statue/uranium/eng
- name = "Statue of an engineer"
- desc = "This statue has a sickening green colour."
- icon_state = "eng"
-
/obj/structure/statue/uranium/attackby(obj/item/W, mob/user, params)
radiate()
return ..()
@@ -93,168 +88,6 @@
return
return
-////////////////////////////plasma///////////////////////////////////////////////////////////////////////
-
-/obj/structure/statue/plasma
- max_integrity = 200
- material_drop_type = /obj/item/stack/sheet/mineral/plasma
- impressiveness = 20
- desc = "This statue is suitably made from plasma."
-
-/obj/structure/statue/plasma/scientist
- name = "statue of a scientist"
- icon_state = "sci"
-
-/obj/structure/statue/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- if(exposed_temperature > 300)
- PlasmaBurn(exposed_temperature)
-
-
-/obj/structure/statue/plasma/bullet_act(obj/projectile/Proj)
- var/burn = FALSE
- if(!(Proj.nodamage) && Proj.damage_type == BURN && !QDELETED(src))
- burn = TRUE
- if(burn)
- var/turf/T = get_turf(src)
- if(Proj.firer)
- message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(Proj.firer)] in [ADMIN_VERBOSEJMP(T)]")
- log_game("Plasma statue ignited by [key_name(Proj.firer)] in [AREACOORD(T)]")
- else
- message_admins("Plasma statue ignited by [Proj]. No known firer, in [ADMIN_VERBOSEJMP(T)]")
- log_game("Plasma statue ignited by [Proj] in [AREACOORD(T)]. No known firer.")
- PlasmaBurn(2500)
- . = ..()
-
-/obj/structure/statue/plasma/attackby(obj/item/W, mob/user, params)
- if(W.get_temperature() > 300 && !QDELETED(src))//If the temperature of the object is over 300, then ignite
- var/turf/T = get_turf(src)
- message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
- log_game("Plasma statue ignited by [key_name(user)] in [AREACOORD(T)]")
- ignite(W.get_temperature())
- else
- return ..()
-
-/obj/structure/statue/plasma/proc/PlasmaBurn(exposed_temperature)
- if(QDELETED(src))
- return
- atmos_spawn_air("plasma=[oreAmount*10];TEMP=[exposed_temperature]")
- deconstruct(FALSE)
-
-/obj/structure/statue/plasma/proc/ignite(exposed_temperature)
- if(exposed_temperature > 300)
- PlasmaBurn(exposed_temperature)
-
-//////////////////////gold///////////////////////////////////////
-
-/obj/structure/statue/gold
- max_integrity = 300
- material_drop_type = /obj/item/stack/sheet/mineral/gold
- impressiveness = 25
- desc = "This is a highly valuable statue made from gold."
-
-/obj/structure/statue/gold/hos
- name = "statue of the head of security"
- icon_state = "hos"
-
-/obj/structure/statue/gold/head_of_personnel
- name = "statue of the head of personnel"
- icon_state = "hop"
-
-/obj/structure/statue/gold/cmo
- name = "statue of the chief medical officer"
- icon_state = "cmo"
-
-/obj/structure/statue/gold/ce
- name = "statue of the chief engineer"
- icon_state = "ce"
-
-/obj/structure/statue/gold/rd
- name = "statue of the research director"
- icon_state = "rd"
-
-//////////////////////////silver///////////////////////////////////////
-
-/obj/structure/statue/silver
- max_integrity = 300
- material_drop_type = /obj/item/stack/sheet/mineral/silver
- impressiveness = 25
- desc = "This is a valuable statue made from silver."
-
-/obj/structure/statue/silver/md
- name = "statue of a medical officer"
- icon_state = "md"
-
-/obj/structure/statue/silver/janitor
- name = "statue of a janitor"
- icon_state = "jani"
-
-/obj/structure/statue/silver/sec
- name = "statue of a security officer"
- icon_state = "sec"
-
-/obj/structure/statue/silver/secborg
- name = "statue of a security cyborg"
- icon_state = "secborg"
-
-/obj/structure/statue/silver/medborg
- name = "statue of a medical cyborg"
- icon_state = "medborg"
-
-/////////////////////////diamond/////////////////////////////////////////
-
-/obj/structure/statue/diamond
- max_integrity = 1000
- material_drop_type = /obj/item/stack/sheet/mineral/diamond
- impressiveness = 50
- desc = "This is a very expensive diamond statue."
-
-/obj/structure/statue/diamond/captain
- name = "statue of THE captain."
- icon_state = "cap"
-
-/obj/structure/statue/diamond/ai1
- name = "statue of the AI hologram."
- icon_state = "ai1"
-
-/obj/structure/statue/diamond/ai2
- name = "statue of the AI core."
- icon_state = "ai2"
-
-////////////////////////bananium///////////////////////////////////////
-
-/obj/structure/statue/bananium
- max_integrity = 300
- material_drop_type = /obj/item/stack/sheet/mineral/hidden/hellstone
- impressiveness = 50
- desc = "A bananium statue with a small engraving:'HOOOOOOONK'."
- var/spam_flag = 0
-
-/obj/structure/statue/bananium/clown
- name = "statue of a clown"
- icon_state = "clown"
-
-/obj/structure/statue/bananium/Bumped(atom/movable/AM)
- honk()
- ..()
-
-/obj/structure/statue/bananium/attackby(obj/item/W, mob/user, params)
- honk()
- return ..()
-
-/obj/structure/statue/bananium/attack_hand(mob/user)
- honk()
- . = ..()
-
-/obj/structure/statue/bananium/attack_paw(mob/user)
- honk()
- ..()
-
-/obj/structure/statue/bananium/proc/honk()
- if(!spam_flag)
- spam_flag = TRUE
- playsound(src.loc, 'sound/items/bikehorn.ogg', 50, TRUE)
- addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), 2 SECONDS)
-
/////////////////////sandstone/////////////////////////////////////////
/obj/structure/statue/sandstone
@@ -262,12 +95,6 @@
material_drop_type = /obj/item/stack/sheet/mineral/sandstone
impressiveness = 15
-/obj/structure/statue/sandstone/assistant
- name = "statue of an assistant"
- desc = "A cheap statue of sandstone for a greyshirt."
- icon_state = "assist"
-
-
/obj/structure/statue/sandstone/venus //call me when we add marble i guess
name = "statue of a pure maiden"
desc = "An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a toolbox. By Jove, it's easily the most gorgeous depiction of a woman you've ever seen. The artist must truly be a master of his craft. Shame about the broken arm, though."
@@ -290,12 +117,30 @@
desc = "Looks like that weird kid with the tiger plushie has been round here again."
icon_state = "snowlegion"
-///////////////////////////////bronze///////////////////////////////////
+/// bone
+/obj/structure/statue/bone
+ anchored = TRUE
+ max_integrity = 120
+ material_drop_type = /obj/item/stack/sheet/bone
+ impressiveness = 18 // Carved from the bones of a massive creature, it's going to be a specticle to say the least
+ layer = ABOVE_ALL_MOB_LAYER
+
+/obj/structure/statue/bone/rib
+ name = "collosal rib"
+ desc = "It's staggering to think that something this big could have lived, let alone died."
+ oreAmount = 4
+ icon = 'icons/obj/statuelarge.dmi'
+ icon_state = "rib"
-/obj/structure/statue/bronze
- material_drop_type = /obj/item/stack/tile/bronze
+/obj/structure/statue/bone/skull
+ name = "collosal skull"
+ desc = "The gaping maw of a dead, titanic monster."
+ oreAmount = 12
+ icon = 'icons/obj/statuelarge.dmi'
+ icon_state = "skull"
-/obj/structure/statue/bronze/marx
- name = "\improper Karl Marx bust"
- desc = "A bust depicting a certain 19th century economist. You get the feeling a specter is haunting the sector."
- icon_state = "marx"
+/obj/structure/statue/bone/skull/half
+ desc = "The gaping maw of a dead, titanic monster. This one is cracked in half."
+ oreAmount = 6
+ icon = 'icons/obj/statuelarge.dmi'
+ icon_state = "skull-half"
diff --git a/code/game/objects/structures/table_flipped.dm b/code/game/objects/structures/table_flipped.dm
index c006695a7df..8caa87b984a 100644
--- a/code/game/objects/structures/table_flipped.dm
+++ b/code/game/objects/structures/table_flipped.dm
@@ -7,6 +7,7 @@
density = TRUE
layer = ABOVE_MOB_LAYER
opacity = FALSE
+ pass_flags_self = LETPASSTHROW
var/table_type = /obj/structure/table
/obj/structure/flippedtable/Initialize()
@@ -17,10 +18,22 @@
AddElement(/datum/element/connect_loc, loc_connections)
+/obj/structure/flippedtable/examine(mob/user)
+ . = ..()
+ . += span_notice("You could right the [name] by control shift-clicking it.")
+
+/obj/structure/flippedtable/proc/check_dir()
+ if(dir == NORTHEAST || dir == SOUTHEAST)
+ return EAST
+ if(dir == NORTHWEST || dir == SOUTHWEST)
+ return WEST
+ return dir
+
/obj/structure/flippedtable/CanAllowThrough(atom/movable/mover, turf/target)
. = ..()
- var/attempted_dir = get_dir(loc, target)
- if(table_type == /obj/structure/table/glass) //Glass table, jolly ranchers pass
+ var/table_dir = check_dir()
+ var/attempted_dir = get_dir(loc, mover)
+ if(table_type == /obj/structure/table/glass) //Glass table, lasers can pass
if(istype(mover) && (mover.pass_flags & PASSGLASS))
return TRUE
if(istype(mover, /obj/projectile))
@@ -29,20 +42,22 @@
if(proj_obj.trajectory && angle2dir_cardinal(proj_obj.trajectory.angle) == dir)
return TRUE
return FALSE
- return attempted_dir != dir
+ return attempted_dir != table_dir
/obj/structure/flippedtable/proc/on_exit(datum/source, atom/movable/exiter, direction)
SIGNAL_HANDLER
-
+ var/table_dir = check_dir()
if(exiter == src)
return // Let's not block ourselves.
- if(table_type == /obj/structure/table/glass) //Glass table, jolly ranchers pass
+ if(table_type == /obj/structure/table/glass) //Glass table, lasers pass
if(istype(exiter) && (exiter.pass_flags & PASSGLASS))
return
if(istype(exiter, /obj/projectile))
return
- if(direction == dir)
+ if(istype(exiter, /obj/item))
+ return
+ if(direction == table_dir)
exiter.Bump(src)
return COMPONENT_ATOM_BLOCK_EXIT
return
@@ -51,10 +66,10 @@
. = ..()
if(!istype(user) || !user.can_interact_with(src))
return FALSE
- user.visible_message("[user] starts flipping [src]!", "You start flipping over the [src]!")
+ user.visible_message(span_danger("[user] starts flipping [src]!"), span_notice("You start flipping over the [src]!"))
if(do_after(user, max_integrity/4))
var/obj/structure/table/table_unflip = new table_type(src.loc)
table_unflip.obj_integrity = obj_integrity
- user.visible_message("[user] flips over the [src]!", "You flip over the [src]!")
+ user.visible_message(span_danger("[user] flips over the [src]!"), span_notice("You flip over the [src]!"))
playsound(src, 'sound/items/trayhit2.ogg', 100)
qdel(src)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 4ebd416675b..6f1e59ebad5 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -162,7 +162,7 @@
/obj/structure/table/attackby(obj/item/I, mob/user, params)
var/list/modifiers = params2list(params)
if(!(flags_1 & NODECONSTRUCT_1) && user.a_intent != INTENT_HELP)
- if(I.tool_behaviour == TOOL_SCREWDRIVER && deconstruction_ready)
+ if((I.tool_behaviour == TOOL_SCREWDRIVER) && deconstruction_ready)
to_chat(user, "You start disassembling [src]...")
if(I.use_tool(src, user, 20, volume=50))
deconstruct(TRUE)
@@ -227,6 +227,15 @@
else
return ..()
+/obj/structure/table/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if (I.use_tool(src, user, 1 SECONDS, volume=0))
+ to_chat(user, span_warning("You cut [src] into sheets."))
+ deconstruct(wrench_disassembly = TRUE)
+ return TRUE
+
/obj/structure/table/proc/AfterPutItemOnTable(obj/item/I, mob/living/user)
return
@@ -672,15 +681,20 @@
step(O, get_dir(O, src))
/obj/structure/rack/attackby(obj/item/W, mob/user, params)
+ var/list/modifiers = params2list(params)
if (W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1) && user.a_intent != INTENT_HELP)
W.play_tool_sound(src)
deconstruct(TRUE)
return
if(user.a_intent == INTENT_HARM)
return ..()
- if(user.transferItemToLoc(W, drop_location()))
- W.pixel_x = pick(9,0,-9)
- W.pixel_y = pick(10,1)
+ if(user.transferItemToLoc(W, drop_location(), silent = FALSE))
+ //Center the icon where the user clicked.
+ if(!LAZYACCESS(modifiers, ICON_X) || !LAZYACCESS(modifiers, ICON_Y))
+ return
+ //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
+ W.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size/2), world.icon_size/2)
+ W.pixel_y = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2)
return TRUE
/obj/structure/rack/attack_paw(mob/living/user)
@@ -692,9 +706,13 @@
return
if(user.body_position == LYING_DOWN || user.usable_legs < 2)
return
+
+ if(user.a_intent != INTENT_HARM)
+ to_chat(user, span_danger("You aren't HARMFUL enough to beat the rack."))
+ return
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
- user.visible_message("[user] kicks [src].", null, null, COMBAT_MESSAGE_RANGE)
+ user.visible_message(span_danger("[user] kicks [src]."), null, null, COMBAT_MESSAGE_RANGE)
take_damage(rand(4,8), BRUTE, "melee", 1)
/obj/structure/rack/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
@@ -726,7 +744,6 @@
/obj/item/rack_parts
name = "rack parts"
desc = "Parts of a rack."
- icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "rack_parts"
flags_1 = CONDUCT_1
custom_materials = list(/datum/material/iron=2000)
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 1be5f857e15..c0604dd5e09 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -28,10 +28,10 @@
/obj/structure/tank_dispenser/update_overlays()
. = ..()
switch(oxygentanks)
- if(1 to 3)
+ if(1 to 4)
. += "oxygen-[oxygentanks]"
- if(4 to TANK_DISPENSER_CAPACITY)
- . += "oxygen-4"
+ if(5 to TANK_DISPENSER_CAPACITY)
+ . += "oxygen-5"
switch(plasmatanks)
if(1 to 4)
. += "plasma-[plasmatanks]"
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 4c6c3173cde..9649812f40f 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -116,7 +116,7 @@
/obj/structure/trap/chill/trap_effect(mob/living/L)
to_chat(L, "You're frozen solid!")
L.Paralyze(20)
- L.adjust_bodytemperature(-300)
+ L.adjust_bodytemperature(-20)
L.apply_status_effect(/datum/status_effect/freon)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index c22858ea591..da3f85da379 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -214,11 +214,10 @@
exposed = !exposed
return TRUE
-
/obj/item/reagent_containers/food/snacks/urinalcake
name = "urinal cake"
desc = "The noble urinal cake, protecting the people's pipes from the people's pee. Edibility is suggested to be low."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "urinalcake"
w_class = WEIGHT_CLASS_TINY
list_reagents = list(/datum/reagent/chlorine = 3, /datum/reagent/ammonia = 1)
@@ -397,6 +396,49 @@
icon_state = "puddle"
resistance_flags = UNACIDABLE
+//***Oil well puddles.
+/obj/structure/sink/oil_well
+ name = "oil well"
+ desc = "A bubbling pool of oil.This would probably be valuable, had bluespace technology not destroyed the need for fossil fuels 200 years ago."
+ icon = 'icons/obj/watercloset.dmi'
+ icon_state = "puddle-oil"
+ dispensedreagent = /datum/reagent/fuel/oil
+
+/obj/structure/sink/oil_well/Initialize()
+ .=..()
+ create_reagents(20)
+ reagents.add_reagent(dispensedreagent, 20)
+
+/obj/structure/sink/oil_well/attack_hand(mob/M)
+ flick("puddle-oil-splash",src)
+ reagents.expose(M, TOUCH, 20) //Covers target in 20u of oil.
+ to_chat(M, "You touch the pool of oil, only to get oil all over yourself. It would be wise to wash this off with water.")
+
+/obj/structure/sink/oil_well/attackby(obj/item/O, mob/user, params)
+ flick("puddle-oil-splash",src)
+ if(O.tool_behaviour == TOOL_SHOVEL && !(flags_1&NODECONSTRUCT_1)) //attempt to deconstruct the puddle with a shovel
+ to_chat(user, "You fill in the oil well with soil.")
+ O.play_tool_sound(src)
+ deconstruct()
+ return 1
+ if(istype(O, /obj/item/reagent_containers)) //Refilling bottles with oil
+ var/obj/item/reagent_containers/RG = O
+ if(RG.is_refillable())
+ if(!RG.reagents.holder_full())
+ RG.reagents.add_reagent(dispensedreagent, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
+ to_chat(user, "You fill [RG] from [src].")
+ return TRUE
+ to_chat(user, "\The [RG] is full.")
+ return FALSE
+ if(user.a_intent != INTENT_HARM)
+ to_chat(user, "You won't have any luck getting \the [O] out if you drop it in the oil.")
+ return 1
+ else
+ return ..()
+
+/obj/structure/sink/oil_well/drop_materials()
+ new /obj/effect/decal/cleanable/oil(loc)
+
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/sink/puddle/attack_hand(mob/M)
icon_state = "puddle-splash"
@@ -435,6 +477,13 @@
/// if it can be seen through when closed
var/opaque_closed = FALSE
+/obj/structure/curtain/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,CALLBACK(src, PROC_REF(can_be_rotated)),null)
+
+/obj/structure/curtain/proc/can_be_rotated(mob/user, rotation_type)
+ return !anchored
+
/obj/structure/curtain/proc/toggle()
open = !open
if(open)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 49c3823cf1c..308d5e120f7 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -27,11 +27,15 @@
var/real_explosion_block //ignore this, just use explosion_block
var/breaksound = "shatter"
var/hitsound = 'sound/effects/Glasshit.ogg'
+ var/decon_time = 3 SECONDS
flags_ricochet = RICOCHET_HARD
ricochet_chance_mod = 0.4
hitsound_type = PROJECTILE_HITSOUND_GLASS
+ /// If some inconsiderate jerk has had their blood spilled on this window, thus making it cleanable
+ var/bloodied = FALSE
+
/obj/structure/window/examine(mob/user)
. = ..()
if(flags_1 & NODECONSTRUCT_1)
@@ -286,6 +290,15 @@
qdel(src)
update_nearby_icons()
+/obj/structure/window/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if (I.use_tool(src, user, decon_time, volume=100))
+ to_chat(user, span_warning("You shatter [src] with the [I]."))
+ deconstruct(FALSE)
+ return TRUE
+
/obj/structure/window/proc/spawnDebris(location)
. = list()
. += new /obj/item/shard(location)
@@ -396,6 +409,7 @@
glass_type = /obj/item/stack/sheet/rglass
rad_insulation = RAD_HEAVY_INSULATION
ricochet_chance_mod = 0.8
+ decon_time = 6 SECONDS
//this is shitcode but all of construction is shitcode and needs a refactor, it works for now
//If you find this like 4 years later and construction still hasn't been refactored, I'm so sorry for this
@@ -405,7 +419,7 @@
switch(state)
if(RWINDOW_SECURE)
- if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HARM)
+ if((I.tool_behaviour == TOOL_WELDER) && user.a_intent == INTENT_HARM)
user.visible_message("[user] holds \the [I] to the security screws on \the [src]...",
"You begin heating the security screws on \the [src]...")
if(I.use_tool(src, user, 150, volume = 100))
@@ -528,6 +542,7 @@
damage_deflection = 11 //WS Edit - Weakens R-Windows
explosion_block = 2
glass_type = /obj/item/stack/sheet/plasmarglass
+ decon_time = 15 SECONDS
//entirely copypasted code
//take this out when construction is made a component or otherwise modularized in some way
@@ -743,11 +758,21 @@
glass_type = /obj/item/stack/sheet/plastitaniumglass
glass_amount = 2
rad_insulation = RAD_HEAVY_INSULATION
+ decon_time = 10 SECONDS
/obj/structure/window/plasma/reinforced/plastitanium/unanchored
anchored = FALSE
state = WINDOW_OUT_OF_FRAME
+/obj/structure/window/plasma/reinforced/plastitanium/spawnDebris(location)
+ . = list()
+ . += new /obj/item/shard/plastitanium(location)
+ . += new /obj/effect/decal/cleanable/glass/plastitanium(location)
+ if (reinf)
+ . += new /obj/item/stack/rods(location, (fulltile ? 2 : 1))
+ if (fulltile)
+ . += new /obj/item/shard/plastitanium(location)
+
/obj/structure/window/paperframe
name = "paper frame"
desc = "A fragile separator made of thin wood and paper."
diff --git a/code/game/say.dm b/code/game/say.dm
index 2d53eea65e7..bfa9d35ac5b 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -9,14 +9,11 @@ GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_INTEQ]" = "irmgradio",
"[FREQ_PGF]" = "pgfradio",
"[FREQ_PIRATE]" = "pirradio",
- "[FREQ_COMMAND]" = "comradio",
- "[FREQ_AI_PRIVATE]" = "aiprivradio",
+ "[FREQ_EMERGENCY]" = "emrgradio",
"[FREQ_SYNDICATE]" = "syndradio",
"[FREQ_CENTCOM]" = "centcomradio",
- "[FREQ_SOLGOV]" = "solgovradio", //WS Edit - SolGov Rep
- "[FREQ_WIDEBAND]" = "widebandradio", //WS Edit - Overmaps
- "[FREQ_CTF_RED]" = "redteamradio",
- "[FREQ_CTF_BLUE]" = "blueteamradio"
+ "[FREQ_SOLGOV]" = "solgovradio",
+ "[FREQ_WIDEBAND]" = "widebandradio",
))
GLOBAL_LIST_INIT(freqcolor, list())
@@ -72,7 +69,7 @@ GLOBAL_LIST_INIT(freqcolor, list())
namepart = "[known_name]"
else
var/mob/living/carbon/human/human_narrator = reliable_narrator
- namepart = "[human_narrator.get_generic_name(prefixed = TRUE, lowercase = FALSE)]"
+ namepart = "[human_narrator.get_generic_name(prefixed = TRUE, lowercase = TRUE)]"
//End name span.
var/endspanpart = ""
diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
index 2b7d93ae259..ea0c0d4ed4b 100644
--- a/code/game/turfs/closed/_closed.dm
+++ b/code/game/turfs/closed/_closed.dm
@@ -7,8 +7,88 @@
rad_insulation = RAD_MEDIUM_INSULATION
pass_flags_self = PASSCLOSEDTURF
+ ///lower numbers are harder. Used to determine the probability of a hulk smashing through.
+ var/hardness = 40
+ var/breakdown_duration = 20 //default time it takes for a tool to break the wall
+
+ var/attack_hitsound = 'sound/weapons/smash.ogg'
+ var/break_sound = 'sound/items/welder.ogg'
+ hitsound_type = PROJECTILE_HITSOUND_METAL
+
+ // The wall will ignore damage from weak items, depending on their
+ // force, damage type, tool behavior, and sharpness. This is the minimum
+ // amount of force that a blunt, brute item must have to damage the wall.
+ var/min_dam = 0
+ var/max_integrity = 100
+ var/integrity
+ var/brute_mod = 1
+ var/burn_mod = 1
+ // Projectiles that do extra damage to the wall
+ var/list/extra_dam_proj
+
+ var/mob_smash_flags
+ var/proj_bonus_damage_flags
+
+ var/mutable_appearance/damage_overlay
+ var/damage_visual = 'icons/effects/wall_damage.dmi'
+ var/overlay_layer = BULLET_HOLE_LAYER
+
+ var/list/dent_decals
+
/turf/closed/Initialize(mapload, inherited_virtual_z)
. = ..()
+ if(integrity == null)
+ integrity = max_integrity
+
+/turf/closed/copyTurf(turf/T, copy_air, flags)
+ . = ..()
+ var/turf/closed/wall_copy = T
+ if(LAZYLEN(dent_decals))
+ wall_copy.dent_decals = dent_decals.Copy()
+ wall_copy.update_appearance()
+
+/turf/closed/update_overlays()
+ . = ..()
+ damage_overlay = null
+ var/adj_dam_pct = 1 - (integrity/(max_integrity))
+ if(adj_dam_pct < 0)
+ adj_dam_pct = 0
+ if(!damage_overlay)
+ damage_overlay = mutable_appearance(damage_visual, "cracks", overlay_layer)
+ damage_overlay.alpha = adj_dam_pct*255
+ . += damage_overlay
+ for(var/decal in dent_decals)
+ . += decal
+
+/turf/closed/proc/add_dent(denttype, x=rand(-8, 8), y=rand(-8, 8))
+ if(LAZYLEN(dent_decals) >= MAX_DENT_DECALS)
+ return
+
+ var/mutable_appearance/decal = mutable_appearance('icons/effects/effects.dmi', "", BULLET_HOLE_LAYER)
+ switch(denttype)
+ if(WALL_DENT_SHOT)
+ decal.icon_state = "bullet_hole"
+ if(WALL_DENT_HIT)
+ decal.icon_state = "impact[rand(1, 3)]"
+
+ decal.pixel_x = x
+ decal.pixel_y = y
+ LAZYADD(dent_decals, decal)
+ update_appearance()
+
+/turf/closed/examine(mob/user)
+ . = ..()
+ . += damage_hints(user)
+
+/turf/closed/proc/damage_hints(mob/user)
+ switch(integrity / max_integrity)
+ if(0.5 to 0.99)
+ return "[p_they(TRUE)] look[p_s()] slightly damaged."
+ if(0.25 to 0.5)
+ return "[p_they(TRUE)] appear[p_s()] heavily damaged."
+ if(0 to 0.25)
+ return "[p_theyre(TRUE)] falling apart!"
+ return
/turf/closed/AfterChange()
. = ..()
@@ -17,269 +97,229 @@
/turf/closed/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
return FALSE
-/turf/closed/indestructible
- name = "wall"
- desc = "Effectively impervious to conventional methods of destruction."
- icon = 'icons/turf/walls.dmi'
- explosion_block = 50
-
-/turf/closed/indestructible/TerraformTurf(path, new_baseturf, flags, defer_change = FALSE, ignore_air = FALSE)
- return
-
-/turf/closed/indestructible/acid_act(acidpwr, acid_volume, acid_id)
- return 0
-
-/turf/closed/indestructible/Melt()
- to_be_destroyed = FALSE
- return src
-
-/turf/closed/indestructible/singularity_act()
- return
-
-/turf/closed/indestructible/sandstone
- name = "sandstone wall"
- desc = "A wall with sandstone plating. Rough."
- icon = 'icons/turf/walls/sandstone_wall.dmi'
- icon_state = "sandstone_wall-0"
- base_icon_state = "sandstone_wall"
- baseturfs = /turf/closed/indestructible/sandstone
- smoothing_flags = SMOOTH_BITMASK
-
-/turf/closed/indestructible/splashscreen
- name = "Space Station 13"
- icon = 'icons/blank_title.png'
- icon_state = ""
- layer = SPLASHSCREEN_LAYER
- plane = SPLASHSCREEN_PLANE
- bullet_bounce_sound = null
-
-/turf/closed/indestructible/splashscreen/New()
- SStitle.splash_turf = src
- if(SStitle.icon)
- icon = SStitle.icon
- ..()
-
-/turf/closed/indestructible/splashscreen/vv_edit_var(var_name, var_value)
+/// Damage Code
+
+// negative values reduce integrity, positive values increase integrity.
+// Devastate forces a devestate, safe decon prevents it.
+/turf/closed/proc/alter_integrity(damage, mob/user, devastate = FALSE, safe_decon = FALSE)
+ integrity += damage
+ if(integrity >= max_integrity)
+ integrity = max_integrity
+ if(integrity <= 0)
+ if(safe_decon)
+ dismantle_wall(FALSE, user)
+ return FALSE
+ // if damage put us 50 points or more below 0, and not safe decon we got proper demolished
+ if(integrity <= -50)
+ dismantle_wall(TRUE, user)
+ return FALSE
+ if(devastate)
+ dismantle_wall(TRUE, user)
+ return FALSE
+ dismantle_wall(FALSE,user)
+ return FALSE
+ integrity = min(integrity, max_integrity)
+ update_stats()
+ return integrity
+
+/turf/closed/proc/set_integrity(amount,devastate = FALSE, mob/user)
+ integrity = amount
+ update_stats()
+ if(integrity <= 0)
+ dismantle_wall(devastate, user)
+
+/turf/closed/proc/dismantle_wall(devastate = FALSE, mob/user)
+ for(var/obj/structure/sign/poster/P in src.contents) //Eject contents!
+ P.roll_and_drop(src)
+
+ ScrapeAway()
+
+/turf/closed/proc/update_stats()
+ update_appearance()
+
+/turf/closed/bullet_act(obj/projectile/P)
. = ..()
- if(.)
- switch(var_name)
- if(NAMEOF(src, icon))
- SStitle.icon = icon
-
-
-/turf/closed/indestructible/reinforced
- name = "reinforced wall"
- desc = "A huge chunk of reinforced metal used to separate rooms. Effectively impervious to conventional methods of destruction."
- icon = 'icons/turf/walls/rwalls/reinforced_wall.dmi'
- icon_state = "reinforced_wall-0"
- base_icon_state = "reinforced_wall"
- smoothing_flags = SMOOTH_BITMASK
- smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK)
- canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_AIRLOCK)
-
-/turf/closed/indestructible/titanium
- name = "wall"
- desc = "A light-weight titanium wall used in shuttles. Effectively impervious to conventional methods of destruction."
- icon = 'icons/turf/walls/shuttle_wall.dmi'
- icon_state = "shuttle_wall-0"
- base_icon_state = "shuttle_wall"
- flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
- smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS)
- canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE)
-
-/turf/closed/indestructible/riveted
- icon = 'icons/turf/walls/riveted.dmi'
- icon_state = "riveted-0"
- base_icon_state = "riveted"
- smoothing_flags = SMOOTH_BITMASK
- smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS)
- canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS)
-
-/turf/closed/indestructible/syndicate
- icon = 'icons/turf/walls/plastitanium_wall.dmi'
- icon_state = "plastitanium_wall-0"
- base_icon_state = "plastitanium_wall"
- smoothing_flags = SMOOTH_BITMASK
- smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SYNDICATE_WALLS)
- canSmoothWith = list(SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
-
-/turf/closed/indestructible/riveted/uranium
- icon = 'icons/turf/walls/uranium_wall.dmi'
- icon_state = "uranium_wall-0"
- base_icon_state = "uranium_wall"
- smoothing_flags = SMOOTH_BITMASK
-
-/turf/closed/indestructible/riveted/plastinum
- name = "plastinum wall"
- desc = "A luxurious wall made out of a plasma-platinum alloy. Effectively impervious to conventional methods of destruction."
- icon = 'icons/turf/walls/plastinum_wall.dmi'
- icon_state = "plastinum_wall-0"
- base_icon_state = "plastinum_wall"
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
-
-/turf/closed/indestructible/wood
- icon = 'icons/turf/walls/wood_wall.dmi'
- icon_state = "wood_wall-0"
- base_icon_state = "wood_wall"
- smoothing_flags = SMOOTH_BITMASK
- smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK)
- canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_AIRLOCK)
-
-
-/turf/closed/indestructible/alien
- name = "alien wall"
- desc = "A wall with alien alloy plating."
- icon = 'icons/turf/walls/abductor_wall.dmi'
- icon_state = "abductor_wall-0"
- base_icon_state = "abductor_wall"
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
- smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS)
- canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS)
-
-
-/turf/closed/indestructible/cult
- name = "runed metal wall"
- desc = "A cold metal wall engraved with indecipherable symbols. Studying them causes your head to pound. Effectively impervious to conventional methods of destruction."
- icon = 'icons/turf/walls/cult_wall.dmi'
- icon_state = "cult_wall-0"
- base_icon_state = "cult_wall"
- smoothing_flags = SMOOTH_BITMASK
- smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS)
- canSmoothWith = list(SMOOTH_GROUP_WALLS)
-
-
-/turf/closed/indestructible/abductor
- icon_state = "alien1"
-
-/turf/closed/indestructible/opshuttle
- icon_state = "wall3"
-
-
-/turf/closed/indestructible/fakeglass
- name = "window"
- icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
- icon_state = "fake_window"
- base_icon_state = "reinforced_window"
- opacity = FALSE
- smoothing_flags = SMOOTH_BITMASK
- smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE)
- canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE)
-
-/turf/closed/indestructible/fakeglass/Initialize(mapload, inherited_virtual_z)
+ var/dam = get_proj_damage(P)
+ var/shooter = P.firer
+ if(!dam)
+ return
+ if(P.suppressed != SUPPRESSED_VERY)
+ visible_message("[src] is hit by \a [P]!", null, null, COMBAT_MESSAGE_RANGE)
+ if(!QDELETED(src))
+ add_dent(WALL_DENT_SHOT)
+ alter_integrity(-dam, shooter)
+
+/turf/closed/proc/get_item_damage(obj/item/I, t_min = min_dam)
+ var/dam = I.force
+ if(istype(I, /obj/item/clothing/gloves/gauntlets))
+ dam = 20
+ else if(I.tool_behaviour == TOOL_MINING)
+ dam *= (4/3)
+ else
+ switch(I.damtype)
+ if(BRUTE)
+ if(I.get_sharpness())
+ dam *= 2/3
+ if(BURN)
+ dam *= burn_mod
+ else
+ return 0
+ // if dam is below t_min, then the hit has no effect
+ return (dam < t_min ? 0 : dam)
+
+/turf/closed/proc/get_proj_damage(obj/projectile/P, t_min = min_dam)
+ var/dam = P.damage
+ if(proj_bonus_damage_flags & P.wall_damage_flags)
+ dam = P.wall_damage_override
+ else
+ switch(P.damage_type)
+ if(BRUTE)
+ dam *= brute_mod
+ if(BURN)
+ dam *= burn_mod
+ else
+ return 0
+ // if dam is below t_min, then the hit has no effect
+ return (dam < t_min ? 0 : dam)
+
+/turf/closed/ex_act(severity, target)
+ if(target == src || !density)
+ return ..()
+ switch(severity)
+ if(EXPLODE_DEVASTATE)
+ // SN src = null
+ var/turf/NT = ScrapeAway()
+ NT.contents_explosion(severity, target)
+ return
+ if(EXPLODE_HEAVY)
+ alter_integrity(rand(-500, -800))
+ if(EXPLODE_LIGHT)
+ alter_integrity(rand(-200, -700))
+
+/turf/closed/attack_paw(mob/living/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ return attack_hand(user)
+
+/turf/closed/attack_hand(mob/user)
. = ..()
- underlays += mutable_appearance('icons/obj/structures.dmi', "grille") //add a grille underlay
- underlays += mutable_appearance('icons/turf/floors.dmi', "plating") //add the plating underlay, below the grille
+ if(.)
+ return
+ user.changeNext_move(CLICK_CD_MELEE)
+ to_chat(user, "You push \the [src] but nothing happens!")
+ playsound(src, 'sound/weapons/genhit.ogg', 25, TRUE)
+ add_fingerprint(user)
+
+/turf/closed/attackby(obj/item/W, mob/user, params)
+ user.changeNext_move(CLICK_CD_MELEE)
+ if (!user.IsAdvancedToolUser())
+ to_chat(user, "You don't have the dexterity to do this!")
+ return
+
+ //get the user's location
+ if(!isturf(user.loc))
+ return //can't do this stuff whilst inside objects and such
+
+ add_fingerprint(user)
+
+ var/turf/T = user.loc //get user's location for delay checks
+
+ attack_override(W,user,T)
+ return ..()
+
+/turf/closed/proc/attack_override(obj/item/W, mob/user, turf/loc)
+ if(!isclosedturf(src))
+ return
+ //the istype cascade has been spread among various procs for easy overriding or if we want to call something specific
+ if(try_decon(W, user, loc) || try_destroy(W, user, loc))
+ return
+
+// catch-all for using most items on the closed turf -- attempt to smash
+/turf/closed/proc/try_destroy(obj/item/W, mob/user, turf/T)
+ var/dam = get_item_damage(W)
+ user.do_attack_animation(src)
+ if(!dam)
+ to_chat(user, "[W] isn't strong enough to damage [src]!")
+ playsound(src, 'sound/weapons/tap.ogg', 50, TRUE)
+ return TRUE
+ log_combat(user, src, "attacked", W)
+ user.visible_message("[user] hits [src] with [W]!", \
+ "You hit [src] with [W]!", null, COMBAT_MESSAGE_RANGE)
+ switch(W.damtype)
+ if(BRUTE)
+ playsound(src,attack_hitsound, 100, TRUE)
+ if(BURN)
+ playsound(src, 'sound/items/welder.ogg', 100, TRUE)
+ add_dent(WALL_DENT_HIT)
+ alter_integrity(-dam, user)
+ return TRUE
+/turf/closed/proc/try_decon(obj/item/I, mob/user, turf/T)
+ var/act_duration = breakdown_duration
+ if(I.tool_behaviour == TOOL_WELDER)
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ to_chat(user, "You begin slicing through the outer plating...")
+ while(I.use_tool(src, user, act_duration, volume=50))
+ if(iswallturf(src))
+ to_chat(user, "You slice through some of the outer plating...")
+ if(!alter_integrity(-(I.wall_decon_damage),user,FALSE,TRUE))
+ return TRUE
+ else
+ break
-/turf/closed/indestructible/opsglass
- name = "window"
- icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
- icon_state = "plastitanium_window-0"
- base_icon_state = "plastitanium_window"
- opacity = FALSE
- smoothing_flags = SMOOTH_BITMASK
- smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM)
- canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM)
+ return FALSE
-/turf/closed/indestructible/opsglass/Initialize()
- . = ..()
- icon_state = null
- underlays += mutable_appearance('icons/obj/structures.dmi', "grille")
- underlays += mutable_appearance('icons/turf/floors.dmi', "plating")
-
-/turf/closed/indestructible/fakedoor
- name = "CentCom Access"
- icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
- icon_state = "fakedoor"
-
-/turf/closed/indestructible/rock
- name = "dense rock"
- desc = "An extremely densely-packed rock, most mining tools or explosives would never get through this."
- icon = 'icons/turf/walls/rock_wall.dmi'
- icon_state = "rock_wall-0"
- base_icon_state = "rock_wall"
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER | SMOOTH_CONNECTORS
- smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_MINERAL_WALLS)
- canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS)
- no_connector_typecache = list(/turf/closed/mineral, /turf/closed/indestructible/rock)
- connector_icon = 'icons/turf/connectors/smoothrocks_connector.dmi'
- connector_icon_state = "smoothrocks_connector"
- pixel_x = -4
- pixel_y = -4
-
-/turf/closed/indestructible/rock/snow
- name = "mountainside"
- desc = "Extremely densely-packed sheets of ice and rock, forged over the years of the harsh cold."
- icon = 'icons/turf/walls/icerock_wall.dmi'
- icon_state = "icerock_wall-0"
- base_icon_state = "icerock_wall"
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
- smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_MINERAL_WALLS)
- canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS)
- pixel_x = -4
- pixel_y = -4
- bullet_sizzle = TRUE
- bullet_bounce_sound = null
-
-/turf/closed/indestructible/rock/schist
- name = "schist"
- desc = "Extremely densely-packed layers of schist. Say it ten times fast."
- icon = 'icons/turf/walls/rockwall_icemoon.dmi'
- icon_state = "rockwall_icemoon-0"
- base_icon_state = "rockwall_icemoon"
-
-/turf/closed/indestructible/paper
- name = "thick paper wall"
- desc = "A wall layered with impenetrable sheets of paper."
- icon = 'icons/turf/walls.dmi'
- icon_state = "paperwall"
-
-/turf/closed/indestructible/necropolis
- name = "necropolis wall"
- desc = "A seemingly impenetrable wall."
- icon = 'icons/turf/walls.dmi'
- icon_state = "necro"
- explosion_block = 50
- baseturfs = /turf/closed/indestructible/necropolis
-
-/turf/closed/indestructible/necropolis/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
- underlay_appearance.icon = 'icons/turf/floors.dmi'
- underlay_appearance.icon_state = "necro1"
- return TRUE
+/turf/closed/deconstruct_act(mob/living/user, obj/item/I)
+ var/act_duration = breakdown_duration
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ to_chat(user, "You begin slicing through the outer plating...")
+ while(I.use_tool(src, user, act_duration, volume=100))
+ if(iswallturf(src))
+ to_chat(user, "You slice through some of the outer plating...")
+ if(!alter_integrity(-(I.wall_decon_damage),user,FALSE,TRUE))
+ return TRUE
+ else
+ break
-/turf/closed/indestructible/riveted/boss
- name = "thick stone wall"
- desc = "A thick, seemingly indestructible stone wall."
- icon = 'icons/turf/walls/boss_wall.dmi'
- icon_state = "boss_wall-0"
- base_icon_state = "boss_wall"
- smoothing_flags = SMOOTH_BITMASK
- smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_BOSS_WALLS)
- canSmoothWith = list(SMOOTH_GROUP_BOSS_WALLS)
- explosion_block = 50
- baseturfs = /turf/closed/indestructible/riveted/boss
-
-/turf/closed/indestructible/riveted/boss/see_through
- opacity = FALSE
-
-/turf/closed/indestructible/riveted/boss/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
- underlay_appearance.icon = 'icons/turf/floors.dmi'
- underlay_appearance.icon_state = "basalt"
+ return FALSE
+
+/turf/closed/mech_melee_attack(obj/mecha/M)
+ M.do_attack_animation(src)
+ switch(M.damtype)
+ if(BRUTE)
+ playsound(src, 'sound/weapons/punch4.ogg', 50, TRUE)
+ if(BURN)
+ playsound(src, 'sound/items/welder.ogg', 100, TRUE)
+ if(TOX)
+ playsound(src, 'sound/effects/spray2.ogg', 100, TRUE)
+
+
+ if(prob(hardness + M.force) && M.force > 20)
+ M.visible_message("[M.name] hits [src] with great force!", \
+ "You hit [src] with incredible force!", null, COMBAT_MESSAGE_RANGE)
+ dismantle_wall(TRUE)
+ playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
+ else
+ M.visible_message("[M.name] hits [src]!", \
+ "You hit [src]!", null, COMBAT_MESSAGE_RANGE)
+ alter_integrity(M.force * 20)
+
+/turf/closed/attack_hulk(mob/living/carbon/user)
+ ..()
+ var/obj/item/bodypart/arm = user.hand_bodyparts[user.active_hand_index]
+ if(!arm || arm.bodypart_disabled)
+ return
+ alter_integrity(-250,user)
+ user.visible_message("[user] smashes \the [src]!", \
+ "You smash \the [src]!", \
+ "You hear a booming smash!")
return TRUE
-/turf/closed/indestructible/riveted/hierophant
- name = "wall"
- desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
- icon = 'icons/turf/walls/hierophant_wall.dmi'
- icon_state = "wall"
- smoothing_flags = SMOOTH_CORNERS
- smoothing_groups = list(SMOOTH_GROUP_HIERO_WALL)
- canSmoothWith = list(SMOOTH_GROUP_HIERO_WALL)
-
-/turf/closed/indestructible/blank
- name = "space"
- desc = "It's the end of the world every day, for someone."
- icon = 'icons/turf/space.dmi'
- icon_state = "black"
- explosion_block = 1000 // fuck it, let's go higher
+/turf/closed/attack_animal(mob/living/simple_animal/M)
+ M.changeNext_move(CLICK_CD_MELEE)
+ M.do_attack_animation(src)
+ if((M.environment_smash & mob_smash_flags))
+ playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
+ alter_integrity(-400)
+ return
diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm
new file mode 100644
index 00000000000..9d186868cf5
--- /dev/null
+++ b/code/game/turfs/closed/indestructible.dm
@@ -0,0 +1,314 @@
+/turf/closed/indestructible
+ name = "wall"
+ desc = "Effectively impervious to conventional methods of destruction."
+ icon = 'icons/turf/walls.dmi'
+ explosion_block = 50
+ max_integrity = 10000000
+
+/turf/closed/indestructible/TerraformTurf(path, new_baseturf, flags, defer_change = FALSE, ignore_air = FALSE)
+ return
+
+/turf/closed/indestructible/acid_act(acidpwr, acid_volume, acid_id)
+ return 0
+
+/turf/closed/indestructible/ex_act(severity, target)
+ return
+
+/turf/closed/indestructible/alter_integrity(damage, mob/user, devastate, safe_decon)
+ return FALSE
+
+/turf/closed/indestructible/set_integrity(amount, devastate, mob/user)
+ return
+
+/turf/closed/indestructible/dismantle_wall(devastate, mob/user)
+ return
+
+/turf/closed/indestructible/try_decon(obj/item/I, mob/user, turf/T)
+ return FALSE
+
+/turf/closed/indestructible/try_destroy(obj/item/W, mob/user, turf/T)
+ user.do_attack_animation(src)
+ to_chat(user, "[W] isn't strong enough to damage [src]!")
+ playsound(src, 'sound/weapons/tap.ogg', 50, TRUE)
+ return TRUE
+
+/turf/closed/indestructible/mech_melee_attack(obj/mecha/M)
+ M.do_attack_animation(src)
+ switch(M.damtype)
+ if(BRUTE)
+ playsound(src, 'sound/weapons/punch4.ogg', 50, TRUE)
+ if(BURN)
+ playsound(src, 'sound/items/welder.ogg', 100, TRUE)
+ if(TOX)
+ playsound(src, 'sound/effects/spray2.ogg', 100, TRUE)
+ M.visible_message("[M.name] hits [src] and doesn't even leave a mark!", \
+ "You hit [src] and fail to damage it.", null, COMBAT_MESSAGE_RANGE)
+
+/turf/closed/indestructible/attack_hulk(mob/living/carbon/user)
+ return FALSE
+
+/turf/closed/indestructible/attack_animal(mob/living/simple_animal/M)
+ M.changeNext_move(CLICK_CD_MELEE)
+ M.do_attack_animation(src)
+ return
+
+/turf/closed/indestructible/Melt()
+ to_be_destroyed = FALSE
+ return src
+
+/turf/closed/indestructible/singularity_act()
+ return
+
+/turf/closed/indestructible/sandstone
+ name = "sandstone wall"
+ desc = "A wall with sandstone plating. Rough."
+ icon = 'icons/turf/walls/sandstone_wall.dmi'
+ icon_state = "sandstone_wall-0"
+ base_icon_state = "sandstone_wall"
+ baseturfs = /turf/closed/indestructible/sandstone
+ smoothing_flags = SMOOTH_BITMASK
+
+/turf/closed/indestructible/splashscreen
+ name = "Space Station 13"
+ icon = 'icons/blank_title.png'
+ icon_state = ""
+ layer = SPLASHSCREEN_LAYER
+ plane = SPLASHSCREEN_PLANE
+ bullet_bounce_sound = null
+
+/turf/closed/indestructible/splashscreen/New()
+ SStitle.splash_turf = src
+ if(SStitle.icon)
+ icon = SStitle.icon
+ ..()
+
+/turf/closed/indestructible/splashscreen/vv_edit_var(var_name, var_value)
+ . = ..()
+ if(.)
+ switch(var_name)
+ if(NAMEOF(src, icon))
+ SStitle.icon = icon
+
+
+/turf/closed/indestructible/reinforced
+ name = "reinforced wall"
+ desc = "A huge chunk of reinforced metal used to separate rooms. Effectively impervious to conventional methods of destruction."
+ icon = 'icons/turf/walls/rwalls/reinforced_wall.dmi'
+ icon_state = "reinforced_wall-0"
+ base_icon_state = "reinforced_wall"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK)
+ canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_AIRLOCK)
+
+/turf/closed/indestructible/titanium
+ name = "wall"
+ desc = "A light-weight titanium wall used in shuttles. Effectively impervious to conventional methods of destruction."
+ icon = 'icons/turf/walls/shuttle_wall.dmi'
+ icon_state = "shuttle_wall-0"
+ base_icon_state = "shuttle_wall"
+ flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE)
+
+/turf/closed/indestructible/titanium/nodiagnonal
+ icon = 'icons/turf/walls/shuttle_wall.dmi'
+ icon_state = "map-shuttle_nd"
+ base_icon_state = "shuttle_wall"
+ smoothing_flags = SMOOTH_BITMASK
+
+/turf/closed/indestructible/riveted
+ icon = 'icons/turf/walls/riveted.dmi'
+ icon_state = "riveted-0"
+ base_icon_state = "riveted"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS)
+ canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS)
+
+/turf/closed/indestructible/syndicate
+ icon = 'icons/turf/walls/plastitanium_wall.dmi'
+ icon_state = "plastitanium_wall-0"
+ base_icon_state = "plastitanium_wall"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SYNDICATE_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
+
+/turf/closed/indestructible/riveted/uranium
+ icon = 'icons/turf/walls/uranium_wall.dmi'
+ icon_state = "uranium_wall-0"
+ base_icon_state = "uranium_wall"
+ smoothing_flags = SMOOTH_BITMASK
+
+/turf/closed/indestructible/riveted/plastinum
+ name = "plastinum wall"
+ desc = "A luxurious wall made out of a plasma-platinum alloy. Effectively impervious to conventional methods of destruction."
+ icon = 'icons/turf/walls/plastinum_wall.dmi'
+ icon_state = "plastinum_wall-0"
+ base_icon_state = "plastinum_wall"
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+
+/turf/closed/indestructible/wood
+ icon = 'icons/turf/walls/wood_wall.dmi'
+ icon_state = "wood_wall-0"
+ base_icon_state = "wood_wall"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK)
+ canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_AIRLOCK)
+
+
+/turf/closed/indestructible/alien
+ name = "alien wall"
+ desc = "A wall with alien alloy plating."
+ icon = 'icons/turf/walls/abductor_wall.dmi'
+ icon_state = "abductor_wall-0"
+ base_icon_state = "abductor_wall"
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS)
+
+
+/turf/closed/indestructible/cult
+ name = "runed metal wall"
+ desc = "A cold metal wall engraved with indecipherable symbols. Studying them causes your head to pound. Effectively impervious to conventional methods of destruction."
+ icon = 'icons/turf/walls/cult_wall.dmi'
+ icon_state = "cult_wall-0"
+ base_icon_state = "cult_wall"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_WALLS)
+
+
+/turf/closed/indestructible/abductor
+ icon_state = "alien1"
+
+/turf/closed/indestructible/opshuttle
+ icon_state = "wall3"
+
+
+/turf/closed/indestructible/fakeglass
+ name = "window"
+ icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
+ icon_state = "fake_window"
+ base_icon_state = "reinforced_window"
+ opacity = FALSE
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE)
+ canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE)
+
+/turf/closed/indestructible/fakeglass/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ underlays += mutable_appearance('icons/obj/structures.dmi', "grille") //add a grille underlay
+ underlays += mutable_appearance('icons/turf/floors.dmi', "plating") //add the plating underlay, below the grille
+
+
+/turf/closed/indestructible/opsglass
+ name = "window"
+ icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
+ icon_state = "plastitanium_window-0"
+ base_icon_state = "plastitanium_window"
+ opacity = FALSE
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM)
+ canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM)
+
+/turf/closed/indestructible/opsglass/Initialize()
+ . = ..()
+ icon_state = null
+ underlays += mutable_appearance('icons/obj/structures.dmi', "grille")
+ underlays += mutable_appearance('icons/turf/floors.dmi', "plating")
+
+/turf/closed/indestructible/fakedoor
+ name = "CentCom Access"
+ icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
+ icon_state = "fakedoor"
+
+/turf/closed/indestructible/rock
+ name = "dense rock"
+ desc = "An extremely densely-packed rock, most mining tools or explosives would never get through this."
+ icon = 'icons/turf/walls/rock_wall.dmi'
+ icon_state = "rock_wall-0"
+ base_icon_state = "rock_wall"
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER | SMOOTH_CONNECTORS
+ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_MINERAL_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS)
+ no_connector_typecache = list(/turf/closed/mineral, /turf/closed/indestructible/rock)
+ connector_icon = 'icons/turf/connectors/smoothrocks_connector.dmi'
+ connector_icon_state = "smoothrocks_connector"
+ pixel_x = -4
+ pixel_y = -4
+
+/turf/closed/indestructible/rock/snow
+ name = "mountainside"
+ desc = "Extremely densely-packed sheets of ice and rock, forged over the years of the harsh cold."
+ icon = 'icons/turf/walls/icerock_wall.dmi'
+ icon_state = "icerock_wall-0"
+ base_icon_state = "icerock_wall"
+ smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
+ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_MINERAL_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS)
+ pixel_x = -4
+ pixel_y = -4
+ bullet_sizzle = TRUE
+ bullet_bounce_sound = null
+
+/turf/closed/indestructible/rock/schist
+ name = "schist"
+ desc = "Extremely densely-packed layers of schist. Say it ten times fast."
+ icon = 'icons/turf/walls/rockwall_icemoon.dmi'
+ icon_state = "rockwall_icemoon-0"
+ base_icon_state = "rockwall_icemoon"
+
+/turf/closed/indestructible/paper
+ name = "thick paper wall"
+ desc = "A wall layered with impenetrable sheets of paper."
+ icon = 'icons/turf/walls.dmi'
+ icon_state = "paperwall"
+
+/turf/closed/indestructible/necropolis
+ name = "necropolis wall"
+ desc = "A seemingly impenetrable wall."
+ icon = 'icons/turf/walls.dmi'
+ icon_state = "necro"
+ explosion_block = 50
+ baseturfs = /turf/closed/indestructible/necropolis
+
+/turf/closed/indestructible/necropolis/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+ underlay_appearance.icon = 'icons/turf/floors.dmi'
+ underlay_appearance.icon_state = "necro1"
+ return TRUE
+
+/turf/closed/indestructible/riveted/boss
+ name = "thick stone wall"
+ desc = "A thick, seemingly indestructible stone wall."
+ icon = 'icons/turf/walls/boss_wall.dmi'
+ icon_state = "boss_wall-0"
+ base_icon_state = "boss_wall"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_BOSS_WALLS)
+ canSmoothWith = list(SMOOTH_GROUP_BOSS_WALLS)
+ explosion_block = 50
+ baseturfs = /turf/closed/indestructible/riveted/boss
+
+/turf/closed/indestructible/riveted/boss/see_through
+ opacity = FALSE
+
+/turf/closed/indestructible/riveted/boss/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+ underlay_appearance.icon = 'icons/turf/floors.dmi'
+ underlay_appearance.icon_state = "basalt"
+ return TRUE
+
+/turf/closed/indestructible/riveted/hierophant
+ name = "wall"
+ desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
+ icon = 'icons/turf/walls/hierophant_wall.dmi'
+ icon_state = "wall"
+ smoothing_flags = SMOOTH_CORNERS
+ smoothing_groups = list(SMOOTH_GROUP_HIERO_WALL)
+ canSmoothWith = list(SMOOTH_GROUP_HIERO_WALL)
+
+/turf/closed/indestructible/blank
+ name = "space"
+ desc = "It's the end of the world every day, for someone."
+ icon = 'icons/turf/space.dmi'
+ icon_state = "black"
+ explosion_block = 1000 // fuck it, let's go higher
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index 33fcf315fc5..1d602049084 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -30,8 +30,20 @@
var/x_offset = -4
var/y_offset = -4
+ attack_hitsound = 'sound/effects/break_stone.ogg'
+ break_sound = 'sound/effects/break_stone.ogg'
hitsound_type = PROJECTILE_HITSOUND_STONE
+ min_dam = 5
+ max_integrity = MINERAL_WALL_INTEGRITY
+ brute_mod = 1
+ burn_mod = 1
+
+ mob_smash_flags = ENVIRONMENT_SMASH_MINERALS
+ proj_bonus_damage_flags = PROJECTILE_BONUS_DAMAGE_MINERALS
+
+ overlay_layer = ON_EDGED_TURF_LAYER
+
/turf/closed/mineral/Initialize(mapload, inherited_virtual_z)
. = ..()
if(has_borders)
@@ -66,33 +78,43 @@
return TRUE
return ..()
-
-/turf/closed/mineral/attackby(obj/item/I, mob/user, params)
- if (!user.IsAdvancedToolUser())
- to_chat(usr, "You don't have the dexterity to do this!")
- return
-
+/turf/closed/mineral/try_decon(obj/item/I, mob/user, turf/T)
+ var/act_duration = breakdown_duration
if(I.tool_behaviour == TOOL_MINING)
- var/turf/T = user.loc
- if (!isturf(T))
- return
-
- if(last_act + (40 * I.toolspeed) > world.time)//prevents message spam
- return
- last_act = world.time
- balloon_alert(user, "digging...")
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
- if(I.use_tool(src, user, 40, volume=50))
+ to_chat(user, "You begin breaking through the rock...")
+ while(I.use_tool(src, user, act_duration, volume=50))
if(ismineralturf(src))
- gets_drilled(user, TRUE)
+ to_chat(user, "You break through some of the stone...")
SSblackbox.record_feedback("tally", "pick_used_mining", 1, I.type)
+ if(!alter_integrity(-(I.wall_decon_damage),user,FALSE,TRUE))
+ return TRUE
+ else
+ break
+
+ return FALSE
+
+/turf/closed/mineral/dismantle_wall(devastate = FALSE,mob/user)
+ var/slagged = 0
+ if(devastate == TRUE)
+ slagged = 100
+ if(ismineralturf(src))
+ gets_drilled(user, TRUE, slagged)
else
- return attack_hand(user)
+ return FALSE
-/turf/closed/mineral/proc/gets_drilled(user, give_exp = FALSE)
+/turf/closed/mineral/proc/gets_drilled(user, give_exp = FALSE, slag_chance = 0)
if (mineralType && (mineralAmt > 0))
- new mineralType(src, mineralAmt)
- SSblackbox.record_feedback("tally", "ore_mined", mineralAmt, mineralType)
+ //oops, you ruined the ore
+ if(prob(slag_chance))
+ new /obj/item/stack/ore/slag(src,mineralAmt)
+ visible_message(span_warning("The ore was completely ruined!"))
+ else
+ new mineralType(src, mineralAmt)
+ if(ishuman(user))
+ SSblackbox.record_feedback("tally", "ore_mined", mineralAmt, mineralType)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(give_exp)
@@ -106,14 +128,19 @@
var/flags = NONE
if(defer_change) // TODO: make the defer change var a var for any changeturf flag
flags = CHANGETURF_DEFER_CHANGE
+ playsound(src, break_sound, 50, TRUE) //beautiful destruction
ScrapeAway(null, flags)
addtimer(CALLBACK(src, PROC_REF(AfterChange)), 1, TIMER_UNIQUE)
- playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction
+
/turf/closed/mineral/attack_animal(mob/living/simple_animal/user)
- if((user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS) || (user.environment_smash & ENVIRONMENT_SMASH_MINERALS))
- gets_drilled(user)
- ..()
+ if((!(user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS) || (user.environment_smash & ENVIRONMENT_SMASH_MINERALS)))
+ return ..()
+
+ //This scrapes us away and turns us into a floor, so don't call parent.
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ gets_drilled(user)
/turf/closed/mineral/attack_alien(mob/living/carbon/alien/M)
balloon_alert(M, "digging...")
@@ -128,7 +155,10 @@
var/mob/living/carbon/human/H = AM
var/obj/item/I = H.is_holding_tool_quality(TOOL_MINING)
if(I)
- attackby(I, H)
+ if(last_act + (40 * I.toolspeed) > world.time)//prevents message spam
+ return
+ last_act = world.time
+ try_decon(I, H)
return
else if(iscyborg(AM))
var/mob/living/silicon/robot/R = AM
@@ -142,7 +172,6 @@
ScrapeAway()
/turf/closed/mineral/ex_act(severity, target)
- ..()
switch(severity)
if(3)
if (prob(75))
@@ -152,7 +181,7 @@
gets_drilled(null, FALSE)
if(1)
gets_drilled(null, FALSE)
- return
+ return ..()
/turf/closed/mineral/random
var/list/mineralSpawnChanceList = list(/obj/item/stack/ore/uranium = 3, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 4,
@@ -172,7 +201,7 @@
. = ..()
if (prob(mineralChance))
- var/path = pickweight(mineralSpawnChanceList)
+ var/path = pick_weight(mineralSpawnChanceList)
if(ispath(path, /turf))
var/turf/T = ChangeTurf(path,null,CHANGETURF_IGNORE_AIR)
@@ -648,7 +677,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -658,7 +687,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -668,7 +697,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -678,7 +707,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -688,7 +717,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -698,7 +727,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -714,7 +743,7 @@
mineralSpawnChanceList = list(/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 3, /obj/item/stack/ore/gold = 10,
/obj/item/stack/ore/silver = 10, /obj/item/stack/ore/plasma = 15, /obj/item/stack/ore/iron = 45, /obj/item/stack/ore/titanium = 11,
/turf/closed/mineral/gibtonite/whitesands = 4, /turf/open/floor/plating/asteroid/whitesands = 2, /obj/item/stack/ore/bluespace_crystal = 4)
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -725,7 +754,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -735,7 +764,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -745,7 +774,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
diff --git a/code/game/turfs/closed/wall/conc_walls.dm b/code/game/turfs/closed/wall/conc_walls.dm
index 6f0487ff39b..aa5845b1144 100644
--- a/code/game/turfs/closed/wall/conc_walls.dm
+++ b/code/game/turfs/closed/wall/conc_walls.dm
@@ -11,34 +11,26 @@
hardness = 30 // doesn't matter much; everything that uses it gets overridden
explosion_block = 3
break_sound = 'sound/effects/break_stone.ogg'
+ attack_hitsound = 'sound/effects/hit_stone.ogg'
+ hitsound_type = PROJECTILE_HITSOUND_STONE
sheet_type = null
girder_type = /obj/structure/grille
- // The wall will ignore damage from weak items, depending on their
- // force, damage type, tool behavior, and sharpness. This is the minimum
- // amount of force that a blunt, brute item must have to damage the wall.
- var/min_dam = 8
- // This should all be handled by integrity should that ever be expanded to walls.
- var/max_health = 650
- var/health
- // used to give mining projectiles a bit of an edge against conc walls
- var/static/list/extra_dam_proj = typecacheof(list(
- /obj/projectile/kinetic,
- /obj/projectile/destabilizer,
- /obj/projectile/plasma
- ))
-
var/time_to_harden = 30 SECONDS
// fraction ranging from 0 to 1 -- 0 is fully soft, 1 is fully hardened
// don't change this in subtypes unless you want them to spawn in soft on maps
var/harden_lvl = 1
- var/mutable_appearance/crack_overlay
+ burn_mod = 0.66
+ repair_amount = 0
+ //mining projectiles do extra damage
+ extra_dam_proj = list(
+ /obj/projectile/kinetic,
+ /obj/projectile/destabilizer,
+ /obj/projectile/plasma)
/turf/closed/wall/concrete/Initialize(mapload, ...)
. = ..()
- if(health == null)
- health = max_health
check_harden()
update_stats()
@@ -46,9 +38,9 @@
. = ..()
// by this point it's guaranteed to be a concrete wall
var/turf/closed/wall/concrete/conc_wall = T
- if(conc_wall.health != health || conc_wall.harden_lvl != harden_lvl)
+ if(conc_wall.integrity != integrity || conc_wall.harden_lvl != harden_lvl)
conc_wall.harden_lvl = harden_lvl
- conc_wall.health = health
+ conc_wall.integrity = integrity
// very much not a fan of all the repetition here,
// but there's unfortunately no easy way around it
conc_wall.check_harden()
@@ -68,17 +60,7 @@
add_filter("harden", 1, color_matrix_filter(col_filter, FILTER_COLOR_RGB))
return
-/turf/closed/wall/concrete/update_overlays()
- . = ..()
- var/adj_dam_pct = 1 - (health/(max_health*0.7))
- if(adj_dam_pct <= 0)
- return
- if(!crack_overlay)
- crack_overlay = mutable_appearance('icons/effects/concrete_damage.dmi', "cracks", BULLET_HOLE_LAYER)
- crack_overlay.alpha = adj_dam_pct*255
- . += crack_overlay
-
-// we use this to show health + drying percentage
+// we use this to show integrity + drying percentage
/turf/closed/wall/concrete/deconstruction_hints(mob/user)
. = list()
. += "[p_they(TRUE)] look[p_s()] like you could smash [p_them()]."
@@ -89,19 +71,12 @@
. += "[p_they(TRUE)] look[p_s()] a little wet."
if(0 to 0.4)
. += "[p_they(TRUE)] look[p_s()] freshly poured."
- switch(health / max_health)
- if(0.5 to 0.99)
- . += "[p_they(TRUE)] look[p_s()] slightly damaged."
- if(0.25 to 0.5)
- . += "[p_they(TRUE)] appear[p_s()] heavily damaged."
- if(0 to 0.25)
- . += "[p_theyre(TRUE)] falling apart!"
return
/turf/closed/wall/concrete/create_girder()
var/obj/girder = ..()
- if(health < 0)
- girder.take_damage(min(abs(health), 50))
+ if(integrity < 0)
+ girder.take_damage(min(abs(integrity), 50))
return girder
/turf/closed/wall/concrete/proc/check_harden()
@@ -115,66 +90,16 @@
STOP_PROCESSING(SSobj, src)
update_stats()
-/turf/closed/wall/concrete/proc/update_stats()
+/turf/closed/wall/concrete/update_stats()
+ .= .. ()
// explosion block is diminished on a damaged / soft wall
- explosion_block = (health / max_health) * harden_lvl * initial(explosion_block)
- update_appearance()
+ explosion_block = (integrity / max_integrity) * harden_lvl * initial(explosion_block)
-/turf/closed/wall/concrete/proc/alter_health(delta)
+/turf/closed/wall/concrete/alter_integrity(damage)
// 8x as vulnerable when unhardened
- if(delta < 0)
- delta *= 1 + 7*(1-harden_lvl)
- health += delta
- if(health <= 0)
- // if damage put us 50 points or more below 0, we got proper demolished
- dismantle_wall(health <= -50 ? TRUE : FALSE)
- return FALSE
- health = min(health, max_health)
- update_stats()
- return health
-
-/turf/closed/wall/concrete/ex_act(severity, target)
- if(target == src || !density)
- return ..()
- switch(severity)
- if(EXPLODE_DEVASTATE)
- alter_health(-2000)
- if(EXPLODE_HEAVY)
- alter_health(rand(-500, -800))
- if(EXPLODE_LIGHT)
- alter_health(rand(-200, -700))
-
-/turf/closed/wall/concrete/bullet_act(obj/projectile/P)
- . = ..()
- var/dam = get_proj_damage(P)
- if(!dam)
- return
- if(P.suppressed != SUPPRESSED_VERY)
- visible_message("[src] is hit by \a [P]!", null, null, COMBAT_MESSAGE_RANGE)
- if(!QDELETED(src))
- alter_health(-dam)
-
-/turf/closed/wall/concrete/attack_animal(mob/living/simple_animal/M)
- M.changeNext_move(CLICK_CD_MELEE)
- M.do_attack_animation(src)
- if((M.environment_smash & ENVIRONMENT_SMASH_WALLS) || (M.environment_smash & ENVIRONMENT_SMASH_RWALLS))
- playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
- alter_health(-400)
- return
-
-/turf/closed/wall/concrete/attack_hulk(mob/living/carbon/user)
- SEND_SIGNAL(src, COMSIG_ATOM_HULK_ATTACK, user)
- log_combat(user, src, "attacked")
- var/obj/item/bodypart/arm = user.hand_bodyparts[user.active_hand_index]
- if(!arm || arm.bodypart_disabled)
- return FALSE
- playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
- user.visible_message("[user] smashes \the [src]!", \
- "You smash \the [src]!", \
- "You hear a booming smash!")
- user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
- alter_health(-250)
- return TRUE
+ if(damage < 0)
+ damage *= 1 + 7*(1-harden_lvl)
+ .= ..()
/turf/closed/wall/concrete/mech_melee_attack(obj/mecha/M)
M.do_attack_animation(src)
@@ -184,7 +109,7 @@
"You hit [src]!", null, COMBAT_MESSAGE_RANGE)
playsound(src, 'sound/weapons/punch4.ogg', 50, TRUE)
playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
- alter_health(M.force * -20)
+ alter_integrity(M.force * -20)
if(BURN)
playsound(src, 'sound/items/welder.ogg', 100, TRUE)
if(TOX)
@@ -198,60 +123,14 @@
/turf/closed/wall/concrete/try_decon(obj/item/W, mob/user, turf/T)
return null
-// catch-all for using most items on the wall -- attempt to smash
-/turf/closed/wall/concrete/try_destroy(obj/item/W, mob/user, turf/T)
- var/dam = get_item_damage(W)
- user.do_attack_animation(src)
- if(!dam)
- to_chat(user, "[W] isn't strong enough to damage [src]!")
- playsound(src, 'sound/weapons/tap.ogg', 50, TRUE)
- return TRUE
- log_combat(user, src, "attacked", W)
- user.visible_message("[user] hits [src] with [W]!", \
- "You hit [src] with [W]!", null, COMBAT_MESSAGE_RANGE)
- switch(W.damtype)
- if(BRUTE)
- playsound(src, 'sound/effects/hit_stone.ogg', 50, TRUE)
- if(BURN)
- playsound(src, 'sound/items/welder.ogg', 100, TRUE)
- alter_health(-dam)
- return TRUE
+/turf/closed/wall/concrete/get_item_damage(obj/item/I, t_min = min_dam)
+ t_min = min_dam / (1 + 7*(1-harden_lvl)) // drying walls are more vulnerable
+ . = .. ()
-/turf/closed/wall/concrete/proc/get_item_damage(obj/item/I)
- var/dam = I.force
- if(istype(I, /obj/item/clothing/gloves/gauntlets))
- dam = 20
- else if(I.tool_behaviour == TOOL_MINING)
- dam *= (4/3)
- else
- switch(I.damtype)
- if(BRUTE)
- if(I.get_sharpness())
- dam *= 2/3
- if(BURN)
- dam *= 2/3
- else
- return 0
- var/t_min = min_dam / (1 + 7*(1-harden_lvl)) // drying walls are more vulnerable
- // if dam is below t_min, then the hit has no effect
- return (dam < t_min ? 0 : dam)
-/turf/closed/wall/concrete/proc/get_proj_damage(obj/projectile/P)
- var/dam = P.damage
- // mining projectiles have an edge
- if(is_type_in_typecache(P, extra_dam_proj))
- dam = max(dam, 30)
- else
- switch(P.damage_type)
- if(BRUTE)
- dam *= 1
- if(BURN)
- dam *= 2/3
- else
- return 0
- var/t_min = min_dam / (1 + 7*(1-harden_lvl)) // drying walls are more vulnerable
- // if dam is below t_min, then the hit has no effect
- return (dam < t_min ? 0 : dam)
+/turf/closed/wall/concrete/get_proj_damage(obj/projectile/P, t_min = min_dam)
+ t_min = min_dam / (1 + 7*(1-harden_lvl)) // drying walls are more vulnerable
+ . = ..()
/turf/closed/wall/concrete/reinforced
name = "hexacrete wall"
@@ -266,7 +145,7 @@
girder_type = /obj/structure/girder
min_dam = 13
- max_health = 1300
+ max_integrity = 1300
time_to_harden = 60 SECONDS
// requires ENVIRONMENT_SMASH_RWALLS for simplemobs to break
@@ -276,7 +155,7 @@
if(!M.environment_smash)
return
if(M.environment_smash & ENVIRONMENT_SMASH_RWALLS)
- alter_health(-600) // 3 hits to kill
+ alter_integrity(-600) // 3 hits to kill
playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
else
playsound(src, 'sound/effects/bang.ogg', 50, TRUE)
diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm
index 53dbb9479f3..1ca5a1cc527 100644
--- a/code/game/turfs/closed/wall/mineral_walls.dm
+++ b/code/game/turfs/closed/wall/mineral_walls.dm
@@ -23,6 +23,8 @@
connector_icon = 'icons/turf/connectors/gold_wall_connector.dmi'
connector_icon_state = "gold_wall_connector"
no_connector_typecache = list(/turf/closed/wall/mineral/gold, /obj/structure/falsewall/gold)
+ max_integrity = 150
+ brute_mod = 1.5
/turf/closed/wall/mineral/gold/yesdiag
icon_state = "gold_wall-255"
@@ -41,6 +43,8 @@
connector_icon = 'icons/turf/connectors/silver_wall_connector.dmi'
connector_icon_state = "silver_wall_connector"
no_connector_typecache = list(/turf/closed/wall/mineral/silver, /obj/structure/falsewall/silver)
+ max_integrity = 150
+ brute_mod = 1.5
/turf/closed/wall/mineral/silver/yesdiag
icon_state = "silver_wall-255"
@@ -53,7 +57,7 @@
icon_state = "diamond_wall-0"
base_icon_state = "diamond_wall"
sheet_type = /obj/item/stack/sheet/mineral/diamond
- slicing_duration = 200 //diamond wall takes twice as much time to slice
+ breakdown_duration = 50
explosion_block = 3
smoothing_flags = SMOOTH_BITMASK | SMOOTH_CONNECTORS
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_DIAMOND_WALLS)
@@ -63,6 +67,7 @@
no_connector_typecache = list(/turf/closed/wall/mineral/diamond, /obj/structure/falsewall/diamond)
hitsound_type = PROJECTILE_HITSOUND_GLASS
+ max_integrity = 800
/turf/closed/wall/mineral/diamond/yesdiag
icon_state = "diamond_wall-255"
@@ -84,6 +89,8 @@
no_connector_typecache = list(/turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone)
hitsound_type = PROJECTILE_HITSOUND_NON_LIVING
+ max_integrity = 150
+ min_dam = 5
/turf/closed/wall/mineral/sandstone/yesdiag
icon_state = "sandstone_wall-255"
@@ -103,6 +110,7 @@
connector_icon = 'icons/turf/connectors/uranium_wall_connector.dmi'
connector_icon_state = "uranium_wall_connector"
no_connector_typecache = list(/turf/closed/wall/mineral/uranium, /obj/structure/falsewall/uranium)
+ max_integrity = 600
/turf/closed/wall/mineral/uranium/yesdiag
icon_state = "uranium_wall-255"
@@ -170,6 +178,8 @@
no_connector_typecache = list(/turf/closed/wall/mineral/plasma, /obj/structure/falsewall/plasma)
hitsound_type = PROJECTILE_HITSOUND_GLASS
+ max_integrity = 300
+ burn_mod = 3
/turf/closed/wall/mineral/plasma/yesdiag
icon_state = "plasma_wall-255"
@@ -221,6 +231,9 @@
no_connector_typecache = list(/turf/closed/wall/mineral/wood, /obj/structure/falsewall/wood)
hitsound_type = PROJECTILE_HITSOUND_WOOD
+ max_integrity = 75
+ burn_mod = 3
+ min_dam = 3
/turf/closed/wall/mineral/wood/yesdiag
icon_state = "wood_wall-255"
@@ -230,7 +243,7 @@
/turf/closed/wall/mineral/wood/attackby(obj/item/W, mob/user)
if(W.get_sharpness() && W.force)
var/duration = (48/W.force) * 2 //In seconds, for now.
- if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/fireaxe))
+ if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/melee/axe/fire))
duration /= 4 //Much better with hatchets and axes.
if(do_after(user, duration*10, target=src)) //Into deciseconds.
dismantle_wall(devastated = FALSE)
@@ -260,6 +273,8 @@
connector_icon_state = "iron_wall_connector"
no_connector_typecache = list(/turf/closed/wall/mineral/iron, /obj/structure/falsewall/iron)
+ max_integrity = 300
+
/turf/closed/wall/mineral/iron/yesdiag
icon_state = "iron_wall-255"
smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
@@ -278,7 +293,7 @@
no_connector_typecache = list(/turf/closed/wall/mineral/snow)
hardness = 80
explosion_block = 0
- slicing_duration = 30
+ breakdown_duration = 30
sheet_type = /obj/item/stack/sheet/mineral/snow
canSmoothWith = null
girder_type = null
@@ -287,6 +302,11 @@
hitsound_type = PROJECTILE_HITSOUND_SNOW
+ max_integrity = 50
+ burn_mod = 3
+ brute_mod = 1.5
+ min_dam = 1
+
/turf/closed/wall/mineral/snow/yesdiag
icon_state = "snow_wall-255"
smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
@@ -298,12 +318,14 @@
icon_state = "abductor_wall-0"
base_icon_state = "abductor_wall"
sheet_type = /obj/item/stack/sheet/mineral/abductor
- slicing_duration = 200 //alien wall takes twice as much time to slice
+ breakdown_duration = 100 //alien wall takes twice as much time to slice
explosion_block = 3
smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS)
canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS,SMOOTH_GROUP_AIRLOCK)
+ max_integrity = 1000
+
/////////////////////Titanium walls/////////////////////
/turf/closed/wall/mineral/titanium //has to use this path due to how building walls works
@@ -322,6 +344,8 @@
hitsound_type = PROJECTILE_HITSOUND_NON_LIVING
+ max_integrity = 450
+
/turf/closed/wall/mineral/titanium/exterior
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS_EXTERIOR)
canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS_EXTERIOR, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE)
@@ -400,6 +424,8 @@
hitsound_type = PROJECTILE_HITSOUND_NON_LIVING
+ max_integrity = 500
+
/turf/closed/wall/mineral/plastitanium/nodiagonal
icon = 'icons/turf/walls/plastitanium_wall.dmi'
icon_state = "map-shuttle_nd"
diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm
index 7fbcab55504..6bbe3c623be 100644
--- a/code/game/turfs/closed/wall/misc_walls.dm
+++ b/code/game/turfs/closed/wall/misc_walls.dm
@@ -8,22 +8,12 @@
canSmoothWith = null
sheet_type = /obj/item/stack/sheet/mineral/hidden/hellstone
sheet_amount = 1
- girder_type = /obj/structure/girder/cult
+ max_integrity = 600
/turf/closed/wall/mineral/cult/Initialize(mapload, inherited_virtual_z)
new /obj/effect/temp_visual/cult/turf(src)
. = ..()
-/turf/closed/wall/mineral/cult/Exited(atom/movable/AM, atom/newloc)
- . = ..()
- if(istype(AM, /mob/living/simple_animal/hostile/construct/harvester)) //harvesters can go through cult walls, dragging something with
- var/mob/living/simple_animal/hostile/construct/harvester/H = AM
- var/atom/movable/stored_pulling = H.pulling
- if(stored_pulling)
- stored_pulling.setDir(get_dir(stored_pulling.loc, newloc))
- stored_pulling.forceMove(src)
- H.start_pulling(stored_pulling, supress_message = TRUE)
-
/turf/closed/wall/mineral/cult/artificer
name = "runed stone wall"
desc = "A cold stone wall engraved with indecipherable symbols. Studying them causes your head to pound."
@@ -47,8 +37,9 @@
smoothing_flags = SMOOTH_BITMASK
canSmoothWith = null
hardness = 35
- slicing_duration = 150 //welding through the ice+metal
+ breakdown_duration = 40
bullet_sizzle = TRUE
+ burn_mod = 2
/turf/closed/wall/rust
name = "rusted wall"
@@ -58,6 +49,8 @@
base_icon_state = "rusty_wall"
smoothing_flags = SMOOTH_BITMASK
hardness = 45
+ max_integrity = 300
+ min_dam = 5
/turf/closed/wall/rust/yesdiag
icon_state = "rusty_wall-255"
@@ -71,6 +64,8 @@
base_icon_state = "rusty_reinforced_wall"
smoothing_flags = SMOOTH_BITMASK
hardness = 15
+ integrity = 1000
+ min_dam = 5
/turf/closed/wall/r_wall/rust/yesdiag
icon_state = "rusty_reinforced_wall-255"
diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm
index 1bd8f6783fd..c0fb9232ad2 100644
--- a/code/game/turfs/closed/wall/reinf_walls.dm
+++ b/code/game/turfs/closed/wall/reinf_walls.dm
@@ -21,6 +21,11 @@
///Dismantled state, related to deconstruction.
var/d_state = INTACT
+ max_integrity = 1400
+
+ mob_smash_flags = ENVIRONMENT_SMASH_RWALLS
+ proj_bonus_damage_flags = PROJECTILE_BONUS_DAMAGE_RWALLS
+
/turf/closed/wall/r_wall/yesdiag
icon_state = "reinforced_wall-255"
smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
@@ -54,28 +59,38 @@
playsound(src, 'sound/effects/bang.ogg', 50, TRUE)
to_chat(M, "This wall is far too strong for you to destroy.")
-/turf/closed/wall/r_wall/try_destroy(obj/item/I, mob/user, turf/T)
- if(istype(I, /obj/item/pickaxe/drill/jackhammer))
- to_chat(user, "You begin to smash though [src]...")
- if(do_after(user, 75, target = src))
- if(!istype(src, /turf/closed/wall/r_wall))
- return TRUE
- I.play_tool_sound(src)
- visible_message("[user] smashes through [src] with [I]!", "You hear the grinding of metal.")
- dismantle_wall()
- return TRUE
- return FALSE
+/turf/closed/wall/r_wall/update_stats()
+ var/integrity_per_state = max_integrity/7
+ d_state = (7 - round(integrity/integrity_per_state))
+ .= ..()
+
+/// Calculate how much integrity the r-wall should have a a given state.
+/turf/closed/wall/r_wall/proc/get_state_integrity(state)
+ if(state > INTACT)
+ state = INTACT
+ if(state < SHEATH)
+ state = SHEATH
+ return max_integrity - ((max_integrity/7) * state)
/turf/closed/wall/r_wall/try_decon(obj/item/W, mob/user, turf/T)
//DECONSTRUCTION
+ if(istype(W,/obj/item/gun/energy/plasmacutter))
+ to_chat(user, "You begin slicing through the [src].")
+ while(W.use_tool(src,user,30,volume = 100))
+ to_chat(user, "You slice through some of the outer plating...")
+ if(!alter_integrity(-(W.wall_decon_damage)))
+ return TRUE
+ return 1
+
switch(d_state)
if(INTACT)
if(W.tool_behaviour == TOOL_WIRECUTTER)
- W.play_tool_sound(src, 100)
- d_state = SUPPORT_LINES
- update_appearance()
- to_chat(user, "You cut the outer grille.")
- return 1
+ if(W.use_tool(src, user, 40, volume=100))
+ W.play_tool_sound(src, 100)
+ d_state = SUPPORT_LINES
+ set_integrity(get_state_integrity(SUPPORT_LINES))
+ to_chat(user, "You cut the outer grille.")
+ return 1
if(SUPPORT_LINES)
if(W.tool_behaviour == TOOL_SCREWDRIVER)
@@ -84,16 +99,18 @@
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SUPPORT_LINES)
return 1
d_state = COVER
+ set_integrity(get_state_integrity(COVER))
update_appearance()
to_chat(user, "You unsecure the support lines.")
return 1
else if(W.tool_behaviour == TOOL_WIRECUTTER)
- W.play_tool_sound(src, 100)
- d_state = INTACT
- update_appearance()
- to_chat(user, "You repair the outer grille.")
- return 1
+ if(W.use_tool(src, user, 40, volume=100))
+ W.play_tool_sound(src, 100)
+ d_state = INTACT
+ set_integrity(get_state_integrity(INTACT))
+ to_chat(user, "You repair the outer grille.")
+ return 1
if(COVER)
if(W.tool_behaviour == TOOL_WELDER)
@@ -104,7 +121,7 @@
if(!istype(src, /turf/closed/wall/r_wall) || d_state != COVER)
return 1
d_state = CUT_COVER
- update_appearance()
+ set_integrity(get_state_integrity(CUT_COVER))
to_chat(user, "You press firmly on the cover, dislodging it.")
return 1
@@ -114,7 +131,7 @@
if(!istype(src, /turf/closed/wall/r_wall) || d_state != COVER)
return 1
d_state = SUPPORT_LINES
- update_appearance()
+ set_integrity(get_state_integrity(SUPPORT_LINES))
to_chat(user, "The support lines have been secured.")
return 1
@@ -125,7 +142,7 @@
if(!istype(src, /turf/closed/wall/r_wall) || d_state != CUT_COVER)
return 1
d_state = ANCHOR_BOLTS
- update_appearance()
+ set_integrity(get_state_integrity(ANCHOR_BOLTS))
to_chat(user, "You pry off the cover.")
return 1
@@ -137,7 +154,7 @@
if(!istype(src, /turf/closed/wall/r_wall) || d_state != CUT_COVER)
return TRUE
d_state = COVER
- update_appearance()
+ set_integrity(get_state_integrity(COVER))
to_chat(user, "The metal cover has been welded securely to the frame.")
return 1
@@ -148,7 +165,7 @@
if(!istype(src, /turf/closed/wall/r_wall) || d_state != ANCHOR_BOLTS)
return 1
d_state = SUPPORT_RODS
- update_appearance()
+ set_integrity(get_state_integrity(SUPPORT_RODS))
to_chat(user, "You remove the bolts anchoring the support rods.")
return 1
@@ -158,7 +175,7 @@
if(!istype(src, /turf/closed/wall/r_wall) || d_state != ANCHOR_BOLTS)
return 1
d_state = CUT_COVER
- update_appearance()
+ set_integrity(get_state_integrity(CUT_COVER))
to_chat(user, "The metal cover has been pried back into place.")
return 1
@@ -171,7 +188,7 @@
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SUPPORT_RODS)
return 1
d_state = SHEATH
- update_appearance()
+ set_integrity(get_state_integrity(SHEATH))
to_chat(user, "You slice through the support rods.")
return 1
@@ -182,7 +199,7 @@
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SUPPORT_RODS)
return 1
d_state = ANCHOR_BOLTS
- update_appearance()
+ set_integrity(get_state_integrity(ANCHOR_BOLTS))
to_chat(user, "You tighten the bolts anchoring the support rods.")
return 1
@@ -204,7 +221,7 @@
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SHEATH)
return TRUE
d_state = SUPPORT_RODS
- update_appearance()
+ set_integrity(get_state_integrity(SUPPORT_RODS))
to_chat(user, "You weld the support rods back together.")
return 1
return 0
diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm
index 7be9fb0e21d..1d8f242e216 100644
--- a/code/game/turfs/closed/walls.dm
+++ b/code/game/turfs/closed/walls.dm
@@ -1,5 +1,3 @@
-#define MAX_DENT_DECALS 15
-
/turf/closed/wall
name = "wall"
desc = "A huge chunk of metal used to separate rooms."
@@ -19,15 +17,20 @@
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK)
canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_AIRLOCK)
- ///lower numbers are harder. Used to determine the probability of a hulk smashing through.
- var/hardness = 40
- var/slicing_duration = 100 //default time taken to slice the wall
+ breakdown_duration = 25
var/sheet_type = /obj/item/stack/sheet/metal
var/sheet_amount = 2
var/obj/girder_type = /obj/structure/girder
- var/break_sound = 'sound/items/welder.ogg'
- var/list/dent_decals
+ min_dam = 8
+ max_integrity = 400
+ brute_mod = 1
+ burn_mod = 1
+ var/repair_amount = 50
+
+ mob_smash_flags = ENVIRONMENT_SMASH_WALLS
+ proj_bonus_damage_flags = PROJECTILE_BONUS_DAMAGE_WALLS
+
/turf/closed/wall/yesdiag
icon_state = "wall-255"
@@ -47,18 +50,6 @@
fixed_underlay = string_assoc_list(fixed_underlay)
underlays += underlay_appearance
-/turf/closed/wall/copyTurf(turf/T, copy_air, flags)
- . = ..()
- var/turf/closed/wall/wall_copy = T
- if(LAZYLEN(dent_decals))
- wall_copy.dent_decals = dent_decals.Copy()
- wall_copy.update_appearance()
-
-/turf/closed/wall/update_overlays()
- . = ..()
- for(var/decal in dent_decals)
- . += decal
-
/turf/closed/wall/examine(mob/user)
. += ..()
. += deconstruction_hints(user)
@@ -69,7 +60,7 @@
/turf/closed/wall/attack_tk()
return
-/turf/closed/wall/proc/dismantle_wall(devastated = FALSE)
+/turf/closed/wall/dismantle_wall(devastated = FALSE)
create_sheets()
var/obj/newgirder = create_girder()
if(devastated)
@@ -81,10 +72,7 @@
transfer_fingerprints_to(newgirder)
playsound(src, break_sound, 100, TRUE)
- for(var/obj/structure/sign/poster/P in src.contents) //Eject contents!
- P.roll_and_drop(src)
-
- ScrapeAway()
+ ..()
/turf/closed/wall/proc/create_sheets()
if(sheet_type)
@@ -96,124 +84,27 @@
return new girder_type(src)
return null
-/turf/closed/wall/ex_act(severity, target)
- if(target == src)
- dismantle_wall(devastated = TRUE)
+/turf/closed/wall/attack_override(obj/item/W, mob/user, turf/loc)
+ if(!iswallturf(src))
return
- switch(severity)
- if(EXPLODE_DEVASTATE)
- //SN src = null
- var/turf/NT = ScrapeAway()
- NT.contents_explosion(severity, target)
- return
- if(EXPLODE_HEAVY)
- if (prob(50))
- dismantle_wall(devastated = TRUE)
- else
- dismantle_wall(devastated = FALSE)
- if(EXPLODE_LIGHT)
- if (prob(hardness))
- dismantle_wall(devastated = FALSE)
- if(!density)
- ..()
-
-
-/turf/closed/wall/blob_act(obj/structure/blob/B)
- if(prob(50))
- dismantle_wall()
- else
- add_dent(WALL_DENT_HIT)
-
-/turf/closed/wall/mech_melee_attack(obj/mecha/M)
- M.do_attack_animation(src)
- switch(M.damtype)
- if(BRUTE)
- playsound(src, 'sound/weapons/punch4.ogg', 50, TRUE)
- M.visible_message("[M.name] hits [src]!", \
- "You hit [src]!", null, COMBAT_MESSAGE_RANGE)
- if(prob(hardness + M.force) && M.force > 20)
- dismantle_wall(devastated = TRUE)
- playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
- else
- add_dent(WALL_DENT_HIT)
- if(BURN)
- playsound(src, 'sound/items/welder.ogg', 100, TRUE)
- if(TOX)
- playsound(src, 'sound/effects/spray2.ogg', 100, TRUE)
-
-/turf/closed/wall/attack_paw(mob/living/user)
- user.changeNext_move(CLICK_CD_MELEE)
- return attack_hand(user)
-
-
-/turf/closed/wall/attack_animal(mob/living/simple_animal/M)
- M.changeNext_move(CLICK_CD_MELEE)
- M.do_attack_animation(src)
- if((M.environment_smash & ENVIRONMENT_SMASH_WALLS) || (M.environment_smash & ENVIRONMENT_SMASH_RWALLS))
- playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
- dismantle_wall(devastated = TRUE)
+ if(try_clean(W, user, loc) || try_wallmount(W, user, loc) || try_decon(W, user, loc) || try_destroy(W, user, loc))
return
-/turf/closed/wall/attack_hulk(mob/living/carbon/user)
- ..()
- var/obj/item/bodypart/arm = user.hand_bodyparts[user.active_hand_index]
- if(!arm || arm.bodypart_disabled)
- return
- if(prob(hardness))
- playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
- user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
- dismantle_wall(devastated = TRUE)
- else
- playsound(src, 'sound/effects/bang.ogg', 50, TRUE)
- add_dent(WALL_DENT_HIT)
- user.visible_message("[user] smashes \the [src]!", \
- "You smash \the [src]!", \
- "You hear a booming smash!")
- return TRUE
-
-/turf/closed/wall/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- user.changeNext_move(CLICK_CD_MELEE)
- to_chat(user, "You push the wall but nothing happens!")
- playsound(src, 'sound/weapons/genhit.ogg', 25, TRUE)
- add_fingerprint(user)
-
-/turf/closed/wall/attackby(obj/item/W, mob/user, params)
- user.changeNext_move(CLICK_CD_MELEE)
- if (!user.IsAdvancedToolUser())
- to_chat(user, "You don't have the dexterity to do this!")
- return
-
- //get the user's location
- if(!isturf(user.loc))
- return //can't do this stuff whilst inside objects and such
-
- add_fingerprint(user)
-
- var/turf/T = user.loc //get user's location for delay checks
-
- //the istype cascade has been spread among various procs for easy overriding
- if(try_clean(W, user, T) || try_wallmount(W, user, T) || try_decon(W, user, T) || try_destroy(W, user, T))
- return
-
- return ..()
-
/turf/closed/wall/proc/try_clean(obj/item/W, mob/user, turf/T)
- if((user.a_intent != INTENT_HELP) || !LAZYLEN(dent_decals))
+ if((user.a_intent != INTENT_HELP))
return FALSE
if(W.tool_behaviour == TOOL_WELDER)
- if(!W.tool_start_check(user, amount=0))
+ if(!W.tool_start_check(user, amount=0) || (integrity >= max_integrity))
return FALSE
to_chat(user, "You begin fixing dents on the wall...")
- if(W.use_tool(src, user, 0, volume=100))
+ if(W.use_tool(src, user, breakdown_duration, volume=100))
if(iswallturf(src) && LAZYLEN(dent_decals))
to_chat(user, "You fix some dents on the wall.")
dent_decals = null
update_appearance()
+ alter_integrity(repair_amount)
return TRUE
return FALSE
@@ -232,33 +123,6 @@
return FALSE
-/turf/closed/wall/proc/try_decon(obj/item/I, mob/user, turf/T)
- if(I.tool_behaviour == TOOL_WELDER)
- if(!I.tool_start_check(user, amount=0))
- return FALSE
-
- to_chat(user, "You begin slicing through the outer plating...")
- if(I.use_tool(src, user, slicing_duration, volume=100))
- if(iswallturf(src))
- to_chat(user, "You remove the outer plating.")
- dismantle_wall()
- return TRUE
-
- return FALSE
-
-
-/turf/closed/wall/proc/try_destroy(obj/item/I, mob/user, turf/T)
- if(istype(I, /obj/item/pickaxe/drill/jackhammer))
- to_chat(user, "You begin to smash though [src]...")
- if(do_after(user, 50, target = src))
- if(!iswallturf(src))
- return TRUE
- I.play_tool_sound(src)
- visible_message("[user] smashes through [src] with [I]!", "You hear the grinding of metal.")
- dismantle_wall()
- return TRUE
- return FALSE
-
/turf/closed/wall/singularity_pull(S, current_size)
..()
wall_singularity_pull(current_size)
@@ -302,20 +166,5 @@
return TRUE
return FALSE
-/turf/closed/wall/proc/add_dent(denttype, x=rand(-8, 8), y=rand(-8, 8))
- if(LAZYLEN(dent_decals) >= MAX_DENT_DECALS)
- return
-
- var/mutable_appearance/decal = mutable_appearance('icons/effects/effects.dmi', "", BULLET_HOLE_LAYER)
- switch(denttype)
- if(WALL_DENT_SHOT)
- decal.icon_state = "bullet_hole"
- if(WALL_DENT_HIT)
- decal.icon_state = "impact[rand(1, 3)]"
- decal.pixel_x = x
- decal.pixel_y = y
- LAZYADD(dent_decals, decal)
- update_appearance()
-#undef MAX_DENT_DECALS
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 44acbe06f6b..e2c6caa8be7 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -155,7 +155,7 @@
baseturfs = /turf/open/indestructible/airblock
/turf/open/Initalize_Atmos(times_fired)
- if(!istype(air,/datum/gas_mixture/turf))
+ if(!istype(air, /datum/gas_mixture))
air = new(2500, src)
air.copy_from_turf(src)
update_air_ref(planetary_atmos ? AIR_REF_PLANETARY_TURF : AIR_REF_OPEN_TURF)
@@ -267,7 +267,7 @@
pulse_strength = min(pulse_strength,air.get_moles(GAS_CO2)*1000,air.get_moles(GAS_O2)*2000) //Ensures matter is conserved properly
air.set_moles(GAS_CO2, max(air.get_moles(GAS_CO2)-(pulse_strength/1000),0))
air.set_moles(GAS_O2, max(air.get_moles(GAS_O2)-(pulse_strength/2000),0))
- air.adjust_moles(GAS_PLUOXIUM, pulse_strength/4000)
+ air.adjust_moles(GAS_O3, pulse_strength/4000)
/turf/open/IgniteTurf(power, fire_color)
if(turf_fire)
diff --git a/code/game/turfs/open/acid.dm b/code/game/turfs/open/acid.dm
index 50c7ee7bf98..c9f5472fa4f 100644
--- a/code/game/turfs/open/acid.dm
+++ b/code/game/turfs/open/acid.dm
@@ -1,8 +1,8 @@
-/turf/open/acid
+/turf/open/water/acid
name = "acid lake"
+ desc = "A lake of acid."
icon_state = "acid"
- gender = PLURAL
- baseturfs = /turf/open/acid
+ baseturfs = /turf/open/water/acid
slowdown = 2
light_range = 2
@@ -10,90 +10,77 @@
light_color = LIGHT_COLOR_SLIME_LAMP
bullet_bounce_sound = 'sound/items/welder2.ogg'
+ planetary_atmos = FALSE
footstep = FOOTSTEP_LAVA
barefootstep = FOOTSTEP_LAVA
clawfootstep = FOOTSTEP_LAVA
heavyfootstep = FOOTSTEP_LAVA
-/turf/open/acid/CanAllowThrough(atom/movable/passing_atom, turf/target)
+ reagent_to_extract = /datum/reagent/toxin/acid
+ extracted_reagent_visible_name = "acid"
+
+/turf/open/water/acid/CanAllowThrough(atom/movable/passing_atom, turf/target)
if(ishostile(passing_atom))
return FALSE
return ..()
-/turf/open/acid/ex_act(severity, target)
+/turf/open/water/acid/ex_act(severity, target)
contents_explosion(severity, target)
-/turf/open/acid/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
- return
-
-/turf/open/acid/Melt()
+/turf/open/water/acid/Melt()
to_be_destroyed = FALSE
return src
-/turf/open/acid/acid_act(acidpwr, acid_volume)
+/turf/open/water/acid/acid_act(acidpwr, acid_volume)
return
-/turf/open/acid/MakeDry(wet_setting = TURF_WET_WATER)
+/turf/open/water/acid/MakeDry(wet_setting = TURF_WET_WATER)
return
-/turf/open/acid/airless
+/turf/open/water/acid/airless
initial_gas_mix = AIRLESS_ATMOS
-/turf/open/acid/Entered(atom/movable/AM)
+/turf/open/water/acid/Entered(atom/movable/AM)
. = ..()
if(melt_stuff(AM))
START_PROCESSING(SSobj, src)
-/turf/open/acid/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
+/turf/open/water/acid/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
if(melt_stuff(AM))
START_PROCESSING(SSobj, src)
-/turf/open/acid/process()
+/turf/open/water/acid/process()
if(!melt_stuff())
STOP_PROCESSING(SSobj, src)
-/turf/open/acid/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
- switch(the_rcd.mode)
- if(RCD_FLOORWALL)
- return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 3)
- return FALSE
-
-/turf/open/acid/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
- switch(passed_mode)
- if(RCD_FLOORWALL)
- to_chat(user, "You build a floor.")
- PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
- return TRUE
- return FALSE
-
-/turf/open/acid/singularity_act()
+/turf/open/water/acid/singularity_act()
return
-/turf/open/acid/singularity_pull(S, current_size)
+/turf/open/water/acid/singularity_pull(S, current_size)
return
-/turf/open/acid/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+/turf/open/water/acid/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
underlay_appearance.icon = 'icons/turf/floors.dmi'
underlay_appearance.icon_state = "basalt"
return TRUE
-/turf/open/acid/attackby(obj/item/C, mob/user, params)
+/turf/open/water/acid/attackby(obj/item/_item, mob/user, params)
..()
- if(istype(C, /obj/item/stack/rods))
- var/obj/item/stack/rods/R = C
+ if(istype(_item, /obj/item/stack/rods))
+ var/obj/item/stack/rods/R = _item
var/obj/structure/lattice/H = locate(/obj/structure/lattice, src)
if(H)
- to_chat(user, "There is already a lattice here!")
+ to_chat(user, span_warning("There is already a lattice here!"))
return
if(R.use(2))
- to_chat(user, "You construct a catwalk.")
+ to_chat(user, span_notice("You construct a catwalk."))
playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE)
new /obj/structure/lattice/catwalk(locate(x, y, z))
else
- to_chat(user, "You need one rod to build a lattice.")
+ to_chat(user, span_warning("You need one rod to build a lattice."))
return
-/turf/open/acid/proc/is_safe_to_cross()
+/turf/open/water/acid/proc/is_safe_to_cross()
//if anything matching this typecache is found in the lava, we don't burn things
var/static/list/acid_safeties_typecache = typecacheof(list(/obj/structure/catwalk, /obj/structure/stone_tile, /obj/structure/lattice/))
var/list/found_safeties = typecache_filter_list(contents, acid_safeties_typecache)
@@ -103,7 +90,7 @@
return LAZYLEN(found_safeties)
-/turf/open/acid/proc/melt_stuff(thing_to_melt)
+/turf/open/water/acid/proc/melt_stuff(thing_to_melt)
if(is_safe_to_cross())
return FALSE
. = FALSE
@@ -156,6 +143,6 @@
if(L) //mobs turning into object corpses could get deleted here.
L.acid_act(50, 100)
-/turf/open/acid/whitesands
+/turf/open/water/acid/whitesands
planetary_atmos = TRUE
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
diff --git a/code/game/turfs/open/dirtystation.dm b/code/game/turfs/open/dirtystation.dm
index 29e13585bb7..5daba45f1b1 100644
--- a/code/game/turfs/open/dirtystation.dm
+++ b/code/game/turfs/open/dirtystation.dm
@@ -53,8 +53,7 @@
return
//Bathrooms. Blood, vomit, and shavings in the sinks.
- var/static/list/bathroom_dirt_areas = typecacheof(list( /area/ship/crew/toilet,
- /area/awaymission/research/interior/bathroom))
+ var/static/list/bathroom_dirt_areas = typecacheof(/area/ship/crew/toilet)
if(is_type_in_typecache(A, bathroom_dirt_areas))
if(prob(40))
if(prob(90))
diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm
index d74edb27a65..7b1603df119 100644
--- a/code/game/turfs/open/floor.dm
+++ b/code/game/turfs/open/floor.dm
@@ -62,7 +62,7 @@
if(1)
ScrapeAway(2, flags = CHANGETURF_INHERIT_AIR)
if(2)
- if(prob(60))
+ if(prob(50) && broken)
ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
else
break_tile()
@@ -78,9 +78,6 @@
for(var/obj/structure/A in contents)
return 1
-/turf/open/floor/blob_act(obj/structure/blob/B)
- return
-
/turf/open/floor/update_icon()
. = ..()
update_visuals()
@@ -183,11 +180,6 @@
else if(prob(50))
ReplaceWithLattice()
-/turf/open/floor/narsie_act(force, ignore_mobs, probability = 20)
- . = ..()
- if(.)
- ChangeTurf(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
-
/turf/open/floor/acid_melt()
ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index 3a018484945..2d043371a9b 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -135,7 +135,7 @@
icon_state = "fairygrass[rand(0,3)]"
/turf/open/floor/grass/fairy/beach
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand
planetary_atmos = TRUE
/turf/open/floor/grass/snow
diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
index 98ad4658add..1b5009d8245 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -126,20 +126,6 @@
/turf/open/floor/noslip/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return
-/turf/open/floor/bluespace
- slowdown = -1
- icon_state = "bluespace"
- desc = "Through a series of micro-teleports these tiles let people move at incredible speeds."
- floor_tile = /obj/item/stack/tile/bluespace
-
-
-/turf/open/floor/sepia
- slowdown = 2
- icon_state = "sepia"
- desc = "Time seems to flow very slowly around these tiles."
- floor_tile = /obj/item/stack/tile/sepia
-
-
/turf/open/floor/bronze
name = "bronze floor"
desc = "Some heavy bronze tiles."
@@ -185,6 +171,8 @@
base_icon_state = "tcomms"
icon = 'icons/turf/floors/misc.dmi'
color = null
+/turf/open/floor/plasteel/telecomms_floor/tatmos
+ initial_gas_mix = TCOMMS_ATMOS
//ship turfs
/turf/open/floor/ship
@@ -225,6 +213,8 @@
smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_GRASS)
canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_GRASS)
layer = HIGH_TURF_LAYER
+ icon_state = "grass0"
+ base_icon_state = "grass"
var/smooth_icon = 'icons/turf/floors/grass.dmi'
baseturfs = /turf/open/floor/ship/dirt
diff --git a/code/game/turfs/open/floor/plasteel_floor.dm b/code/game/turfs/open/floor/plasteel_floor.dm
index 61a90ff0da8..e77e07e71d3 100644
--- a/code/game/turfs/open/floor/plasteel_floor.dm
+++ b/code/game/turfs/open/floor/plasteel_floor.dm
@@ -59,6 +59,9 @@
base_icon_state = "techfloor"
floor_tile = /obj/item/stack/tile/plasteel/tech
+/turf/open/floor/plasteel/tech/tcomms
+ initial_gas_mix = TCOMMS_ATMOS
+
/turf/open/floor/plasteel/tech/airless
initial_gas_mix = AIRLESS_ATMOS
@@ -151,6 +154,13 @@
base_icon_state = "plaque"
tiled_dirt = FALSE
+/turf/open/floor/plasteel/lightgrey
+ name = "light grey floor"
+ icon_state = "corner_white_full"
+ base_icon_state = "corner_white_full"
+ icon = 'icons/turf/decals/decals.dmi'
+ color = "#a8b2b6"
+
/turf/open/floor/plasteel/cult/narsie_act()
return
diff --git a/code/game/turfs/open/floor/plating/asteroid.dm b/code/game/turfs/open/floor/plating/asteroid.dm
index 996d122a4ac..12fe214deb8 100644
--- a/code/game/turfs/open/floor/plating/asteroid.dm
+++ b/code/game/turfs/open/floor/plating/asteroid.dm
@@ -27,6 +27,7 @@
/// Whether the turf has been dug or not
var/dug
+
/turf/open/floor/plating/asteroid/Initialize(mapload, inherited_virtual_z)
var/proper_name = name
. = ..()
diff --git a/code/game/turfs/open/floor/plating/beach.dm b/code/game/turfs/open/floor/plating/beach.dm
index 88bb3bbcad1..9b4aa8cf156 100644
--- a/code/game/turfs/open/floor/plating/beach.dm
+++ b/code/game/turfs/open/floor/plating/beach.dm
@@ -1,13 +1,15 @@
+///it's all sand....
+
/turf/open/floor/plating/asteroid/sand
name = "sand"
icon = 'icons/misc/beach.dmi'
icon_state = "sand"
base_icon_state = "sand"
baseturfs = /turf/open/floor/plating/asteroid/sand
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS //custom atmos? lots of oxygen, hot?
- digResult = /obj/item/stack/ore/glass
+ initial_gas_mix = BEACHPLANET_DEFAULT_ATMOS //custom atmos? lots of oxygen, hot?
planetary_atmos = TRUE
digResult = /obj/item/stack/ore/glass/beach
+ light_color = COLOR_BEACHPLANET_LIGHT
/turf/open/floor/plating/asteroid/sand/Initialize(mapload, inherited_virtual_z)
. = ..()
@@ -16,14 +18,20 @@
/turf/open/floor/plating/asteroid/sand/lit
light_range = 2
light_power = 0.80
- light_color = LIGHT_COLOR_TUNGSTEN
/turf/open/floor/plating/asteroid/sand/dense
icon_state = "light_sand"
- planetary_atmos = TRUE
base_icon_state = "light_sand"
/turf/open/floor/plating/asteroid/sand/dense/lit
light_range = 2
light_power = 0.80
- light_color = LIGHT_COLOR_TUNGSTEN
+
+/turf/open/floor/plating/grass/beach
+ baseturfs = /turf/open/floor/plating/asteroid/sand
+ light_color = COLOR_BEACHPLANET_LIGHT
+ planetary_atmos = TRUE
+
+/turf/open/floor/plating/grass/beach/lit
+ light_range = 2
+ light_power = 0.80
diff --git a/code/game/turfs/open/floor/plating/icemoon.dm b/code/game/turfs/open/floor/plating/icemoon.dm
index ca1819af253..9b054f8d150 100644
--- a/code/game/turfs/open/floor/plating/icemoon.dm
+++ b/code/game/turfs/open/floor/plating/icemoon.dm
@@ -17,6 +17,7 @@
bullet_sizzle = TRUE
bullet_bounce_sound = null
digResult = /obj/item/stack/sheet/mineral/snow
+ light_color = COLOR_ICEPLANET_LIGHT
// footprint vars
var/entered_dirs
var/exited_dirs
@@ -87,19 +88,17 @@
. = ..()
ScrapeAway()
+/turf/open/floor/plating/asteroid/snow/icemoon
+ baseturfs = /turf/open/openspace/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+
+ slowdown = 0
+
/turf/open/floor/plating/asteroid/snow/lit
light_range = 2
light_power = 1
baseturfs = /turf/open/floor/plating/asteroid/icerock/lit
-/turf/open/floor/plating/asteroid/snow/lit/whitesands
- baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit
- initial_gas_mix = WHITESANDS_ATMOS
-
-/turf/open/floor/plating/asteroid/snow/lit/rockplanet
- baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit
- initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
-
/turf/open/floor/plating/asteroid/snow/airless
initial_gas_mix = AIRLESS_ATMOS
@@ -142,6 +141,7 @@
floor_variance = 100
max_icon_states = 7
dug = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
/turf/open/floor/plating/asteroid/icerock/lit
light_range = 2
@@ -183,21 +183,17 @@
floor_variance = 100
max_icon_states = 7
dug = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
/turf/open/floor/plating/asteroid/iceberg/lit
light_range = 2
light_power = 1
-
-/turf/open/floor/plating/asteroid/snow/icemoon
- baseturfs = /turf/open/openspace/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
- slowdown = 0
-
/turf/open/lava/plasma/ice_moon
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
baseturfs = /turf/open/lava/plasma/ice_moon
planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
/turf/open/floor/plating/asteroid/snow/ice
name = "icy snow"
@@ -213,6 +209,8 @@
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
max_icon_states = 7
+ light_color = COLOR_ICEPLANET_LIGHT
+
/turf/open/floor/plating/asteroid/snow/ice/icemoon
baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
@@ -223,3 +221,88 @@
/turf/open/floor/plating/asteroid/snow/ice/burn_tile()
return FALSE
+/turf/open/floor/wood/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ slowdown = 0
+
+/turf/open/floor/wood/ebony/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ slowdown = 0
+
+/turf/open/floor/plasteel/stairs/wood/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ slowdown = 0
+
+//concrete
+
+/turf/open/floor/concrete/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/icemoon/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/concrete/slab_1/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/slab_1/icemoon/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/concrete/slab_2/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/slab_2/icemoon/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/concrete/slab_3/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/slab_3/icemoon/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/concrete/slab_4/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/slab_4/icemoon/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/concrete/pavement/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/pavement/icemoon/lit
+ light_range = 2
+ light_power = 1
diff --git a/code/game/turfs/open/floor/plating/jungle.dm b/code/game/turfs/open/floor/plating/jungle.dm
new file mode 100644
index 00000000000..19139d782c0
--- /dev/null
+++ b/code/game/turfs/open/floor/plating/jungle.dm
@@ -0,0 +1,64 @@
+/turf/open/floor/plating/dirt/jungle
+ slowdown = 0.5
+ baseturfs = /turf/open/floor/plating/dirt/jungle
+ initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_JUNGLEPLANET_LIGHT
+
+/turf/open/floor/plating/dirt/jungle/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/turf/open/floor/plating/dirt/jungle/lit
+ baseturfs = /turf/open/floor/plating/dirt/jungle/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/plating/dirt/jungle/dark
+ icon_state = "greenerdirt"
+ baseturfs = /turf/open/floor/plating/dirt/jungle/dark
+
+/turf/open/floor/plating/dirt/jungle/dark/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/plating/dirt/jungle/wasteland //Like a more fun version of living in Arizona.
+ name = "cracked earth"
+ desc = "Looks a bit dry."
+ icon = 'icons/turf/floors.dmi'
+ icon_state = "wasteland"
+ slowdown = 1
+ baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland
+ var/floor_variance = 15
+
+/turf/open/floor/plating/dirt/jungle/wasteland/lit
+ baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/plating/dirt/jungle/wasteland/Initialize(mapload, inherited_virtual_z)
+ .=..()
+ if(prob(floor_variance))
+ icon_state = "[initial(icon_state)][rand(0,12)]"
+
+/turf/open/floor/plating/grass/jungle
+ name = "jungle grass"
+ planetary_atmos = TRUE
+ desc = "Greener on the other side."
+ icon_state = "junglegrass"
+ base_icon_state = "junglegrass"
+ smooth_icon = 'icons/turf/floors/junglegrass.dmi'
+ baseturfs = /turf/open/floor/plating/grass/jungle
+ light_color = COLOR_JUNGLEPLANET_LIGHT
+ initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plating/grass/jungle/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/turf/open/floor/plating/grass/jungle/lit
+ baseturfs = /turf/open/floor/plating/dirt/jungle/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/water/jungle/lit
+ light_range = 2
+ light_power = 0.8
+ light_color = LIGHT_COLOR_BLUEGREEN
diff --git a/code/game/turfs/open/floor/plating/lavaland.dm b/code/game/turfs/open/floor/plating/lavaland.dm
index 84e0173819b..b15f76eabcc 100644
--- a/code/game/turfs/open/floor/plating/lavaland.dm
+++ b/code/game/turfs/open/floor/plating/lavaland.dm
@@ -1,3 +1,5 @@
+///baseturf
+
/turf/open/floor/plating/asteroid/basalt
name = "volcanic floor"
baseturfs = /turf/open/floor/plating/asteroid/basalt
@@ -7,11 +9,11 @@
base_icon_state = "basalt"
floor_variance = 15
digResult = /obj/item/stack/ore/glass/basalt
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
/turf/open/floor/plating/asteroid/basalt/lava //lava underneath
baseturfs = /turf/open/lava/smooth
@@ -26,11 +28,9 @@
/proc/set_basalt_light(turf/open/floor/B)
switch(B.icon_state)
if("basalt1", "basalt2", "basalt3")
- B.set_light(2, 0.6, LIGHT_COLOR_LAVA) //more light
+ B.set_light(2, 0.6, COLOR_LAVAPLANET_LIGHT) //more light
if("basalt5", "basalt9")
- B.set_light(1.4, 0.6, LIGHT_COLOR_LAVA) //barely anything!
-
-///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground.
+ B.set_light(1.4, 0.6, COLOR_LAVAPLANET_LIGHT) //barely anything!
/turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
@@ -47,7 +47,8 @@
/turf/open/floor/plating/asteroid/basalt/purple/lit
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+
+///Sand
/turf/open/floor/plating/asteroid/purple
name = "ashen sand"
@@ -57,11 +58,13 @@
turf_type = /turf/open/floor/plating/asteroid/basalt/purple
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plating/asteroid/purple/lit
light_range = 2
light_power = 0.3
- light_color = LIGHT_COLOR_FIRE
+
+///Grass
/turf/open/floor/plating/grass/lava
name = "ungodly grass"
@@ -75,7 +78,7 @@
smooth_icon = 'icons/turf/floors/lava_grass_red.dmi'
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
gender = PLURAL
/turf/open/floor/plating/grass/lava/orange
@@ -88,44 +91,68 @@
icon = 'icons/turf/floors/lava_grass_purple.dmi'
smooth_icon = 'icons/turf/floors/lava_grass_purple.dmi'
+///The Moss
+/turf/open/floor/plating/moss
+ name = "mossy carpet"
+ desc = "When the forests burned away and the sky grew dark, the moss learned to feed on the falling ash."
+ baseturfs = /turf/open/floor/plating/ashplanet //explosions and damage can destroy the moss
+ initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ icon_state = "moss"
+ icon = 'icons/turf/lava_moss.dmi'
+ base_icon_state = "moss"
+ bullet_bounce_sound = null
+ footstep = FOOTSTEP_GRASS
+ barefootstep = FOOTSTEP_GRASS
+ clawfootstep = FOOTSTEP_GRASS
+ heavyfootstep = FOOTSTEP_GENERIC_HEAVY
+ layer = HIGH_TURF_LAYER
+ gender = PLURAL
+ light_power = 1
+ light_range = 2
+ pixel_x = -9
+ pixel_y = -9
+
+///Ruin Turfs (to-do, move all ruin turfs into their own bespoke files)
+
/turf/open/floor/concrete/pavement/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/concrete/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/concrete/slab_1/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plating/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plating/rust/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plasteel/white/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plasteel/dark/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
index 84a49d1a003..684420c8eb8 100644
--- a/code/game/turfs/open/floor/plating/misc_plating.dm
+++ b/code/game/turfs/open/floor/plating/misc_plating.dm
@@ -116,61 +116,6 @@
icon_state = "[icon_state][rand(1, 9)]"
. = ..()
-
-/turf/open/floor/plating/beach
- name = "beach"
- icon = 'icons/misc/beach.dmi'
- flags_1 = NONE
- attachment_holes = FALSE
- bullet_bounce_sound = null
- footstep = FOOTSTEP_SAND
- barefootstep = FOOTSTEP_SAND
- clawfootstep = FOOTSTEP_SAND
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
-
-/turf/open/floor/plating/beach/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
- return
-
-/turf/open/floor/plating/beach/ex_act(severity, target)
- contents_explosion(severity, target)
-
-/turf/open/floor/plating/beach/sand
- gender = PLURAL
- name = "sand"
- desc = "Surf's up."
- icon_state = "sand"
- baseturfs = /turf/open/floor/plating/beach/sand
-
-/turf/open/floor/plating/beach/coastline_t
- name = "coastline"
- desc = "Tide's high tonight. Charge your batons."
- icon_state = "sandwater_t"
- baseturfs = /turf/open/floor/plating/beach/coastline_t
-
-/turf/open/floor/plating/beach/coastline_b //need to make this water subtype.
- name = "coastline"
- icon_state = "sandwater_b"
- baseturfs = /turf/open/floor/plating/beach/coastline_b
- footstep = FOOTSTEP_LAVA
- barefootstep = FOOTSTEP_LAVA
- clawfootstep = FOOTSTEP_LAVA
- heavyfootstep = FOOTSTEP_LAVA
-
-/turf/open/floor/plating/beach/water
- gender = PLURAL
- name = "water"
- desc = "You get the feeling that nobody's bothered to actually make this water functional..."
- icon_state = "water"
- baseturfs = /turf/open/floor/plating/beach/water
- footstep = FOOTSTEP_LAVA //placeholder, kinda.
- barefootstep = FOOTSTEP_LAVA
- clawfootstep = FOOTSTEP_LAVA
- heavyfootstep = FOOTSTEP_LAVA
-
-/turf/open/floor/plating/beach/coastline_t/sandwater_inner
- icon_state = "sandwater_inner"
- baseturfs = /turf/open/floor/plating/beach/coastline_t/sandwater_inner
-
/turf/open/floor/plating/ironsand
gender = PLURAL
name = "iron sand"
@@ -331,33 +276,3 @@
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
tiled_dirt = FALSE
-/turf/open/floor/plating/grass/beach
- baseturfs = /turf/open/floor/plating/beach/sand
- planetary_atmos = TRUE
-
-/turf/open/floor/plating/grass/beach/lit
- light_range = 2
- light_power = 0.80
-
-
-
-/turf/open/floor/plating/moss
- name = "mossy carpet"
- desc = "When the forests burned away and the sky grew dark, the moss learned to feed on the falling ash."
- baseturfs = /turf/open/floor/plating/ashplanet //explosions and damage can destroy the moss
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
- planetary_atmos = TRUE
- icon_state = "moss"
- icon = 'icons/turf/lava_moss.dmi'
- base_icon_state = "moss"
- bullet_bounce_sound = null
- footstep = FOOTSTEP_GRASS
- barefootstep = FOOTSTEP_GRASS
- clawfootstep = FOOTSTEP_GRASS
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- layer = HIGH_TURF_LAYER
- gender = PLURAL
- light_power = 1
- light_range = 2
- pixel_x = -9
- pixel_y = -9
diff --git a/code/game/turfs/open/floor/plating/planet.dm b/code/game/turfs/open/floor/plating/planet.dm
index a86847ca8f7..5609547928c 100644
--- a/code/game/turfs/open/floor/plating/planet.dm
+++ b/code/game/turfs/open/floor/plating/planet.dm
@@ -16,74 +16,16 @@
/turf/open/floor/plating/dirt/dark
icon_state = "greenerdirt"
baseturfs = /turf/open/floor/plating/dirt/dark
+ initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
/turf/open/floor/plating/dirt/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
return
-/turf/open/floor/plating/dirt/jungle
- slowdown = 0.5
- baseturfs = /turf/open/floor/plating/dirt/jungle
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-
-/turf/open/floor/plating/dirt/jungle/lit
- baseturfs = /turf/open/floor/plating/dirt/jungle/lit
- light_range = 2
- light_power = 1
- light_color = COLOR_VERY_LIGHT_GRAY
-
-/turf/open/floor/plating/dirt/jungle/dark
- icon_state = "greenerdirt"
- baseturfs = /turf/open/floor/plating/dirt/jungle/dark
-
-/turf/open/floor/plating/dirt/jungle/dark/lit
- light_range = 2
- light_power = 1
-
-/turf/open/floor/plating/dirt/jungle/wasteland //Like a more fun version of living in Arizona.
- name = "cracked earth"
- desc = "Looks a bit dry."
- icon = 'icons/turf/floors.dmi'
- icon_state = "wasteland"
- slowdown = 1
- baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland
- var/floor_variance = 15
-
-/turf/open/floor/plating/dirt/jungle/wasteland/lit
- baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland/lit
- light_range = 2
- light_power = 1
-
-
-/turf/open/floor/plating/dirt/jungle/wasteland/Initialize(mapload, inherited_virtual_z)
- .=..()
- if(prob(floor_variance))
- icon_state = "[initial(icon_state)][rand(0,12)]"
-
/turf/open/floor/plating/dirt/icemoon
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
baseturfs = /turf/open/floor/plating/dirt/icemoon
planetary_atmos = TRUE
-/turf/open/floor/plating/grass/jungle
- name = "jungle grass"
- planetary_atmos = TRUE
- desc = "Greener on the other side."
- icon_state = "junglegrass"
- base_icon_state = "junglegrass"
- baseturfs = /turf/open/floor/plating/dirt/jungle
- smooth_icon = 'icons/turf/floors/junglegrass.dmi'
- baseturfs = /turf/open/floor/plating/grass/jungle
-
-/turf/open/floor/plating/grass/jungle/lit
- baseturfs = /turf/open/floor/plating/dirt/jungle/lit
- light_range = 2
- light_power = 1
-
-/turf/open/water/jungle/lit
- light_range = 2
- light_power = 0.8
- light_color = LIGHT_COLOR_BLUEGREEN
-
/turf/open/floor/plating/dirt/old
icon_state = "oldsmoothdirt"
@@ -98,8 +40,26 @@
light_power = 1
light_range = 2
-
/turf/open/floor/plating/dirt/dry/lit
light_power = 1
light_range = 2
+
+//Artifical sand turfs
+/turf/open/floor/plating/asteroid/sand/ship
+ name = "sand"
+ icon = 'icons/misc/beach.dmi'
+ icon_state = "sand"
+ base_icon_state = "sand"
+ baseturfs = /turf/open/floor/plating
+ initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ planetary_atmos = FALSE
+ digResult = null
+
+//artifical water turfs
+/turf/open/water/ship
+ icon = 'icons/misc/beach.dmi'
+ icon_state = "water"
+ base_icon_state = "water"
+ initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ planetary_atmos = FALSE
diff --git a/code/game/turfs/open/floor/plating/rockplanet.dm b/code/game/turfs/open/floor/plating/rockplanet.dm
index eb0caa6485b..7e52dc85aaf 100644
--- a/code/game/turfs/open/floor/plating/rockplanet.dm
+++ b/code/game/turfs/open/floor/plating/rockplanet.dm
@@ -9,11 +9,11 @@
baseturfs = /turf/open/floor/plating/asteroid/rockplanet
turf_type = /turf/open/floor/plating/asteroid/rockplanet
digResult = /obj/item/stack/ore/glass/rockplanet
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/plating/asteroid/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
/turf/open/floor/plating/asteroid/rockplanet/cracked
name = "iron cracked sand"
@@ -25,7 +25,6 @@
/turf/open/floor/plating/asteroid/rockplanet/cracked/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit
turf_type = /turf/open/floor/plating/asteroid/rockplanet/lit
@@ -45,35 +44,145 @@
/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
+
+//start crackhead subtyping (open reward of 1 erika token to anyone who untangles this somewhat)
/turf/open/floor/plating/grass/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
name = "dry grass"
desc = "A patch of dry grass."
/turf/open/floor/plating/dirt/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
name = "mud"
icon_state = "greenerdirt"
/turf/open/water/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
name = "pond"
+///plating
+
/turf/open/floor/plating/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
name = "exterior plating"
+/turf/open/floor/plating/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+
+/turf/open/floor/plating/rust/rockplanet
+ name = "exterior plating"
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+/turf/open/floor/plating/rust/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+
+///floor tiles
/turf/open/floor/plasteel/stairs/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
name = "exterior stairs"
+/turf/open/floor/plasteel/stairs/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
-/turf/open/floor/engine/hull/rockplanet
+/turf/open/floor/plasteel/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ name = "exterior floor"
-/turf/open/floor/plasteel/rockplanet
+/turf/open/floor/plasteel/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+/turf/open/floor/plasteel/patterned/rockplanet
+ name = "exterior floor"
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plasteel/patterned/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+/turf/open/floor/plasteel/patterned/brushed/rockplanet
name = "exterior floor"
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plasteel/patterned/brushed/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+/turf/open/floor/plasteel/patterned/ridged/rockplanet
+ name = "exterior floor"
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plasteel/patterned/ridged/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+/turf/open/floor/wood/rockplanet
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+/turf/open/floor/pod/rockplanet
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+///reinforced floors
+
+/turf/open/floor/engine/hull/rockplanet
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/engine/hull/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+/turf/open/floor/engine/hull/reinforced/rockplanet
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/engine/hull/reinforced/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+/// concrete
+
+/turf/open/floor/concrete/rockplanet
+ planetary_atmos = TRUE
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/concrete/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+///titanium
+
+/turf/open/floor/mineral/titanium/tiled/rockplanet
+ planetary_atmos = TRUE
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/mineral/titanium/tiled/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+///snow
+/turf/open/floor/plating/asteroid/snow/lit/rockplanet
+ light_color = COLOR_ROCKPLANET_LIGHT
+ baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
diff --git a/code/game/turfs/open/floor/plating/wasteplanet.dm b/code/game/turfs/open/floor/plating/wasteplanet.dm
index 011cab93d28..dd79a190583 100644
--- a/code/game/turfs/open/floor/plating/wasteplanet.dm
+++ b/code/game/turfs/open/floor/plating/wasteplanet.dm
@@ -1,3 +1,4 @@
+///base turf
/turf/open/floor/plating/asteroid/wasteplanet
name = "dry rock"
@@ -9,20 +10,18 @@
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
digResult = /obj/item/stack/ore/glass/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
-/turf/open/water/tar/waste
- baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
- planetary_atmos = TRUE
- initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+/turf/open/floor/plating/asteroid/wasteplanet/lit
+ light_range = 2
+ light_power = 0.2
-/turf/open/floor/plating/wasteplanet
- baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
- initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+///plating turfs
-/turf/open/floor/plating/rust/wasteplanet
+/turf/open/floor/plating/wasteplanet
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
- planetary_atmos = TRUE
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/plating/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return
@@ -32,65 +31,306 @@
desc = "Corrupted steel."
icon_state = "plating_rust"
+/turf/open/indestructible/hierophant/waste
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/indestructible/hierophant/two/waste
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
/turf/open/floor/wood/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
+/turf/open/floor/concrete/wasteplanet
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+
+/turf/open/floor/concrete/wasteplanet/Initialize()
+ . = ..()
+ icon_state = pick(list(
+ "conc_smooth",
+ "conc_slab_1",
+ "conc_slab_2",
+ "conc_slab_3",
+ "conc_slab_4",
+ "conc_tiles"
+ ))
+
+/turf/open/floor/concrete/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/turf/open/floor/concrete/reinforced/wasteplanet
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+
+/turf/open/floor/concrete/reinforced/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/turf/open/floor/concrete/pavement/wasteplanet
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+
+/turf/open/floor/concrete/pavement/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/turf/open/floor/plasteel/wasteplanet
+ baseturfs = /turf/open/floor/plating/wasteplanet
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/plasteel/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/turf/open/floor/plasteel/dark/wasteplanet
+ baseturfs = /turf/open/floor/plating/wasteplanet
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/plasteel/dark/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/turf/open/floor/wood/waste
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
/turf/open/indestructible/hierophant/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/indestructible/hierophant/two/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+
+
+
+///liquids
/turf/open/water/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/water/tar/waste
+ baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ planetary_atmos = TRUE
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/water/tar/waste/lit
+ light_range = 2
+ light_power = 0.2
+
+///biological-ish turfs
/turf/open/floor/plating/grass/wasteplanet
icon_state = "junglegrass"
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/plating/dirt/old/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/plating/grass/wasteplanet/lit
+ light_range = 2
+ light_power = 0.2
+
+/turf/open/floor/plating/dirt/old/waste/lit
+ light_range = 2
+ light_power = 0.2
+
+///cement turfs
+
+/turf/open/floor/concrete/wasteplanet
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/concrete/wasteplanet/Initialize()
+ . = ..()
+ icon_state = pick(list(
+ "conc_smooth",
+ "conc_slab_1",
+ "conc_slab_2",
+ "conc_slab_3",
+ "conc_slab_4",
+ "conc_tiles"
+ ))
+
+/turf/open/floor/concrete/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/turf/open/floor/concrete/reinforced/wasteplanet
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/concrete/reinforced/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/turf/open/floor/concrete/pavement/wasteplanet
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/concrete/pavement/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+
+
+///Biological Turfs
+
+/turf/open/floor/plating/grass/wasteplanet
+ icon_state = "junglegrass"
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/plating/dirt/old/waste
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+
+
+
+
//open turfs then open lits.
/turf/open/floor/plating/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
/turf/open/floor/plating/wasteplanet/rust/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
/turf/open/floor/plating/asteroid/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
/turf/open/water/tar/waste/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
-/turf/open/water/waste/lit //do not drink
+/turf/open/floor/concrete/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/concrete/reinforced/wasteplanet/lit
+ light_range = 2
+ light_power = 0.2
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/concrete/pavement/wasteplanet/lit
+ light_range = 2
+ light_power = 0.2
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/plating/dirt/old/waste/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/plating/grass/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/water/waste/lit //do not drink
+ light_range = 2
+ light_power = 0.2
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+//closed turfs are a thing
+/turf/closed/wall/r_wall/wasteplanet
+ max_integrity = 800
+ integrity = 800
+ baseturfs = /turf/open/floor/plating/wasteplanet
+ girder_type = /obj/structure/girder/wasteworld
+
+/turf/closed/wall/r_wall/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(200,400))
+
+
+/turf/closed/wall/r_wall/rust/wasteplanet
+ max_integrity = 600
+ integrity = 600
+ baseturfs = /turf/open/floor/plating/wasteplanet/rust
+ girder_type = /obj/structure/girder/wasteworld
+
+/turf/closed/wall/r_wall/rust/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(0,400))
+
+/turf/closed/wall/wasteplanet
+ max_integrity = 200
+ integrity = 200
+ baseturfs = /turf/open/floor/plating/wasteplanet
+ girder_type = /obj/structure/girder/wasteworld
+
+/turf/closed/wall/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(0,150))
+
+/turf/closed/wall/rust/wasteplanet
+ max_integrity = 100
+ integrity = 100
+ baseturfs = /turf/open/floor/plating/wasteplanet/rust
+ girder_type = /obj/structure/girder/wasteworld
+
+/turf/closed/wall/rust/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(0,100))
+
+/turf/closed/wall/concrete/wasteplanet
+ max_integrity = 200
+ integrity = 200
+ baseturfs = /turf/open/floor/concrete/wasteplanet
+
+/turf/closed/wall/concrete/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(0,100))
+
+/turf/closed/wall/concrete/reinforced/wasteplanet
+ max_integrity = 700
+ integrity = 700
+ baseturfs = /turf/open/floor/concrete/wasteplanet
+
+/turf/closed/wall/concrete/reinforced/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(0,500))
+
+//girlder
+
+/obj/structure/girder/wasteworld
+ max_integrity = 40
diff --git a/code/game/turfs/open/floor/plating/whitesands.dm b/code/game/turfs/open/floor/plating/whitesands.dm
index 6d7d0e3343f..40094890c53 100644
--- a/code/game/turfs/open/floor/plating/whitesands.dm
+++ b/code/game/turfs/open/floor/plating/whitesands.dm
@@ -1,3 +1,5 @@
+///sand (but not like the other sand that's also called sand)
+
/turf/open/floor/plating/asteroid/whitesands
name = "salted sand"
baseturfs = /turf/open/floor/plating/asteroid/whitesands
@@ -6,13 +8,13 @@
icon_plating = "sand"
planetary_atmos = TRUE
base_icon_state = WHITESANDS_SAND_ENV
- initial_gas_mix = WHITESANDS_ATMOS //Fallback, and used to tell the AACs that this is the exterior
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
digResult = /obj/item/stack/ore/glass/whitesands
+ light_color = COLOR_SANDPLANET_LIGHT
/turf/open/floor/plating/asteroid/whitesands/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit
/turf/open/floor/plating/asteroid/whitesands/dried
@@ -29,24 +31,25 @@
/turf/open/floor/plating/asteroid/whitesands/dried/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried/lit
-/turf/open/floor/plating/grass/whitesands
- initial_gas_mix = WHITESANDS_ATMOS
+///basalt
/turf/open/floor/plating/asteroid/basalt/whitesands
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
icon_state = "whitesands_basalt0"
icon_plating = "whitesands_basalt0"
dug = TRUE
+ light_color = COLOR_SANDPLANET_LIGHT
/turf/open/floor/plating/asteroid/basalt/whitesands/Initialize(mapload, inherited_virtual_z)
. = ..()
icon_state = "whitesands_basalt[rand(0,1)]"
+///grass
+
/turf/open/floor/plating/asteroid/whitesands/grass
name = "purple grass"
desc = "The few known flora on Whitesands are in a purplish color."
@@ -55,11 +58,12 @@
base_icon_state = "grass"
baseturfs = /turf/open/floor/plating/asteroid/whitesands
turf_type = /turf/open/floor/plating/asteroid/whitesands/grass
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_GRASS)
canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_GRASS)
+ light_color = COLOR_SANDPLANET_LIGHT
/turf/open/floor/plating/asteroid/whitesands/grass/Initialize(mapload, inherited_virtual_z)
. = ..()
@@ -80,3 +84,50 @@
/turf/open/floor/plating/asteroid/whitesands/grass/dead/lit
light_power = 1
light_range = 2
+
+///the singular snow tile:
+
+/turf/open/floor/plating/asteroid/snow/lit/whitesands
+ light_color = COLOR_SANDPLANET_LIGHT
+ baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/concrete/whitesands
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/concrete/whitesands/lit
+ light_range = 2
+ light_power = 0.6
+
+/turf/open/floor/concrete/reinforced/whitesands
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/concrete/reinforced/whitesands/lit
+ light_range = 2
+ light_power = 0.6
+
+/turf/open/floor/concrete/pavement/whitesands
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/concrete/pavement/whitesands/lit
+ light_range = 2
+ light_power = 0.6
+
+/turf/open/floor/concrete/slab_1/whitesands
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/concrete/slab_1/whitesands/lit
+ light_range = 2
+ light_power = 0.6
+
+/turf/open/floor/plating/whitesands
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/plating/whitesands/lit
+ light_range = 2
+ light_power = 0.6
diff --git a/code/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm
index 7fb94e541bd..9094b0a3238 100644
--- a/code/game/turfs/open/floor/reinf_floor.dm
+++ b/code/game/turfs/open/floor/reinf_floor.dm
@@ -141,36 +141,6 @@
name = "hydrogen mix floor"
initial_gas_mix = ATMOS_TANK_HYDROGEN_FUEL
-/turf/open/floor/engine/cult
- name = "engraved floor"
- desc = "The air smells strange over this sinister flooring."
- icon_state = "plating"
- floor_tile = null
- var/obj/effect/cult_turf/overlay/floor/bloodcult/realappearance
-
-
-/turf/open/floor/engine/cult/Initialize(mapload, inherited_virtual_z)
- . = ..()
- new /obj/effect/temp_visual/cult/turf/floor(src)
- realappearance = new /obj/effect/cult_turf/overlay/floor/bloodcult(src)
- realappearance.linked = src
-
-/turf/open/floor/engine/cult/Destroy()
- be_removed()
- return ..()
-
-/turf/open/floor/engine/cult/ChangeTurf(path, new_baseturf, flags)
- if(path != type)
- be_removed()
- return ..()
-
-/turf/open/floor/engine/cult/proc/be_removed()
- qdel(realappearance)
- realappearance = null
-
-/turf/open/floor/engine/cult/airless
- initial_gas_mix = AIRLESS_ATMOS
-
/turf/open/floor/engine/vacuum
name = "vacuum floor"
initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm
index eb2132940bd..159a32a2ccc 100644
--- a/code/game/turfs/open/lava.dm
+++ b/code/game/turfs/open/lava.dm
@@ -169,7 +169,7 @@
else if (isliving(thing))
. = 1
var/mob/living/L = thing
- if(L.movement_type & FLYING)
+ if(L.movement_type & FLYING || L.throwing)
continue //YOU'RE FLYING OVER IT
var/buckle_check = L.buckling
if(!buckle_check)
@@ -220,19 +220,13 @@
/turf/open/lava/smooth/airless
initial_gas_mix = AIRLESS_ATMOS
-/particles/lava
- width = 700
- height = 700
- count = 1000
- spawning = 1
- lifespan = 3 SECONDS
- fade = 2 SECONDS
- position = generator("circle", 16, 24, NORMAL_RAND)
- drift = generator("vector", list(-0.2, -0.2), list(0.2, 0.2))
- velocity = generator("circle", -6, 6, NORMAL_RAND)
- friction = 0.15
- gradient = list(0,LIGHT_COLOR_FLARE , 0.75, COLOR_ALMOST_BLACK)
- color_change = 0.125
+/obj/effect/particle_holder
+ name = ""
+ anchored = TRUE
+ mouse_opacity = 0
+
+/obj/effect/particle_emitter/Initialize(mapload, time)
+ . = ..()
/obj/effect/particle_emitter/lava
- particles = new/particles/lava
+ particles = new/particles/embers/lava
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index 9128844e1a2..5a78c24dc1f 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -18,27 +18,33 @@
var/datum/reagent/reagent_to_extract = /datum/reagent/water
var/extracted_reagent_visible_name = "water"
-/*
-/turf/open/water/attackby(obj/item/tool, mob/user, params)
+/turf/open/water/examine(mob/user)
+ . = ..()
+ if(reagent_to_extract)
+ . += span_notice("You could probably scoop some of the [extracted_reagent_visible_name] if you had a beaker...")
+
+/turf/open/water/attackby(obj/item/_item, mob/user, params)
+ if(istype(_item, /obj/item/fish))
+ to_chat(user, span_notice("You toss the [_item.name] into the [name]."))
+ playsound(_item, "sound/effects/bigsplash.ogg", 90)
+ qdel(_item)
+ if(istype(_item, /obj/item/reagent_containers/glass))
+ extract_reagents(_item,user,params)
+
+ . = ..()
+
+/turf/open/water/proc/extract_reagents(obj/item/reagent_containers/glass/container, mob/user, params)
if(!reagent_to_extract)
- return ..()
- var/obj/item/reagent_containers/glass/container = tool
- if(!istype(tool, /obj/item/reagent_containers))
- return ..()
+ return FALSE
+ if(!container.is_refillable())
+ to_chat(user, span_danger("\The [container]'s cap is on! Take it off first."))
+ return FALSE
if(container.reagents.total_volume >= container.volume)
- to_chat(user, "[container] is full.")
- return
+ to_chat(user, span_danger("\The [container] is full."))
+ return FALSE
container.reagents.add_reagent(reagent_to_extract, rand(5, 10))
- user.visible_message("[user] scoops [extracted_reagent_visible_name] from the [src] with \the [container].", "You scoop out [extracted_reagent_visible_name] from the [src] using \the [container].")
+ user.visible_message(span_notice("[user] scoops [extracted_reagent_visible_name] from the [src] with \the [container]."), span_notice("You scoop out [extracted_reagent_visible_name] from the [src] using \the [container]."))
return TRUE
-*/
-
-/turf/open/water/attackby(obj/item/fish, mob/user, params)
- . = ..()
- if(istype(fish, /obj/item/fish))
- to_chat(user, "You toss the [fish.name] into the water.")
- playsound(fish, "sound/effects/bigsplash.ogg", 90)
- qdel(fish)
/turf/open/water/can_have_cabling()
return FALSE
@@ -52,7 +58,7 @@
/turf/open/water/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_FLOORWALL)
- to_chat(user, "You build a floor.")
+ to_chat(user, span_notice("You build a floor."))
PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
return TRUE
return FALSE
@@ -64,6 +70,7 @@
light_range = 2
light_power = 0.6
light_color = COLOR_VERY_LIGHT_GRAY
+ initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
/turf/open/water/jungle/Initialize(mapload)
. = ..()
@@ -85,7 +92,7 @@
/turf/open/water/tar
name = "tar pit"
- desc = "Shallow tar. Will slow you down significantly. You could use a beaker to scoop some out..."
+ desc = "Shallow tar. Will slow you down significantly."
color = "#473a3a"
light_range = 0
slowdown = 2
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index e5cc9709559..4da6e25703b 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -378,7 +378,7 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists)
/turf/open/Entered(atom/movable/AM)
. =..()
//melting
- if(isobj(AM) && air && air.return_temperature() > T0C)
+ if(isobj(AM) && air?.return_temperature() > T0C)
var/obj/O = AM
if(O.obj_flags & FROZEN)
O.make_unfrozen()
@@ -582,8 +582,8 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists)
/turf/proc/acid_melt()
return
-/turf/handle_fall(mob/faller)
- if(has_gravity(src))
+/turf/handle_fall(mob/faller, fall_sound_played)
+ if(has_gravity(src) && !fall_sound_played)
playsound(src, "bodyfall", 50, TRUE)
faller.drop_all_held_items()
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 82e75d63b30..a438fa57a06 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -153,7 +153,6 @@
body += "Make Robot"
body += "Make Alien"
body += "Make Slime"
- body += "Make Blob"
//Simple Animals
if(isanimal(M))
@@ -196,6 +195,7 @@
body += "Thunderdome 2"
body += "Thunderdome Admin"
body += "Thunderdome Observer"
+ body += "Commend Behavior | "
body += " "
body += ""
@@ -851,22 +851,6 @@
if(!ai_number)
to_chat(usr, "No AIs located" , confidential = TRUE)
-/datum/admins/proc/output_all_devil_info()
- var/devil_number = 0
- for(var/datum/mind/D in SSticker.mode.devils)
- devil_number++
- var/datum/antagonist/devil/devil = D.has_antag_datum(/datum/antagonist/devil)
- to_chat(usr, "Devil #[devil_number]:
"}
- var/list/mobs = sortmobs()
+ var/list/mobs = SSpoints_of_interest.get_mob_pois()
var/i = 1
- for(var/mob/M in mobs)
+ for(var/mob_name in mobs)
+ var/mob/M = mobs[mob_name]
if(M.ckey)
var/color = "#e6e6e6"
@@ -254,12 +255,7 @@
M_job = "Silicon-based"
else if(isanimal(M)) //simple animals
- if(iscorgi(M))
- M_job = "Corgi"
- else if(isslime(M))
- M_job = "slime"
- else
- M_job = "Animal"
+ M_job = "Animal"
else
M_job = "Living"
diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm
index bde0a7676fa..bd3d189f85e 100644
--- a/code/modules/admin/sql_ban_system.dm
+++ b/code/modules/admin/sql_ban_system.dm
@@ -284,9 +284,9 @@
output += ""
var/list/long_job_lists = list("Service" = GLOB.service_positions,
"Ghost and Other Roles" = list(ROLE_BRAINWASHED, ROLE_DEATHSQUAD, ROLE_DRONE, ROLE_LAVALAND, ROLE_MIND_TRANSFER, ROLE_POSIBRAIN, ROLE_SENTIENCE),
- "Antagonist Positions" = list(ROLE_ABDUCTOR, ROLE_ALIEN, ROLE_BLOB,
- ROLE_BROTHER, ROLE_CHANGELING, ROLE_CULTIST,
- ROLE_DEVIL, ROLE_INTERNAL_AFFAIRS, ROLE_MALF,
+ "Antagonist Positions" = list(ROLE_ABDUCTOR, ROLE_ALIEN,
+ ROLE_BROTHER, ROLE_CHANGELING,
+ ROLE_INTERNAL_AFFAIRS, ROLE_MALF,
ROLE_MONKEY, ROLE_NINJA, ROLE_OPERATIVE,
ROLE_OVERTHROW, ROLE_REV, ROLE_REVENANT,
ROLE_REV_HEAD, ROLE_SYNDICATE,
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 2e4b1c60acd..9b757bae25f 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -78,13 +78,6 @@
else
message_admins("[key_name_admin(usr)] tried to create changelings. Unfortunately, there were no candidates available.")
log_admin("[key_name(usr)] failed to create changelings.")
- if("cult")
- if(src.makeCult())
- message_admins("[key_name(usr)] started a cult.")
- log_admin("[key_name(usr)] started a cult.")
- else
- message_admins("[key_name_admin(usr)] tried to start a cult. Unfortunately, there were no candidates available.")
- log_admin("[key_name(usr)] failed to start a cult.")
if("wizard")
message_admins("[key_name(usr)] is creating a wizard...")
if(src.makeWizard())
@@ -117,13 +110,6 @@
else
message_admins("[key_name_admin(usr)] tried to create a death squad. Unfortunately, there were not enough candidates available.")
log_admin("[key_name(usr)] failed to create a death squad.")
- if("blob")
- var/strength = input("Set Blob Resource Gain Rate","Set Resource Rate",1) as num|null
- if(!strength)
- return
- message_admins("[key_name(usr)] spawned a blob with base resource gain [strength].")
- log_admin("[key_name(usr)] spawned a blob with base resource gain [strength].")
- new/datum/round_event/ghost_role/blob(TRUE, strength)
if("centcom")
message_admins("[key_name(usr)] is creating a response team...")
if(src.makeEmergencyresponseteam())
@@ -357,14 +343,6 @@
M.change_mob_type(/mob/living/simple_animal/parrot , null, null, delmob)
if("polyparrot")
M.change_mob_type(/mob/living/simple_animal/parrot/Polly , null, null, delmob)
- if("constructjuggernaut")
- M.change_mob_type(/mob/living/simple_animal/hostile/construct/juggernaut , null, null, delmob)
- if("constructartificer")
- M.change_mob_type(/mob/living/simple_animal/hostile/construct/artificer , null, null, delmob)
- if("constructwraith")
- M.change_mob_type(/mob/living/simple_animal/hostile/construct/wraith , null, null, delmob)
- if("shade")
- M.change_mob_type(/mob/living/simple_animal/shade , null, null, delmob)
else if(href_list["boot2"])
if(!check_rights(R_ADMIN))
@@ -1077,18 +1055,6 @@
usr.client.cmd_admin_slimeize(H)
- else if(href_list["makeblob"])
- if(!check_rights(R_SPAWN))
- return
-
- var/mob/living/carbon/human/H = locate(href_list["makeblob"])
- if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human.", confidential = TRUE)
- return
-
- usr.client.cmd_admin_blobize(H)
-
-
else if(href_list["makerobot"])
if(!check_rights(R_SPAWN))
return
@@ -1159,12 +1125,6 @@
return
output_ai_laws()
- else if(href_list["admincheckdevilinfo"])
- if(!check_rights(R_ADMIN))
- return
- var/mob/M = locate(href_list["admincheckdevilinfo"])
- output_devil_info(M)
-
else if(href_list["adminmoreinfo"])
var/mob/M = locate(href_list["adminmoreinfo"]) in GLOB.mob_list
if(!ismob(M))
@@ -1236,9 +1196,9 @@
//milk to plasmemes and skeletons, meat to lizards, electricity bars to ethereals, cookies to everyone else
var/obj/item/reagent_containers/food/cookiealt = /obj/item/reagent_containers/food/snacks/cookie
if(isskeleton(H))
- cookiealt = /obj/item/reagent_containers/food/condiment/milk
+ cookiealt = /obj/item/reagent_containers/condiment/milk
else if(isplasmaman(H))
- cookiealt = /obj/item/reagent_containers/food/condiment/milk
+ cookiealt = /obj/item/reagent_containers/condiment/milk
else if(iselzuose(H))
cookiealt = /obj/item/reagent_containers/food/snacks/energybar
// WS - More fun with cookies - Start
@@ -1992,7 +1952,7 @@
if(response.body == "[]")
dat += "
0 bans detected for [ckey]
"
else
- bans = json_decode(response["body"])
+ bans = json_decode(response.body)
//Ignore bans from non-whitelisted sources, if a whitelist exists
var/list/valid_sources
@@ -2206,6 +2166,19 @@
var/datum/poll_question/poll = locate(href_list["submitoptionpoll"]) in GLOB.polls
poll_option_parse_href(href_list, poll, option)
+ else if(href_list["admincommend"])
+ var/mob/heart_recepient = locate(href_list["admincommend"])
+ if(!heart_recepient?.ckey)
+ to_chat(usr, "This mob either no longer exists or no longer is being controlled by someone!")
+ return
+ switch(tgui_alert(usr, "Would you like the effects to apply immediately or at the end of the round? Applying them now will make it clear it was an admin commendation.", "<3?", list("Apply now", "Apply at round end", "Cancel")))
+ if("Apply now")
+ heart_recepient.receive_heart(usr, instant = TRUE)
+ if("Apply at round end")
+ heart_recepient.receive_heart(usr)
+ else
+ return
+
else if (href_list["interview"])
if(!check_rights(R_ADMIN))
return
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 5ac4714257e..9f779262842 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -883,3 +883,34 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
return_list[ASAY_LINK_NEW_MESSAGE_INDEX] = jointext(msglist, " ") // without tuples, we must make do!
return_list[ASAY_LINK_PINGED_ADMINS_INDEX] = pinged_admins
return return_list
+
+/proc/get_mob_by_name(msg)
+ //This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
+ var/list/ignored_words = list("unknown","the","a","an","of","monkey","alien","as", "i")
+
+ //explode the input msg into a list
+ var/list/msglist = splittext(msg, " ")
+
+ //who might fit the shoe
+ var/list/potential_hits = list()
+
+ for(var/i in GLOB.mob_list)
+ var/mob/M = i
+ var/list/nameWords = list()
+ if(!M.mind)
+ continue
+
+ for(var/string in splittext(lowertext(M.real_name), " "))
+ if(!(string in ignored_words))
+ nameWords += string
+ for(var/string in splittext(lowertext(M.name), " "))
+ if(!(string in ignored_words))
+ nameWords += string
+
+ for(var/string in nameWords)
+ testing("Name word [string]")
+ if(string in msglist)
+ potential_hits += M
+ break
+
+ return potential_hits
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index 9b84224317a..708448cf52c 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -140,7 +140,7 @@
usr.forceMove(M.loc)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Get Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/client/proc/sendmob(mob/M in sortmobs())
+/client/proc/sendmob(mob/M in SSpoints_of_interest.get_mob_pois())
set category = "Admin.Game"
set name = "Send Mob"
if(!src.holder)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 9a226bbcb61..61d8b275783 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -52,21 +52,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
else
alert("Invalid mob")
-/client/proc/cmd_admin_blobize(mob/M in GLOB.mob_list)
- set category = "Event.Fun"
- set name = "Make Blob"
-
- if(!SSticker.HasRoundStarted())
- alert("Wait until the game starts")
- return
- if(ishuman(M))
- log_admin("[key_name(src)] has blobized [M.key].")
- var/mob/living/carbon/human/H = M
- H.become_overmind()
- else
- alert("Invalid mob")
-
-
/client/proc/cmd_admin_animalize(mob/M in GLOB.mob_list)
set category = "Event.Fun"
set name = "Make Simple Animal"
@@ -629,6 +614,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
dellog += "
"
-
-/mob/camera/blob/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
- if (!message)
- return
-
- if (src.client)
- if(client.prefs.muted & MUTE_IC)
- to_chat(src, "You cannot send IC messages (muted).")
- return
- if (!(ignore_spam || forced) && src.client.handle_spam_prevention(message,MUTE_IC))
- return
-
- if (stat)
- return
-
- blob_talk(message)
-
-/mob/camera/blob/proc/blob_talk(message)
-
- message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
-
- if (!message)
- return
-
- src.log_talk(message, LOG_SAY)
-
- var/message_a = say_quote(message)
- var/rendered = "\[Blob Telepathy\] [name]([blobstrain.name]) [message_a]"
-
- for(var/mob/M in GLOB.mob_list)
- if(isovermind(M) || istype(M, /mob/living/simple_animal/hostile/blob))
- to_chat(M, rendered)
- if(isobserver(M))
- var/link = FOLLOW_LINK(M, src)
- to_chat(M, "[link] [rendered]")
-
-/mob/camera/blob/blob_act(obj/structure/blob/B)
- return
-
-/mob/camera/blob/get_status_tab_items()
- . = ..()
- if(blob_core)
- . += "Core Health: [blob_core.obj_integrity]"
- . += "Power Stored: [blob_points]/[max_blob_points]"
- . += "Blobs to Win: [blobs_legit.len]/[blobwincount]"
- if(free_strain_rerolls)
- . += "You have [free_strain_rerolls] Free Strain Reroll\s Remaining"
- if(!placed)
- if(manualplace_min_time)
- . += "Time Before Manual Placement: [max(round((manualplace_min_time - world.time)*0.1, 0.1), 0)]"
- . += "Time Before Automatic Placement: [max(round((autoplace_max_time - world.time)*0.1, 0.1), 0)]"
-
-/mob/camera/blob/Move(NewLoc, Dir = 0)
- if(placed)
- var/obj/structure/blob/B = locate() in range("3x3", NewLoc)
- if(B)
- forceMove(NewLoc)
- else
- return 0
- else
- var/area/A = get_area(NewLoc)
- if(isspaceturf(NewLoc) || istype(A, /area/shuttle)) //if unplaced, can't go on shuttles or space tiles
- return 0
- forceMove(NewLoc)
- return 1
-
-/mob/camera/blob/mind_initialize()
- . = ..()
- var/datum/antagonist/blob/B = mind.has_antag_datum(/datum/antagonist/blob)
- if(!B)
- mind.add_antag_datum(/datum/antagonist/blob)
diff --git a/code/modules/antagonists/blob/powers.dm b/code/modules/antagonists/blob/powers.dm
deleted file mode 100644
index 2fba8e460e2..00000000000
--- a/code/modules/antagonists/blob/powers.dm
+++ /dev/null
@@ -1,394 +0,0 @@
-/mob/camera/blob/proc/can_buy(cost = 15)
- if(blob_points < cost)
- to_chat(src, "You cannot afford this, you need at least [cost] resources!")
- return 0
- add_points(-cost)
- return 1
-
-// Power verbs
-
-/mob/camera/blob/proc/place_blob_core(placement_override, pop_override = FALSE)
- if(placed && placement_override != -1)
- return 1
- if(!placement_override)
- if(!pop_override)
- for(var/mob/living/M in range(7, src))
- if(ROLE_BLOB in M.faction)
- continue
- if(M.client)
- to_chat(src, "There is someone too close to place your blob core!")
- return 0
- for(var/mob/living/M in view(13, src))
- if(ROLE_BLOB in M.faction)
- continue
- if(M.client)
- to_chat(src, "Someone could see your blob core from here!")
- return 0
- var/turf/T = get_turf(src)
- if(T.density)
- to_chat(src, "This spot is too dense to place a blob core on!")
- return 0
- var/area/A = get_area(T)
- if(isspaceturf(T) || A && !(A.area_flags & BLOBS_ALLOWED))
- to_chat(src, "You cannot place your core here!")
- return 0
- for(var/obj/O in T)
- if(istype(O, /obj/structure/blob))
- if(istype(O, /obj/structure/blob/normal))
- qdel(O)
- else
- to_chat(src, "There is already a blob here!")
- return 0
- else if(O.density)
- to_chat(src, "This spot is too dense to place a blob core on!")
- return 0
- if(!pop_override && world.time <= manualplace_min_time && world.time <= autoplace_max_time)
- to_chat(src, "It is too early to place your blob core!")
- return 0
- else if(placement_override == 1)
- var/turf/T = pick(GLOB.blobstart)
- forceMove(T) //got overrided? you're somewhere random, motherfucker
- if(placed && blob_core)
- blob_core.forceMove(loc)
- else
- var/obj/structure/blob/core/core = new(get_turf(src), src, 1)
- core.overmind = src
- blobs_legit += src
- blob_core = core
- core.update_appearance()
- update_health_hud()
- placed = 1
- return 1
-
-/mob/camera/blob/verb/transport_core()
- set category = "Blob"
- set name = "Jump to Core"
- set desc = "Move your camera to your core."
- if(blob_core)
- forceMove(blob_core.drop_location())
-
-/mob/camera/blob/verb/jump_to_node()
- set category = "Blob"
- set name = "Jump to Node"
- set desc = "Move your camera to a selected node."
- if(GLOB.blob_nodes.len)
- var/list/nodes = list()
- for(var/i in 1 to GLOB.blob_nodes.len)
- var/obj/structure/blob/node/B = GLOB.blob_nodes[i]
- nodes["Blob Node #[i] ([get_area_name(B)])"] = B
- var/node_name = input(src, "Choose a node to jump to.", "Node Jump") in nodes
- var/obj/structure/blob/node/chosen_node = nodes[node_name]
- if(chosen_node)
- forceMove(chosen_node.loc)
-
-/mob/camera/blob/proc/createSpecial(price, blobstrain, nearEquals, needsNode, turf/T)
- if(!T)
- T = get_turf(src)
- var/obj/structure/blob/B = (locate(/obj/structure/blob) in T)
- if(!B)
- to_chat(src, "There is no blob here!")
- return
- if(!istype(B, /obj/structure/blob/normal))
- to_chat(src, "Unable to use this blob, find a normal one.")
- return
- if(needsNode)
- var/area/A = get_area(src)
- if(!(A.area_flags & BLOBS_ALLOWED)) //factory and resource blobs must be legit
- to_chat(src, "This type of blob must be placed on the station!")
- return
- if(nodes_required && !(locate(/obj/structure/blob/node) in orange(3, T)) && !(locate(/obj/structure/blob/core) in orange(4, T)))
- to_chat(src, "You need to place this blob closer to a node or core!")
- return //handholdotron 2000
- if(nearEquals)
- for(var/obj/structure/blob/L in orange(nearEquals, T))
- if(L.type == blobstrain)
- to_chat(src, "There is a similar blob nearby, move more than [nearEquals] tiles away from it!")
- return
- if(!can_buy(price))
- return
- var/obj/structure/blob/N = B.change_to(blobstrain, src)
- return N
-
-/mob/camera/blob/verb/toggle_node_req()
- set category = "Blob"
- set name = "Toggle Node Requirement"
- set desc = "Toggle requiring nodes to place resource and factory blobs."
- nodes_required = !nodes_required
- if(nodes_required)
- to_chat(src, "You now require a nearby node or core to place factory and resource blobs.")
- else
- to_chat(src, "You no longer require a nearby node or core to place factory and resource blobs.")
-
-/mob/camera/blob/verb/create_shield_power()
- set category = "Blob"
- set name = "Create/Upgrade Shield Blob (15)"
- set desc = "Create a shield blob, which will block fire and is hard to kill. Using this on an existing shield blob turns it into a reflective blob, capable of reflecting most projectiles but making it twice as weak to brute attacks."
- create_shield()
-
-/mob/camera/blob/proc/create_shield(turf/T)
- var/obj/structure/blob/shield/S = locate(/obj/structure/blob/shield) in T
- if(S)
- if(!can_buy(BLOB_REFLECTOR_COST))
- return
- if(S.obj_integrity < S.max_integrity * 0.5)
- add_points(BLOB_REFLECTOR_COST)
- to_chat(src, "This shield blob is too damaged to be modified properly!")
- return
- to_chat(src, "You secrete a reflective ooze over the shield blob, allowing it to reflect projectiles at the cost of reduced integrity.")
- S.change_to(/obj/structure/blob/shield/reflective, src)
- else
- createSpecial(15, /obj/structure/blob/shield, 0, 0, T)
-
-/mob/camera/blob/verb/create_resource()
- set category = "Blob"
- set name = "Create Resource Blob (40)"
- set desc = "Create a resource tower which will generate resources for you."
- createSpecial(40, /obj/structure/blob/resource, 4, 1)
-
-/mob/camera/blob/verb/create_node()
- set category = "Blob"
- set name = "Create Node Blob (50)"
- set desc = "Create a node, which will power nearby factory and resource blobs."
- createSpecial(50, /obj/structure/blob/node, 5, 0)
-
-/mob/camera/blob/verb/create_factory()
- set category = "Blob"
- set name = "Create Factory Blob (60)"
- set desc = "Create a spore tower that will spawn spores to harass your enemies."
- createSpecial(60, /obj/structure/blob/factory, 7, 1)
-
-/mob/camera/blob/verb/create_blobbernaut()
- set category = "Blob"
- set name = "Create Blobbernaut (40)"
- set desc = "Create a powerful blobbernaut which is mildly smart and will attack enemies."
- var/turf/T = get_turf(src)
- var/obj/structure/blob/factory/B = locate(/obj/structure/blob/factory) in T
- if(!B)
- to_chat(src, "You must be on a factory blob!")
- return
- if(B.naut) //if it already made a blobbernaut, it can't do it again
- to_chat(src, "This factory blob is already sustaining a blobbernaut.")
- return
- if(B.obj_integrity < B.max_integrity * 0.5)
- to_chat(src, "This factory blob is too damaged to sustain a blobbernaut.")
- return
- if(!can_buy(40))
- return
-
- B.naut = TRUE //temporary placeholder to prevent creation of more than one per factory.
- to_chat(src, "You attempt to produce a blobbernaut.")
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as a [blobstrain.name] blobbernaut?", ROLE_BLOB, null, ROLE_BLOB, 50) //players must answer rapidly
- if(LAZYLEN(candidates)) //if we got at least one candidate, they're a blobbernaut now.
- B.max_integrity = initial(B.max_integrity) * 0.25 //factories that produced a blobbernaut have much lower health
- B.obj_integrity = min(B.obj_integrity, B.max_integrity)
- B.update_appearance()
- B.visible_message("The blobbernaut [pick("rips", "tears", "shreds")] its way out of the factory blob!")
- playsound(B.loc, 'sound/effects/splat.ogg', 50, TRUE)
- var/mob/living/simple_animal/hostile/blob/blobbernaut/blobber = new /mob/living/simple_animal/hostile/blob/blobbernaut(get_turf(B))
- flick("blobbernaut_produce", blobber)
- B.naut = blobber
- blobber.factory = B
- blobber.overmind = src
- blobber.update_icons()
- blobber.adjustHealth(blobber.maxHealth * 0.5)
- blob_mobs += blobber
- var/mob/dead/observer/C = pick(candidates)
- blobber.key = C.key
- SEND_SOUND(blobber, sound('sound/effects/blobattack.ogg'))
- SEND_SOUND(blobber, sound('sound/effects/attackblob.ogg'))
- to_chat(blobber, "You are a blobbernaut!")
- to_chat(blobber, "You are powerful, hard to kill, and slowly regenerate near nodes and cores, but will slowly die if not near the blob or if the factory that made you is killed.")
- to_chat(blobber, "You can communicate with other blobbernauts and overminds via :b")
- to_chat(blobber, "Your overmind's blob reagent is: [blobstrain.name]!")
- to_chat(blobber, "The [blobstrain.name] reagent [blobstrain.shortdesc ? "[blobstrain.shortdesc]" : "[blobstrain.description]"]")
- else
- to_chat(src, "You could not conjure a sentience for your blobbernaut. Your points have been refunded. Try again later.")
- add_points(40)
- B.naut = null
-
-/mob/camera/blob/verb/relocate_core()
- set category = "Blob"
- set name = "Relocate Core (80)"
- set desc = "Swaps the locations of your core and the selected node."
- var/turf/T = get_turf(src)
- var/obj/structure/blob/node/B = locate(/obj/structure/blob/node) in T
- if(!B)
- to_chat(src, "You must be on a blob node!")
- return
- if(!blob_core)
- to_chat(src, "You have no core and are about to die! May you rest in peace.")
- return
- var/area/A = get_area(T)
- if(isspaceturf(T) || A && !(A.area_flags & BLOBS_ALLOWED))
- to_chat(src, "You cannot relocate your core here!")
- return
- if(!can_buy(80))
- return
- var/turf/old_turf = get_turf(blob_core)
- var/olddir = blob_core.dir
- blob_core.forceMove(T)
- blob_core.setDir(B.dir)
- B.forceMove(old_turf)
- B.setDir(olddir)
-
-/mob/camera/blob/verb/revert()
- set category = "Blob"
- set name = "Remove Blob"
- set desc = "Removes a blob, giving you back some resources."
- var/turf/T = get_turf(src)
- remove_blob(T)
-
-/mob/camera/blob/proc/remove_blob(turf/T)
- var/obj/structure/blob/B = locate() in T
- if(!B)
- to_chat(src, "There is no blob there!")
- return
- if(B.point_return < 0)
- to_chat(src, "Unable to remove this blob.")
- return
- if(max_blob_points < B.point_return + blob_points)
- to_chat(src, "You have too many resources to remove this blob!")
- return
- if(B.point_return)
- add_points(B.point_return)
- to_chat(src, "Gained [B.point_return] resources from removing \the [B].")
- qdel(B)
-
-// commented out to fix errors with non-constant name/desc. Do we even need this code?
-// /mob/camera/blob/verb/expand_blob_power()
-// set category = "Blob"
-// set name = "Expand/Attack Blob ([BLOB_SPREAD_COST])"
-// set desc = "Attempts to create a new blob in this tile. If the tile isn't clear, instead attacks it, damaging mobs and objects and refunding [BLOB_ATTACK_REFUND] points."
-// var/turf/T = get_turf(src)
-// expand_blob(T)
-
-/mob/camera/blob/proc/expand_blob(turf/T)
- if(world.time < last_attack)
- return
- var/list/possibleblobs = list()
- for(var/obj/structure/blob/AB in range(T, 1))
- possibleblobs += AB
- if(!possibleblobs.len)
- to_chat(src, "There is no blob adjacent to the target tile!")
- return
- if(can_buy(BLOB_SPREAD_COST))
- var/attacksuccess = FALSE
- for(var/mob/living/L in T)
- if(ROLE_BLOB in L.faction) //no friendly/dead fire
- continue
- if(L.stat != DEAD)
- attacksuccess = TRUE
- blobstrain.attack_living(L, possibleblobs)
- var/obj/structure/blob/B = locate() in T
- if(B)
- if(attacksuccess) //if we successfully attacked a turf with a blob on it, only give an attack refund
- B.blob_attack_animation(T, src)
- add_points(BLOB_ATTACK_REFUND)
- else
- to_chat(src, "There is a blob there!")
- add_points(BLOB_SPREAD_COST) //otherwise, refund all of the cost
- else
- var/list/cardinalblobs = list()
- var/list/diagonalblobs = list()
- for(var/I in possibleblobs)
- var/obj/structure/blob/IB = I
- if(get_dir(IB, T) in GLOB.cardinals)
- cardinalblobs += IB
- else
- diagonalblobs += IB
- var/obj/structure/blob/OB
- if(cardinalblobs.len)
- OB = pick(cardinalblobs)
- if(!OB.expand(T, src))
- add_points(BLOB_ATTACK_REFUND) //assume it's attacked SOMETHING, possibly a structure
- else
- OB = pick(diagonalblobs)
- if(attacksuccess)
- OB.blob_attack_animation(T, src)
- playsound(OB, 'sound/effects/splat.ogg', 50, TRUE)
- add_points(BLOB_ATTACK_REFUND)
- else
- add_points(BLOB_SPREAD_COST) //if we're attacking diagonally and didn't hit anything, refund
- if(attacksuccess)
- last_attack = world.time + CLICK_CD_MELEE
- else
- last_attack = world.time + CLICK_CD_RAPID
-
-/mob/camera/blob/verb/rally_spores_power()
- set category = "Blob"
- set name = "Rally Spores"
- set desc = "Rally your spores to move to a target location."
- var/turf/T = get_turf(src)
- rally_spores(T)
-
-/mob/camera/blob/proc/rally_spores(turf/T)
- to_chat(src, "You rally your spores.")
- var/list/surrounding_turfs = block(locate(T.x - 1, T.y - 1, T.z), locate(T.x + 1, T.y + 1, T.z))
- if(!surrounding_turfs.len)
- return
- for(var/mob/living/simple_animal/hostile/blob/blobspore/BS in blob_mobs)
- if(isturf(BS.loc) && get_dist(BS, T) <= 35 && !BS.key)
- BS.LoseTarget()
- BS.Goto(pick(surrounding_turfs), BS.move_to_delay)
-
-/mob/camera/blob/verb/blob_broadcast()
- set category = "Blob"
- set name = "Blob Broadcast"
- set desc = "Speak with your blob spores and blobbernauts as your mouthpieces."
- var/speak_text = stripped_input(src, "What would you like to say with your minions?", "Blob Broadcast", null)
- if(!speak_text)
- return
- else
- to_chat(src, "You broadcast with your minions, [speak_text]")
- for(var/BLO in blob_mobs)
- var/mob/living/simple_animal/hostile/blob/BM = BLO
- if(BM.stat == CONSCIOUS)
- BM.say(speak_text)
-
-/mob/camera/blob/verb/strain_reroll()
- set category = "Blob"
- set name = "Reactive Strain Adaptation (40)"
- set desc = "Replaces your strain with a random, different one."
- if(!rerolling && (free_strain_rerolls || can_buy(40)))
- rerolling = TRUE
- reroll_strain()
- rerolling = FALSE
- if(free_strain_rerolls)
- free_strain_rerolls--
- last_reroll_time = world.time
-
-/mob/camera/blob/proc/reroll_strain()
- var/list/choices = list()
- while (length(choices) < 4)
- var/datum/blobstrain/bs = pick((GLOB.valid_blobstrains))
- choices[initial(bs.name)] = bs
-
- var/choice = input(usr, "Please choose a new strain","Strain") as anything in sortList(choices, /proc/cmp_typepaths_asc)
- if (choice && choices[choice] && !QDELETED(src))
- var/datum/blobstrain/bs = choices[choice]
- set_strain(bs)
-
-
-/mob/camera/blob/verb/blob_help()
- set category = "Blob"
- set name = "*Blob Help*"
- set desc = "Help on how to blob."
- to_chat(src, "As the overmind, you can control the blob!")
- to_chat(src, "Your blob reagent is: [blobstrain.name]!")
- to_chat(src, "The [blobstrain.name] reagent [blobstrain.description]")
- if(blobstrain.effectdesc)
- to_chat(src, "The [blobstrain.name] reagent [blobstrain.effectdesc]")
- to_chat(src, "You can expand, which will attack people, damage objects, or place a Normal Blob if the tile is clear.")
- to_chat(src, "Normal Blobs will expand your reach and can be upgraded into special blobs that perform certain functions.")
- to_chat(src, "You can upgrade normal blobs into the following types of blob:")
- to_chat(src, "Shield Blobs are strong and expensive blobs which take more damage. In additon, they are fireproof and can block air, use these to protect yourself from station fires. Upgrading them again will result in a reflective blob, capable of reflecting most projectiles at the cost of the strong blob's extra health.")
- to_chat(src, "Resource Blobs are blobs which produce more resources for you, build as many of these as possible to consume the station. This type of blob must be placed near node blobs or your core to work.")
- to_chat(src, "Factory Blobs are blobs that spawn blob spores which will attack nearby enemies. This type of blob must be placed near node blobs or your core to work.")
- to_chat(src, "Blobbernauts can be produced from factories for a cost, and are hard to kill, powerful, and moderately smart. The factory used to create one will become fragile and briefly unable to produce spores.")
- to_chat(src, "Node Blobs are blobs which grow, like the core. Like the core it can activate resource and factory blobs.")
- to_chat(src, "In addition to the buttons on your HUD, there are a few click shortcuts to speed up expansion and defense.")
- to_chat(src, "Shortcuts: Click = Expand Blob | Middle Mouse Click = Rally Spores | Ctrl Click = Create Shield Blob | Alt Click = Remove Blob")
- to_chat(src, "Attempting to talk will send a message to all other overminds, allowing you to coordinate with them.")
- if(!placed && autoplace_max_time <= world.time)
- to_chat(src, "You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].")
- to_chat(src, "You [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen.")
diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm
deleted file mode 100644
index 31401dab8bb..00000000000
--- a/code/modules/antagonists/blob/structures/_blob.dm
+++ /dev/null
@@ -1,361 +0,0 @@
-//I will need to recode parts of this but I am way too tired atm //I don't know who left this comment but they never did come back
-/obj/structure/blob
- name = "blob"
- icon = 'icons/mob/blob.dmi'
- light_range = 2
- desc = "A thick wall of writhing tendrils."
- density = FALSE //this being false causes two bugs, being able to attack blob tiles behind other blobs and being unable to move on blob tiles in no gravity, but turning it to 1 causes the blob mobs to be unable to path through blobs, which is probably worse.
- opacity = FALSE
- anchored = TRUE
- layer = BELOW_MOB_LAYER
- pass_flags_self = PASSBLOB
- CanAtmosPass = ATMOS_PASS_PROC
- var/point_return = 0 //How many points the blob gets back when it removes a blob of that type. If less than 0, blob cannot be removed.
- max_integrity = 30
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
- var/health_regen = 2 //how much health this blob regens when pulsed
- var/pulse_timestamp = 0 //we got pulsed when?
- var/heal_timestamp = 0 //we got healed when?
- var/brute_resist = 0.5 //multiplies brute damage by this
- var/fire_resist = 1 //multiplies burn damage by this
- var/atmosblock = FALSE //if the blob blocks atmos and heat spread
- var/mob/camera/blob/overmind
-
-/obj/structure/blob/Initialize(mapload, owner_overmind)
- . = ..()
- if(owner_overmind)
- overmind = owner_overmind
- var/area/Ablob = get_area(src)
- if(Ablob.area_flags & BLOBS_ALLOWED) //Is this area allowed for winning as blob?
- overmind.blobs_legit += src
- GLOB.blobs += src //Keep track of the blob in the normal list either way
- setDir(pick(GLOB.cardinals))
- update_appearance()
- if(atmosblock)
- air_update_turf(TRUE)
- ConsumeTile()
-
-/obj/structure/blob/proc/creation_action() //When it's created by the overmind, do this.
- return
-
-/obj/structure/blob/Destroy()
- if(atmosblock)
- atmosblock = FALSE
- air_update_turf(TRUE)
- if(overmind)
- overmind.blobs_legit -= src //if it was in the legit blobs list, it isn't now
- GLOB.blobs -= src //it's no longer in the all blobs list either
- playsound(src.loc, 'sound/effects/splat.ogg', 50, TRUE) //Expand() is no longer broken, no check necessary.
- return ..()
-
-/obj/structure/blob/blob_act()
- return
-
-/obj/structure/blob/Adjacent(atom/neighbour)
- . = ..()
- if(.)
- var/result = 0
- var/direction = get_dir(src, neighbour)
- var/list/dirs = list("[NORTHWEST]" = list(NORTH, WEST), "[NORTHEAST]" = list(NORTH, EAST), "[SOUTHEAST]" = list(SOUTH, EAST), "[SOUTHWEST]" = list(SOUTH, WEST))
- for(var/A in dirs)
- if(direction == text2num(A))
- for(var/B in dirs[A])
- var/C = locate(/obj/structure/blob) in get_step(src, B)
- if(C)
- result++
- . -= result - 1
-
-/obj/structure/blob/BlockThermalConductivity()
- return atmosblock
-
-/obj/structure/blob/CanAtmosPass(turf/T)
- return !atmosblock
-
-/obj/structure/blob/update_icon() //Updates color based on overmind color if we have an overmind.
- . = ..()
- if(overmind)
- add_atom_colour(overmind.blobstrain.color, FIXED_COLOUR_PRIORITY)
- else
- remove_atom_colour(FIXED_COLOUR_PRIORITY)
-
-/obj/structure/blob/proc/Pulse_Area(mob/camera/blob/pulsing_overmind, claim_range = 10, pulse_range = 3, expand_range = 2)
- if(QDELETED(pulsing_overmind))
- pulsing_overmind = overmind
- Be_Pulsed()
- var/expanded = FALSE
- if(prob(70) && expand())
- expanded = TRUE
- var/list/blobs_to_affect = list()
- for(var/obj/structure/blob/B in urange(claim_range, src, 1))
- blobs_to_affect += B
- shuffle_inplace(blobs_to_affect)
- for(var/L in blobs_to_affect)
- var/obj/structure/blob/B = L
- if(!B.overmind && !istype(B, /obj/structure/blob/core) && prob(30))
- B.overmind = pulsing_overmind //reclaim unclaimed, non-core blobs.
- B.update_appearance()
- var/distance = get_dist(get_turf(src), get_turf(B))
- var/expand_probablity = max(20 - distance * 8, 1)
- if(B.Adjacent(src))
- expand_probablity = 20
- if(distance <= expand_range)
- var/can_expand = TRUE
- if(blobs_to_affect.len >= 120 && B.heal_timestamp > world.time)
- can_expand = FALSE
- if(can_expand && B.pulse_timestamp <= world.time && prob(expand_probablity))
- var/obj/structure/blob/newB = B.expand(null, null, !expanded) //expansion falls off with range but is faster near the blob causing the expansion
- if(newB)
- if(expanded)
- qdel(newB)
- expanded = TRUE
- if(distance <= pulse_range)
- B.Be_Pulsed()
-
-/obj/structure/blob/proc/Be_Pulsed()
- if(pulse_timestamp <= world.time)
- ConsumeTile()
- if(heal_timestamp <= world.time)
- obj_integrity = min(max_integrity, obj_integrity+health_regen)
- heal_timestamp = world.time + 20
- update_appearance()
- pulse_timestamp = world.time + 10
- return 1 //we did it, we were pulsed!
- return 0 //oh no we failed
-
-/obj/structure/blob/proc/ConsumeTile()
- for(var/atom/A in loc)
- A.blob_act(src)
- if(iswallturf(loc))
- loc.blob_act(src) //don't ask how a wall got on top of the core, just eat it
-
-/obj/structure/blob/proc/blob_attack_animation(atom/A = null, controller) //visually attacks an atom
- var/obj/effect/temp_visual/blob/O = new /obj/effect/temp_visual/blob(src.loc)
- O.setDir(dir)
- if(controller)
- var/mob/camera/blob/BO = controller
- O.color = BO.blobstrain.color
- O.alpha = 200
- else if(overmind)
- O.color = overmind.blobstrain.color
- if(A)
- O.do_attack_animation(A) //visually attack the whatever
- return O //just in case you want to do something to the animation.
-
-/obj/structure/blob/proc/expand(turf/T = null, controller = null, expand_reaction = 1)
- if(!T)
- var/list/dirs = list(1,2,4,8)
- for(var/i = 1 to 4)
- var/dirn = pick(dirs)
- dirs.Remove(dirn)
- T = get_step(src, dirn)
- if(!(locate(/obj/structure/blob) in T))
- break
- else
- T = null
- if(!T)
- return 0
- var/make_blob = TRUE //can we make a blob?
-
- if(isspaceturf(T) && !(locate(/obj/structure/lattice) in T) && prob(80))
- make_blob = FALSE
- playsound(src.loc, 'sound/effects/splat.ogg', 50, TRUE) //Let's give some feedback that we DID try to spawn in space, since players are used to it
-
- ConsumeTile() //hit the tile we're in, making sure there are no border objects blocking us
- if(!T.CanPass(src, get_dir(T, src))) //is the target turf impassable
- make_blob = FALSE
- T.blob_act(src) //hit the turf if it is
- for(var/atom/A in T)
- if(!A.CanPass(src, get_dir(T, src))) //is anything in the turf impassable
- make_blob = FALSE
- A.blob_act(src) //also hit everything in the turf
-
- if(make_blob) //well, can we?
- var/obj/structure/blob/B = new /obj/structure/blob/normal(src.loc, (controller || overmind))
- B.density = TRUE
- if(T.Enter(B,src)) //NOW we can attempt to move into the tile
- B.density = initial(B.density)
- B.forceMove(T)
- B.update_appearance()
- if(B.overmind && expand_reaction)
- B.overmind.blobstrain.expand_reaction(src, B, T, controller)
- return B
- else
- blob_attack_animation(T, controller)
- T.blob_act(src) //if we can't move in hit the turf again
- qdel(B) //we should never get to this point, since we checked before moving in. destroy the blob so we don't have two blobs on one tile
- return null
- else
- blob_attack_animation(T, controller) //if we can't, animate that we attacked
- return null
-
-/obj/structure/blob/emp_act(severity)
- . = ..()
- if(. & EMP_PROTECT_SELF)
- return
- if(severity > 0)
- if(overmind)
- overmind.blobstrain.emp_reaction(src, severity)
- if(prob(100 - severity * 30))
- new /obj/effect/temp_visual/emp(get_turf(src))
-
-/obj/structure/blob/zap_act(power)
- . = ..()
- if(overmind)
- if(overmind.blobstrain.tesla_reaction(src, power))
- take_damage(power/400, BURN, "energy")
- else
- take_damage(power/400, BURN, "energy")
-
-/obj/structure/blob/extinguish()
- ..()
- if(overmind)
- overmind.blobstrain.extinguish_reaction(src)
-
-/obj/structure/blob/hulk_damage()
- return 15
-
-/obj/structure/blob/attackby(obj/item/I, mob/user, params)
- if(I.tool_behaviour == TOOL_ANALYZER)
- user.changeNext_move(CLICK_CD_MELEE)
- to_chat(user, "The analyzer beeps once, then reports: ")
- SEND_SOUND(user, sound('sound/machines/ping.ogg'))
- if(overmind)
- to_chat(user, "Progress to Critical Mass:[overmind.blobs_legit.len]/[overmind.blobwincount].")
- to_chat(user, chemeffectreport(user).Join("\n"))
- else
- to_chat(user, "Blob core neutralized. Critical mass no longer attainable.")
- to_chat(user, typereport(user).Join("\n"))
- else
- return ..()
-
-/obj/structure/blob/proc/chemeffectreport(mob/user)
- RETURN_TYPE(/list)
- . = list()
- if(overmind)
- . += list("Material: [overmind.blobstrain.name].",
- "Material Effects:[overmind.blobstrain.analyzerdescdamage]",
- "Material Properties:[overmind.blobstrain.analyzerdesceffect]")
- else
- . += "No Material Detected!"
-
-/obj/structure/blob/proc/typereport(mob/user)
- RETURN_TYPE(/list)
- return list("Blob Type:[uppertext(initial(name))]",
- "Health:[obj_integrity]/[max_integrity]",
- "Effects:[scannerreport()]")
-
-
-/obj/structure/blob/attack_animal(mob/living/simple_animal/M)
- if(ROLE_BLOB in M.faction) //sorry, but you can't kill the blob as a blobbernaut
- return
- ..()
-
-/obj/structure/blob/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
- switch(damage_type)
- if(BRUTE)
- if(damage_amount)
- playsound(src.loc, 'sound/effects/attackblob.ogg', 50, TRUE)
- else
- playsound(src, 'sound/weapons/tap.ogg', 50, TRUE)
- if(BURN)
- playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE)
-
-/obj/structure/blob/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
- switch(damage_type)
- if(BRUTE)
- damage_amount *= brute_resist
- if(BURN)
- damage_amount *= fire_resist
- if(CLONE)
- else
- return 0
- var/armor_protection = 0
- if(damage_flag)
- armor_protection = armor.getRating(damage_flag)
- damage_amount = round(damage_amount * (100 - armor_protection)*0.01, 0.1)
- if(overmind && damage_flag)
- damage_amount = overmind.blobstrain.damage_reaction(src, damage_amount, damage_type, damage_flag)
- return damage_amount
-
-/obj/structure/blob/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
- . = ..()
- if(. && obj_integrity > 0)
- update_appearance()
-
-/obj/structure/blob/obj_destruction(damage_flag)
- if(overmind)
- overmind.blobstrain.death_reaction(src, damage_flag)
- ..()
-
-/obj/structure/blob/proc/change_to(type, controller)
- if(!ispath(type))
- CRASH("change_to(): invalid type for blob")
- var/obj/structure/blob/B = new type(src.loc, controller)
- B.creation_action()
- B.update_appearance()
- B.setDir(dir)
- qdel(src)
- return B
-
-/obj/structure/blob/examine(mob/user)
- . = ..()
- var/datum/atom_hud/hud_to_check = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
- if(user.research_scanner || hud_to_check.hudusers[user])
- . += "Your HUD displays an extensive report... "
- if(overmind)
- . += overmind.blobstrain.examine(user)
- else
- . += "Core neutralized. Critical mass no longer attainable."
- . += chemeffectreport(user)
- . += typereport(user)
- else
- if((user == overmind || isobserver(user)) && overmind)
- . += overmind.blobstrain.examine(user)
- . += "It seems to be made of [get_chem_name()]."
-
-/obj/structure/blob/proc/scannerreport()
- return "A generic blob. Looks like someone forgot to override this proc, adminhelp this."
-
-/obj/structure/blob/proc/get_chem_name()
- if(overmind)
- return overmind.blobstrain.name
- return "some kind of organic tissue"
-
-/obj/structure/blob/normal
- name = "normal blob"
- icon_state = "blob"
- light_range = 0
- obj_integrity = 21 //doesn't start at full health
- max_integrity = 25
- health_regen = 1
- brute_resist = 0.25
-
-/obj/structure/blob/normal/scannerreport()
- if(obj_integrity <= 15)
- return "Currently weak to brute damage."
- return "N/A"
-
-/obj/structure/blob/normal/update_name()
- . = ..()
- name = "[(obj_integrity <= 15) ? "fragile " : (overmind ? null : "dead ")][initial(name)]"
-
-/obj/structure/blob/normal/update_desc()
- . = ..()
- if(obj_integrity <= 15)
- desc = "A thin lattice of slightly twitching tendrils."
- else if(overmind)
- desc = "A thick wall of writhing tendrils."
- else
- desc = "A thick wall of lifeless tendrils."
-
-/obj/structure/blob/normal/update_icon_state()
- icon_state = "blob[(obj_integrity <= 15) ? "_damaged" : null]"
-
- /// - [] TODO: Move this elsewhere
- if(obj_integrity <= 15)
- brute_resist = 0.5
- else if (overmind)
- brute_resist = 0.25
- else
- brute_resist = 0.25
- return ..()
diff --git a/code/modules/antagonists/blob/structures/core.dm b/code/modules/antagonists/blob/structures/core.dm
deleted file mode 100644
index 6a1ccb1dd46..00000000000
--- a/code/modules/antagonists/blob/structures/core.dm
+++ /dev/null
@@ -1,70 +0,0 @@
-/obj/structure/blob/core
- name = "blob core"
- icon = 'icons/mob/blob.dmi'
- icon_state = "blank_blob"
- desc = "A huge, pulsating yellow mass."
- max_integrity = 400
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 90)
- explosion_block = 6
- point_return = -1
- health_regen = 0 //we regen in Life() instead of when pulsed
- resistance_flags = LAVA_PROOF
-
-/obj/structure/blob/core/Initialize(mapload, client/new_overmind = null, placed = 0)
- GLOB.blob_cores += src
- START_PROCESSING(SSobj, src)
- GLOB.poi_list |= src
- update_appearance() //so it atleast appears
- if(!placed && !overmind)
- return INITIALIZE_HINT_QDEL
- if(overmind)
- update_appearance()
- . = ..()
-
-/obj/structure/blob/core/Destroy()
- GLOB.blob_cores -= src
- GLOB.poi_list -= src
- if(overmind)
- overmind.blob_core = null
- overmind = null
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/structure/blob/core/scannerreport()
- return "Directs the blob's expansion, gradually expands, and sustains nearby blob spores and blobbernauts."
-
-/obj/structure/blob/core/update_overlays()
- . = ..()
- var/mutable_appearance/blob_overlay = mutable_appearance('icons/mob/blob.dmi', "blob")
- if(overmind)
- blob_overlay.color = overmind.blobstrain.color
- . += blob_overlay
- . += mutable_appearance('icons/mob/blob.dmi', "blob_core_overlay")
-
-/obj/structure/blob/core/update_appearance()
- color = null
- return ..()
-
-/obj/structure/blob/core/ex_act(severity, target)
- var/damage = 50 - 10 * severity //remember, the core takes half brute damage, so this is 20/15/10 damage based on severity
- take_damage(damage, BRUTE, "bomb", 0)
-
-/obj/structure/blob/core/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, overmind_reagent_trigger = 1)
- . = ..()
- if(obj_integrity > 0)
- if(overmind) //we should have an overmind, but...
- overmind.update_health_hud()
-
-/obj/structure/blob/core/process()
- if(QDELETED(src))
- return
- if(!overmind)
- qdel(src)
- if(overmind)
- overmind.blobstrain.core_process()
- overmind.update_health_hud()
- Pulse_Area(overmind, 12, 4, 3)
- for(var/obj/structure/blob/normal/B in range(1, src))
- if(prob(5))
- B.change_to(/obj/structure/blob/shield/core, overmind)
- ..()
diff --git a/code/modules/antagonists/blob/structures/factory.dm b/code/modules/antagonists/blob/structures/factory.dm
deleted file mode 100644
index 138a359e72e..00000000000
--- a/code/modules/antagonists/blob/structures/factory.dm
+++ /dev/null
@@ -1,47 +0,0 @@
-/obj/structure/blob/factory
- name = "factory blob"
- icon = 'icons/mob/blob.dmi'
- icon_state = "blob_factory"
- desc = "A thick spire of tendrils."
- max_integrity = 200
- health_regen = 1
- point_return = 25
- resistance_flags = LAVA_PROOF
- var/list/spores = list()
- var/mob/living/simple_animal/hostile/blob/blobbernaut/naut = null
- var/max_spores = 3
- var/spore_delay = 0
- var/spore_cooldown = 80 //8 seconds between spores and after spore death
-
-
-/obj/structure/blob/factory/scannerreport()
- if(naut)
- return "It is currently sustaining a blobbernaut, making it fragile and unable to produce blob spores."
- return "Will produce a blob spore every few seconds."
-
-/obj/structure/blob/factory/Destroy()
- for(var/mob/living/simple_animal/hostile/blob/blobspore/spore in spores)
- if(spore.factory == src)
- spore.factory = null
- if(naut)
- naut.factory = null
- to_chat(naut, "Your factory was destroyed! You feel yourself dying!")
- naut.throw_alert("nofactory", /atom/movable/screen/alert/nofactory)
- spores = null
- return ..()
-
-/obj/structure/blob/factory/Be_Pulsed()
- . = ..()
- if(naut)
- return
- if(spores.len >= max_spores)
- return
- if(spore_delay > world.time)
- return
- flick("blob_factory_glow", src)
- spore_delay = world.time + spore_cooldown
- var/mob/living/simple_animal/hostile/blob/blobspore/BS = new/mob/living/simple_animal/hostile/blob/blobspore(src.loc, src)
- if(overmind) //if we don't have an overmind, we don't need to do anything but make a spore
- BS.overmind = overmind
- BS.update_icons()
- overmind.blob_mobs.Add(BS)
diff --git a/code/modules/antagonists/blob/structures/node.dm b/code/modules/antagonists/blob/structures/node.dm
deleted file mode 100644
index de7c674b807..00000000000
--- a/code/modules/antagonists/blob/structures/node.dm
+++ /dev/null
@@ -1,40 +0,0 @@
-/obj/structure/blob/node
- name = "blob node"
- icon = 'icons/mob/blob.dmi'
- icon_state = "blank_blob"
- desc = "A large, pulsating yellow mass."
- max_integrity = 200
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 65, "acid" = 90)
- health_regen = 3
- point_return = 25
- resistance_flags = LAVA_PROOF
-
-
-/obj/structure/blob/node/Initialize()
- GLOB.blob_nodes += src
- START_PROCESSING(SSobj, src)
- . = ..()
-
-/obj/structure/blob/node/scannerreport()
- return "Gradually expands and sustains nearby blob spores and blobbernauts."
-
-/obj/structure/blob/node/update_icon()
- color = null
- return ..()
-
-/obj/structure/blob/special/node/update_overlays()
- . = ..()
- var/mutable_appearance/blob_overlay = mutable_appearance('icons/mob/blob.dmi', "blob")
- if(overmind)
- blob_overlay.color = overmind.blobstrain.color
- . += blob_overlay
- . += mutable_appearance('icons/mob/blob.dmi', "blob_node_overlay")
-
-/obj/structure/blob/node/Destroy()
- GLOB.blob_nodes -= src
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/structure/blob/node/process()
- if(overmind)
- Pulse_Area(overmind, 10, 3, 2)
diff --git a/code/modules/antagonists/blob/structures/resource.dm b/code/modules/antagonists/blob/structures/resource.dm
deleted file mode 100644
index 81eda7f4edd..00000000000
--- a/code/modules/antagonists/blob/structures/resource.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-/obj/structure/blob/resource
- name = "resource blob"
- icon = 'icons/mob/blob.dmi'
- icon_state = "blob_resource"
- desc = "A thin spire of slightly swaying tendrils."
- max_integrity = 60
- point_return = 15
- resistance_flags = LAVA_PROOF
- var/resource_delay = 0
-
-/obj/structure/blob/resource/scannerreport()
- return "Gradually supplies the blob with resources, increasing the rate of expansion."
-
-/obj/structure/blob/resource/creation_action()
- if(overmind)
- overmind.resource_blobs += src
-
-/obj/structure/blob/resource/Destroy()
- if(overmind)
- overmind.resource_blobs -= src
- return ..()
-
-/obj/structure/blob/resource/Be_Pulsed()
- . = ..()
- if(resource_delay > world.time)
- return
- flick("blob_resource_glow", src)
- if(overmind)
- overmind.add_points(1)
- resource_delay = world.time + 40 + overmind.resource_blobs.len * 2.5 //4 seconds plus a quarter second for each resource blob the overmind has
- else
- resource_delay = world.time + 40
diff --git a/code/modules/antagonists/blob/structures/shield.dm b/code/modules/antagonists/blob/structures/shield.dm
deleted file mode 100644
index f0a01f70e1a..00000000000
--- a/code/modules/antagonists/blob/structures/shield.dm
+++ /dev/null
@@ -1,49 +0,0 @@
-/obj/structure/blob/shield
- name = "strong blob"
- icon = 'icons/mob/blob.dmi'
- icon_state = "blob_shield"
- desc = "A solid wall of slightly twitching tendrils."
- var/damaged_desc = "A wall of twitching tendrils."
- max_integrity = 150
- brute_resist = 0.25
- explosion_block = 3
- point_return = 4
- atmosblock = TRUE
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
-
-/obj/structure/blob/shield/scannerreport()
- if(atmosblock)
- return "Will prevent the spread of atmospheric changes."
- return "N/A"
-
-/obj/structure/blob/shield/core
- point_return = 0
-
-/obj/structure/blob/shield/update_name(updates)
- . = ..()
- name = "[(obj_integrity < (max_integrity * 0.5)) ? "weakened " : null][initial(name)]"
-
-/obj/structure/blob/shield/update_desc(updates)
- . = ..()
- desc = (obj_integrity < (max_integrity * 0.5)) ? "[damaged_desc]" : initial(desc)
-
-/obj/structure/blob/shield/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir)
- . = ..()
- if(. && obj_integrity > 0)
- atmosblock = obj_integrity < (max_integrity * 0.5)
- air_update_turf(TRUE, atmosblock)
-
-/obj/structure/blob/shield/update_icon_state()
- icon_state = "[initial(icon_state)][(obj_integrity < (max_integrity * 0.5)) ? "_damaged" : null]"
- return ..()
-
-/obj/structure/blob/shield/reflective
- name = "reflective blob"
- desc = "A solid wall of slightly twitching tendrils with a reflective glow."
- damaged_desc = "A wall of twitching tendrils with a reflective glow."
- icon_state = "blob_glow"
- flags_ricochet = RICOCHET_SHINY
- point_return = 8
- max_integrity = 100
- brute_resist = 0.5
- explosion_block = 2
diff --git a/code/modules/antagonists/blood_contract/blood_contract.dm b/code/modules/antagonists/blood_contract/blood_contract.dm
index edd8aba6042..c56ef47db93 100644
--- a/code/modules/antagonists/blood_contract/blood_contract.dm
+++ b/code/modules/antagonists/blood_contract/blood_contract.dm
@@ -36,6 +36,6 @@
continue
to_chat(P, "You have an overwhelming desire to kill [H]. [H.p_theyve(TRUE)] been marked red! Whoever [H.p_they()] [H.p_were()], friend or foe, go kill [H.p_them()]!")
- var/obj/item/I = new /obj/item/kitchen/knife/butcher(get_turf(P))
+ var/obj/item/I = new /obj/item/melee/knife/butcher(get_turf(P))
P.put_in_hands(I, del_on_fail=TRUE)
QDEL_IN(I, duration)
diff --git a/code/modules/antagonists/borer/borer.dm b/code/modules/antagonists/borer/borer.dm
index 92a1e728dc8..4a3f73da57c 100644
--- a/code/modules/antagonists/borer/borer.dm
+++ b/code/modules/antagonists/borer/borer.dm
@@ -79,7 +79,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
mob_size = MOB_SIZE_SMALL
faction = list("creature")
ventcrawler = VENTCRAWLER_ALWAYS
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
@@ -683,10 +683,6 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
if(docile)
to_chat(src, "You are feeling far too docile to do that.")
return
- if(iscultist(victim) || HAS_TRAIT(victim, TRAIT_MINDSHIELD))
- to_chat(src, "[victim]'s mind seems to be blocked by some unknown force!")
- return
-
else
log_game("[src]/([src.ckey]) assumed control of [victim]/([victim.ckey] with borer powers.")
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index 7d9279f1390..7953f3f7021 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -539,17 +539,6 @@
newprofile.mob_overlay_icon_list = mob_overlay_icon_list.Copy()
newprofile.mob_overlay_state_list = mob_overlay_state_list.Copy() //WS EDIT - Mob Overlay State
-/datum/antagonist/changeling/xenobio
- name = "Xenobio Changeling"
- give_objectives = FALSE
- show_in_roundend = FALSE //These are here for admin tracking purposes only
- you_are_greet = FALSE
-
- chem_storage = 25
- geneticpoints = 2
- chem_recharge_rate = 0.5
- dna_max = 3
-
/datum/antagonist/changeling/roundend_report()
var/list/parts = list()
@@ -582,6 +571,3 @@
/datum/antagonist/changeling/antag_listing_name()
return ..() + "([changelingID])"
-
-/datum/antagonist/changeling/xenobio/antag_listing_name()
- return ..() + "(Xenobio)"
diff --git a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
index 5980993958b..93905c9d6ae 100644
--- a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
+++ b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
@@ -48,7 +48,7 @@
changelings[C] = (CHANGELING_PHEROMONE_MAX_DISTANCE ** 2) - (distance ** 2)
if(changelings.len)
- scan_target = pickweight(changelings) //Point at a 'random' changeling, biasing heavily towards closer ones.
+ scan_target = pick_weight(changelings) //Point at a 'random' changeling, biasing heavily towards closer ones.
else
scan_target = null
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
deleted file mode 100644
index c9232857a54..00000000000
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ /dev/null
@@ -1,849 +0,0 @@
-/datum/action/innate/cult/blood_magic //Blood magic handles the creation of blood spells (formerly talismans)
- name = "Prepare Blood Magic"
- button_icon_state = "carve"
- desc = "Prepare blood magic by carving runes into your flesh. This is easier with an empowering rune."
- var/list/spells = list()
- var/channeling = FALSE
-
-/datum/action/innate/cult/blood_magic/Grant()
- ..()
- button.screen_loc = DEFAULT_BLOODSPELLS
- button.moved = DEFAULT_BLOODSPELLS
- button.ordered = FALSE
-
-/datum/action/innate/cult/blood_magic/Remove()
- for(var/X in spells)
- qdel(X)
- ..()
-
-/datum/action/innate/cult/blood_magic/IsAvailable()
- if(!iscultist(owner))
- return FALSE
- return ..()
-
-/datum/action/innate/cult/blood_magic/proc/Positioning()
- var/list/screen_loc_split = splittext(button.screen_loc,",")
- var/list/screen_loc_X = splittext(screen_loc_split[1],":")
- var/list/screen_loc_Y = splittext(screen_loc_split[2],":")
- var/pix_X = text2num(screen_loc_X[2])
- for(var/datum/action/innate/cult/blood_spell/B in spells)
- if(B.button.locked)
- var/order = pix_X+spells.Find(B)*31
- B.button.screen_loc = "[screen_loc_X[1]]:[order],[screen_loc_Y[1]]:[screen_loc_Y[2]]"
- B.button.moved = B.button.screen_loc
-
-/datum/action/innate/cult/blood_magic/Activate()
- var/rune = FALSE
- var/limit = RUNELESS_MAX_BLOODCHARGE
- for(var/obj/effect/rune/empower/R in range(1, owner))
- rune = TRUE
- break
- if(rune)
- limit = MAX_BLOODCHARGE
- if(spells.len >= limit)
- if(rune)
- to_chat(owner, "You cannot store more than [MAX_BLOODCHARGE] spells. Pick a spell to remove.")
- else
- to_chat(owner, "You cannot store more than [RUNELESS_MAX_BLOODCHARGE] spells without an empowering rune! Pick a spell to remove.")
- var/nullify_spell = input(owner, "Choose a spell to remove.", "Current Spells") as null|anything in spells
- if(nullify_spell)
- qdel(nullify_spell)
- return
- var/entered_spell_name
- var/datum/action/innate/cult/blood_spell/BS
- var/list/possible_spells = list()
- for(var/I in subtypesof(/datum/action/innate/cult/blood_spell))
- var/datum/action/innate/cult/blood_spell/J = I
- var/cult_name = initial(J.name)
- possible_spells[cult_name] = J
- possible_spells += "(REMOVE SPELL)"
- entered_spell_name = input(owner, "Pick a blood spell to prepare...", "Spell Choices") as null|anything in possible_spells
- if(entered_spell_name == "(REMOVE SPELL)")
- var/nullify_spell = input(owner, "Choose a spell to remove.", "Current Spells") as null|anything in spells
- if(nullify_spell)
- qdel(nullify_spell)
- return
- BS = possible_spells[entered_spell_name]
- if(QDELETED(src) || owner.incapacitated() || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (spells.len >= limit))
- return
- to_chat(owner,"You begin to carve unnatural symbols into your flesh!")
- SEND_SOUND(owner, sound('sound/weapons/slice.ogg',0,1,10))
- if(!channeling)
- channeling = TRUE
- else
- to_chat(owner, "You are already invoking blood magic!")
- return
- if(do_after(owner, 100 - rune*60, target = owner))
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.bleed(40 - rune*32)
- var/datum/action/innate/cult/blood_spell/new_spell = new BS(owner)
- new_spell.Grant(owner, src)
- spells += new_spell
- Positioning()
- to_chat(owner, "Your wounds glow with power, you have prepared a [new_spell.name] invocation!")
- channeling = FALSE
-
-/datum/action/innate/cult/blood_spell //The next generation of talismans, handles storage/creation of blood magic
- name = "Blood Magic"
- button_icon_state = "telerune"
- desc = "Fear the Old Blood."
- var/charges = 1
- var/magic_path = null
- var/obj/item/melee/blood_magic/hand_magic
- var/datum/action/innate/cult/blood_magic/all_magic
- var/base_desc //To allow for updating tooltips
- var/invocation
- var/health_cost = 0
-
-/datum/action/innate/cult/blood_spell/Grant(mob/living/owner, datum/action/innate/cult/blood_magic/BM)
- if(health_cost)
- desc += " Deals [health_cost] damage to your arm per use."
- base_desc = desc
- desc += " Has [charges] use\s remaining."
- all_magic = BM
- ..()
- button.locked = TRUE
- button.ordered = FALSE
-
-/datum/action/innate/cult/blood_spell/Remove()
- if(all_magic)
- all_magic.spells -= src
- if(hand_magic)
- qdel(hand_magic)
- hand_magic = null
- ..()
-
-/datum/action/innate/cult/blood_spell/IsAvailable()
- if(!iscultist(owner) || owner.incapacitated() || !charges)
- return FALSE
- return ..()
-
-/datum/action/innate/cult/blood_spell/Activate()
- if(magic_path) //If this spell flows from the hand
- if(!hand_magic)
- hand_magic = new magic_path(owner, src)
- if(!owner.put_in_hands(hand_magic))
- qdel(hand_magic)
- hand_magic = null
- to_chat(owner, "You have no empty hand for invoking blood magic!")
- return
- to_chat(owner, "Your wounds glow as you invoke the [name].")
- return
- if(hand_magic)
- qdel(hand_magic)
- hand_magic = null
- to_chat(owner, "You snuff out the spell, saving it for later.")
-
-
-//Cult Blood Spells
-/datum/action/innate/cult/blood_spell/stun
- name = "Stun"
- desc = "Empowers your hand to stun and mute a victim on contact."
- button_icon_state = "hand"
- magic_path = "/obj/item/melee/blood_magic/stun"
- health_cost = 10
-
-/datum/action/innate/cult/blood_spell/teleport
- name = "Teleport"
- desc = "Empowers your hand to teleport yourself or another cultist to a teleport rune on contact."
- button_icon_state = "tele"
- magic_path = "/obj/item/melee/blood_magic/teleport"
- health_cost = 7
-
-/datum/action/innate/cult/blood_spell/emp
- name = "Electromagnetic Pulse"
- desc = "Emits a large electromagnetic pulse."
- button_icon_state = "emp"
- health_cost = 10
- invocation = "Ta'gh fara'qha fel d'amar det!"
-
-/datum/action/innate/cult/blood_spell/emp/Activate()
- owner.visible_message(
- "[owner]'s hand flashes a bright blue!", \
- "You speak the cursed words, emitting an EMP blast from your hand.")
- empulse(owner, 2, 5)
- owner.whisper(invocation, language = /datum/language/common)
- charges--
- if(charges<=0)
- qdel(src)
-
-/datum/action/innate/cult/blood_spell/shackles
- name = "Shadow Shackles"
- desc = "Empowers your hand to start handcuffing victim on contact, and mute them if successful."
- button_icon_state = "cuff"
- charges = 4
- magic_path = "/obj/item/melee/blood_magic/shackles"
-
-/datum/action/innate/cult/blood_spell/construction
- name = "Twisted Construction"
- desc = "Empowers your hand to corrupt certain metalic objects. Converts: Plasteel into runed metal 50 metal into a construct shell Living cyborgs into constructs after a delay Cyborg shells into construct shells Airlocks into brittle runed airlocks after a delay (harm intent)"
- button_icon_state = "transmute"
- magic_path = "/obj/item/melee/blood_magic/construction"
- health_cost = 12
-
-/datum/action/innate/cult/blood_spell/equipment
- name = "Summon Equipment"
- desc = "Allows you to summon a ritual dagger, or empowers your hand to summon combat gear onto a cultist you touch, including cult armor, a cult bola, and a cult sword."
- button_icon_state = "equip"
- magic_path = "/obj/item/melee/blood_magic/armor"
-
-/datum/action/innate/cult/blood_spell/equipment/Activate()
- var/choice = alert(owner,"Choose your equipment type",,"Combat Equipment","Ritual Dagger","Cancel")
- if(choice == "Ritual Dagger")
- var/turf/T = get_turf(owner)
- owner.visible_message("[owner]'s hand glows red for a moment.", \
- "Red light begins to shimmer and take form within your hand!")
- var/obj/O = new /obj/item/melee/cultblade/dagger(T)
- if(owner.put_in_hands(O))
- to_chat(owner, "A ritual dagger appears in your hand!")
- else
- owner.visible_message(
- "A ritual dagger appears at [owner]'s feet!", \
- "A ritual dagger materializes at your feet.")
- SEND_SOUND(owner, sound('sound/effects/magic.ogg',0,1,25))
- charges--
- desc = base_desc
- desc += " Has [charges] use\s remaining."
- if(charges<=0)
- qdel(src)
- else if(choice == "Combat Equipment")
- ..()
-
-/datum/action/innate/cult/blood_spell/horror
- name = "Hallucinations"
- desc = "Gives hallucinations to a target at range. A silent and invisible spell."
- button_icon_state = "horror"
- var/obj/effect/proc_holder/horror/PH
- charges = 4
-
-/datum/action/innate/cult/blood_spell/horror/New()
- PH = new()
- PH.attached_action = src
- ..()
-
-/datum/action/innate/cult/blood_spell/horror/Destroy()
- var/obj/effect/proc_holder/horror/destroy = PH
- . = ..()
- if(destroy && !QDELETED(destroy))
- QDEL_NULL(destroy)
-
-/datum/action/innate/cult/blood_spell/horror/Activate()
- PH.toggle(owner) //the important bit
- return TRUE
-
-/obj/effect/proc_holder/horror
- active = FALSE
- ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
- var/datum/action/innate/cult/blood_spell/attached_action
-
-/obj/effect/proc_holder/horror/Destroy()
- var/datum/action/innate/cult/blood_spell/AA = attached_action
- . = ..()
- if(AA && !QDELETED(AA))
- QDEL_NULL(AA)
-
-/obj/effect/proc_holder/horror/proc/toggle(mob/user)
- if(active)
- remove_ranged_ability("You dispel the magic...")
- else
- add_ranged_ability(user, "You prepare to horrify a target...")
-
-/obj/effect/proc_holder/horror/InterceptClickOn(mob/living/caller, params, atom/target)
- if(..())
- return
- if(ranged_ability_user.incapacitated() || !iscultist(caller))
- remove_ranged_ability()
- return
- var/turf/T = get_turf(ranged_ability_user)
- if(!isturf(T))
- return FALSE
- if(target in view(7, get_turf(ranged_ability_user)))
- if(!ishuman(target) || iscultist(target))
- return
- var/mob/living/carbon/human/H = target
- H.hallucination = max(H.hallucination, 120)
- SEND_SOUND(ranged_ability_user, sound('sound/effects/ghost.ogg',0,1,50))
- var/image/C = image('icons/effects/cult_effects.dmi',H,"bloodsparkles", ABOVE_MOB_LAYER)
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE)
- addtimer(CALLBACK(H, TYPE_PROC_REF(/atom, remove_alt_appearance),"cult_apoc",TRUE), 2400, TIMER_OVERRIDE|TIMER_UNIQUE)
- to_chat(ranged_ability_user,"[H] has been cursed with living nightmares!")
- attached_action.charges--
- attached_action.desc = attached_action.base_desc
- attached_action.desc += " Has [attached_action.charges] use\s remaining."
- attached_action.UpdateButtonIcon()
- if(attached_action.charges <= 0)
- remove_ranged_ability("You have exhausted the spell's power!")
- qdel(src)
-
-/datum/action/innate/cult/blood_spell/veiling
- name = "Conceal Presence"
- desc = "Alternates between hiding and revealing nearby cult structures and runes."
- invocation = "Kla'atu barada nikt'o!"
- button_icon_state = "gone"
- charges = 10
- var/revealing = FALSE //if it reveals or not
-
-/datum/action/innate/cult/blood_spell/veiling/Activate()
- if(!revealing)
- owner.visible_message("Thin grey dust falls from [owner]'s hand!", \
- "You invoke the veiling spell, hiding nearby runes.")
- charges--
- SEND_SOUND(owner, sound('sound/magic/smoke.ogg',0,1,25))
- owner.whisper(invocation, language = /datum/language/common)
- for(var/obj/effect/rune/R in range(5,owner))
- R.conceal()
- for(var/obj/structure/destructible/cult/S in range(5,owner))
- S.conceal()
- for(var/turf/open/floor/engine/cult/T in range(5,owner))
- T.realappearance.alpha = 0
- for(var/obj/machinery/door/airlock/cult/AL in range(5, owner))
- AL.conceal()
- revealing = TRUE
- name = "Reveal Runes"
- button_icon_state = "back"
- else
- owner.visible_message(
- "A flash of light shines from [owner]'s hand!", \
- "You invoke the counterspell, revealing nearby runes.")
- charges--
- owner.whisper(invocation, language = /datum/language/common)
- SEND_SOUND(owner, sound('sound/magic/enter_blood.ogg',0,1,25))
- for(var/obj/effect/rune/R in range(7,owner)) //More range in case you weren't standing in exactly the same spot
- R.reveal()
- for(var/obj/structure/destructible/cult/S in range(6,owner))
- S.reveal()
- for(var/turf/open/floor/engine/cult/T in range(6,owner))
- T.realappearance.alpha = initial(T.realappearance.alpha)
- for(var/obj/machinery/door/airlock/cult/AL in range(6, owner))
- AL.reveal()
- revealing = FALSE
- name = "Conceal Runes"
- button_icon_state = "gone"
- if(charges<= 0)
- qdel(src)
- desc = base_desc
- desc += " Has [charges] use\s remaining."
- UpdateButtonIcon()
-
-/datum/action/innate/cult/blood_spell/manipulation
- name = "Blood Rites"
- desc = "Empowers your hand to absorb blood to be used for advanced rites, or heal a cultist on contact. Use the spell in-hand to cast advanced rites."
- invocation = "Fel'th Dol Ab'orod!"
- button_icon_state = "manip"
- charges = 5
- magic_path = "/obj/item/melee/blood_magic/manipulator"
-
-
-// The "magic hand" items
-/obj/item/melee/blood_magic
- name = "\improper magical aura"
- desc = "A sinister looking aura that distorts the flow of reality around it."
- icon = 'icons/obj/items_and_weapons.dmi'
- lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
- icon_state = "disintegrate"
- item_state = "disintegrate"
- item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL
-
- w_class = WEIGHT_CLASS_HUGE
- throwforce = 0
- throw_range = 0
- throw_speed = 0
- var/invocation
- var/uses = 1
- var/health_cost = 0 //The amount of health taken from the user when invoking the spell
- var/datum/action/innate/cult/blood_spell/source
-
-/obj/item/melee/blood_magic/New(loc, spell)
- if(spell)
- source = spell
- uses = source.charges
- health_cost = source.health_cost
- ..()
-
-/obj/item/melee/blood_magic/Destroy()
- if(!QDELETED(source))
- if(uses <= 0)
- source.hand_magic = null
- qdel(source)
- source = null
- else
- source.hand_magic = null
- source.charges = uses
- source.desc = source.base_desc
- source.desc += " Has [uses] use\s remaining."
- source.UpdateButtonIcon()
- return ..()
-
-/obj/item/melee/blood_magic/attack_self(mob/living/user)
- afterattack(user, user, TRUE)
-
-/obj/item/melee/blood_magic/attack(mob/living/M, mob/living/carbon/user)
- if(!iscarbon(user) || !iscultist(user))
- uses = 0
- qdel(src)
- return
- log_combat(user, M, "used a cult spell on", source.name, "")
- M.lastattacker = user.real_name
- M.lastattackerckey = user.ckey
-
-/obj/item/melee/blood_magic/afterattack(atom/target, mob/living/carbon/user, proximity)
- . = ..()
- if(invocation)
- user.whisper(invocation, language = /datum/language/common)
- if(health_cost)
- if(user.active_hand_index == 1)
- user.apply_damage(health_cost, BRUTE, BODY_ZONE_L_ARM)
- else
- user.apply_damage(health_cost, BRUTE, BODY_ZONE_R_ARM)
- if(uses <= 0)
- qdel(src)
- else if(source)
- source.desc = source.base_desc
- source.desc += " Has [uses] use\s remaining."
- source.UpdateButtonIcon()
-
-//Stun
-/obj/item/melee/blood_magic/stun
- name = "Stunning Aura"
- desc = "Will stun and mute a weak-minded victim on contact."
- color = RUNE_COLOR_RED
- invocation = "Fuu ma'jin!"
-
-/obj/item/melee/blood_magic/stun/afterattack(atom/target, mob/living/carbon/user, proximity)
- if(!isliving(target) || !proximity)
- return
- var/mob/living/L = target
- if(iscultist(target))
- return
- if(iscultist(user))
- user.visible_message("[user] holds up [user.p_their()] hand, which explodes in a flash of red light!", \
- "You attempt to stun [L] with the spell!")
-
- user.mob_light(_range = 3, _color = LIGHT_COLOR_BLOOD_MAGIC, _duration = 0.2 SECONDS)
-
- var/anti_magic_source = L.anti_magic_check()
- if(anti_magic_source)
-
- L.mob_light(_range = 2, _color = LIGHT_COLOR_HOLY_MAGIC, _duration = 10 SECONDS)
- var/mutable_appearance/forbearance = mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER)
- L.add_overlay(forbearance)
- addtimer(CALLBACK(L, TYPE_PROC_REF(/atom, cut_overlay), forbearance), 100)
-
- if(istype(anti_magic_source, /obj/item))
- var/obj/item/ams_object = anti_magic_source
- target.visible_message(
- "[L] starts to glow in a halo of light!", \
- "Your [ams_object.name] begins to glow, emitting a blanket of holy light which surrounds you and protects you from the flash of light!")
- else
- target.visible_message(
- "[L] starts to glow in a halo of light!", \
- "A feeling of warmth washes over you, rays of holy light surround your body and protect you from the flash of light!")
-
- else
- if(HAS_TRAIT(target, TRAIT_MINDSHIELD))
- var/mob/living/carbon/C = L
- to_chat(user, "Their mind was stronger than expected, but you still managed to do some damage!")
- C.stuttering += 8
- C.dizziness += 30
- C.Jitter(8)
- C.drop_all_held_items()
- C.bleed(40)
- C.apply_damage(60, STAMINA, BODY_ZONE_CHEST)
- else
- to_chat(user, "In a brilliant flash of red, [L] falls to the ground!")
- L.Paralyze(160)
- L.flash_act(1,1)
- if(issilicon(target))
- var/mob/living/silicon/S = L
- S.emp_act(EMP_HEAVY)
- else if(iscarbon(target))
- var/mob/living/carbon/C = L
- C.silent += 6
- C.stuttering += 15
- C.cultslurring += 15
- C.Jitter(15)
- uses--
- ..()
-
-//Teleportation
-/obj/item/melee/blood_magic/teleport
- name = "Teleporting Aura"
- color = RUNE_COLOR_TELEPORT
- desc = "Will teleport a cultist to a teleport rune on contact."
- invocation = "Sas'so c'arta forbici!"
-
-/obj/item/melee/blood_magic/teleport/afterattack(atom/target, mob/living/carbon/user, proximity)
- if(!iscultist(target) || !proximity)
- to_chat(user, "You can only teleport adjacent cultists with this spell!")
- return
- if(iscultist(user))
- var/list/potential_runes = list()
- var/list/teleportnames = list()
- for(var/R in GLOB.teleport_runes)
- var/obj/effect/rune/teleport/T = R
- potential_runes[avoid_assoc_duplicate_keys(T.listkey, teleportnames)] = T
-
- if(!potential_runes.len)
- to_chat(user, "There are no valid runes to teleport to!")
- log_game("Teleport talisman failed - no other teleport runes")
- return
-
- var/turf/T = get_turf(src)
- if(is_away_level(T))
- to_chat(user, "You are not in the right dimension!")
- log_game("Teleport spell failed - user in away mission")
- return
-
- var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked
- var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to?
- if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated() || !actual_selected_rune || !proximity)
- return
- var/turf/dest = get_turf(actual_selected_rune)
- if(dest.is_blocked_turf(TRUE))
- to_chat(user, "The target rune is blocked. You cannot teleport there.")
- return
- uses--
- var/turf/origin = get_turf(user)
- var/mob/living/L = target
- if(do_teleport(L, dest, channel = TELEPORT_CHANNEL_CULT))
- origin.visible_message("Dust flows from [user]'s hand, and [user.p_they()] disappear[user.p_s()] with a sharp crack!", \
- "You speak the words of the talisman and find yourself somewhere else!", "You hear a sharp crack.")
- dest.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "You hear a boom.")
- ..()
-
-//Shackles
-/obj/item/melee/blood_magic/shackles
- name = "Shackling Aura"
- desc = "Will start handcuffing a victim on contact, and mute them if successful."
- invocation = "In'totum Lig'abis!"
- color = "#000000" // black
-
-/obj/item/melee/blood_magic/shackles/afterattack(atom/target, mob/living/carbon/user, proximity)
- if(iscultist(user) && iscarbon(target) && proximity)
- var/mob/living/carbon/C = target
- if(C.canBeHandcuffed())
- CuffAttack(C, user)
- else
- user.visible_message("This victim doesn't have enough arms to complete the restraint!")
- return
- ..()
-
-/obj/item/melee/blood_magic/shackles/proc/CuffAttack(mob/living/carbon/C, mob/living/user)
- if(!C.handcuffed)
- playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2)
- C.visible_message("[user] begins restraining [C] with dark magic!", \
- "[user] begins shaping dark magic shackles around your wrists!")
- if(do_after(user, 3 SECONDS, C))
- if(!C.handcuffed)
- C.set_handcuffed(new /obj/item/restraints/handcuffs/energy/cult/used(C))
- C.update_handcuffed()
- C.silent += 5
- to_chat(user, "You shackle [C].")
- log_combat(user, C, "shackled")
- uses--
- else
- to_chat(user, "[C] is already bound.")
- else
- to_chat(user, "You fail to shackle [C].")
- else
- to_chat(user, "[C] is already bound.")
-
-
-/obj/item/restraints/handcuffs/energy/cult //For the shackling spell
- name = "shadow shackles"
- desc = "Shackles that bind the wrists with sinister magic."
- trashtype = /obj/item/restraints/handcuffs/energy/used
- item_flags = DROPDEL
-
-/obj/item/restraints/handcuffs/energy/cult/used/dropped(mob/user)
- user.visible_message("[user]'s shackles shatter in a discharge of dark magic!", \
- "Your [src] shatters in a discharge of dark magic!")
- . = ..()
-
-
-//Construction: Converts 50 metal to a construct shell, plasteel to runed metal, airlock to brittle runed airlock, a borg to a construct, or borg shell to a construct shell
-/obj/item/melee/blood_magic/construction
- name = "Twisting Aura"
- desc = "Corrupts certain metalic objects on contact."
- invocation = "Ethra p'ni dedol!"
- color = "#000000" // black
- var/channeling = FALSE
-
-/obj/item/melee/blood_magic/construction/examine(mob/user)
- . = ..()
- . += {"A sinister spell used to convert:\n
- Plasteel into runed metal\n
- [METAL_TO_CONSTRUCT_SHELL_CONVERSION] metal into a construct shell\n
- Living cyborgs into constructs after a delay\n
- Cyborg shells into construct shells\n
- Airlocks into brittle runed airlocks after a delay (harm intent)"}
-
-/obj/item/melee/blood_magic/construction/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if(proximity_flag && iscultist(user))
- if(channeling)
- to_chat(user, "You are already invoking twisted construction!")
- return
- var/turf/T = get_turf(target)
- if(istype(target, /obj/item/stack/sheet/metal))
- var/obj/item/stack/sheet/candidate = target
- if(candidate.use(METAL_TO_CONSTRUCT_SHELL_CONVERSION))
- uses--
- to_chat(user, "A dark cloud emanates from your hand and swirls around the metal, twisting it into a construct shell!")
- new /obj/structure/constructshell(T)
- SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
- else
- to_chat(user, "You need [METAL_TO_CONSTRUCT_SHELL_CONVERSION] metal to produce a construct shell!")
- return
- else if(istype(target, /obj/item/stack/sheet/plasteel))
- var/obj/item/stack/sheet/plasteel/candidate = target
- var/quantity = candidate.amount
- if(candidate.use(quantity))
- uses --
- new /obj/item/stack/sheet/mineral/hidden/hellstone(T,quantity)
- to_chat(user, "A dark cloud emanates from you hand and swirls around the plasteel, transforming it into runed metal!")
- SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
- else if(istype(target,/mob/living/silicon/robot))
- var/mob/living/silicon/robot/candidate = target
- if(candidate.mmi)
- channeling = TRUE
- user.visible_message("A dark cloud emanates from [user]'s hand and swirls around [candidate]!")
- playsound(T, 'sound/machines/creaking.ogg', 80, TRUE)
- var/prev_color = candidate.color
- candidate.color = "black"
- if(do_after(user, 90, target = candidate))
- candidate.emp_act(EMP_HEAVY)
- var/list/constructs = list(
- "Juggernaut" = image(icon = 'icons/mob/cult.dmi', icon_state = "juggernaut"),
- "Wraith" = image(icon = 'icons/mob/cult.dmi', icon_state = "wraith"),
- "Artificer" = image(icon = 'icons/mob/cult.dmi', icon_state = "artificer")
- )
- var/construct_class = show_radial_menu(user, src, constructs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
- if(!check_menu(user))
- return
- if(QDELETED(candidate))
- channeling = FALSE
- return
- user.visible_message("The dark cloud recedes from what was formerly [candidate], revealing a\n [construct_class]!")
- switch(construct_class)
- if("Juggernaut")
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/juggernaut, candidate, user, 0, T)
- if("Wraith")
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/wraith, candidate, user, 0, T)
- if("Artificer")
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/artificer, candidate, user, 0, T)
- else
- return
- uses--
- candidate.mmi = null
- qdel(candidate)
- channeling = FALSE
- else
- channeling = FALSE
- candidate.color = prev_color
- return
- else
- uses--
- to_chat(user, "A dark cloud emanates from you hand and swirls around [candidate] - twisting it into a construct shell!")
- new /obj/structure/constructshell(T)
- SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
- qdel(candidate)
- else if(istype(target,/obj/machinery/door/airlock))
- channeling = TRUE
- playsound(T, 'sound/machines/airlockforced.ogg', 50, TRUE)
- do_sparks(5, TRUE, target)
- if(do_after(user, 50, target = user))
- if(QDELETED(target))
- channeling = FALSE
- return
- target.narsie_act()
- uses--
- user.visible_message("Black ribbons suddenly emanate from [user]'s hand and cling to the airlock - twisting and corrupting it!")
- SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
- channeling = FALSE
- else
- channeling = FALSE
- return
- else
- to_chat(user, "The spell will not work on [target]!")
- return
- ..()
-
-/obj/item/melee/blood_magic/construction/proc/check_menu(mob/user)
- if(!istype(user))
- return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
- return FALSE
- return TRUE
-
-
-//Armor: Gives the target a basic cultist combat loadout
-/obj/item/melee/blood_magic/armor
- name = "Arming Aura"
- desc = "Will equipt cult combat gear onto a cultist on contact."
- color = "#33cc33" // green
-
-/obj/item/melee/blood_magic/armor/afterattack(atom/target, mob/living/carbon/user, proximity)
- if(iscarbon(target) && proximity)
- uses--
- var/mob/living/carbon/C = target
- C.visible_message("Otherworldly armor suddenly appears on [C]!")
- C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black,ITEM_SLOT_ICLOTHING)
- C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), ITEM_SLOT_OCLOTHING)
- C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult/alt(user), ITEM_SLOT_FEET)
- C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), ITEM_SLOT_BACK)
- if(C == user)
- qdel(src) //Clears the hands
- C.put_in_hands(new /obj/item/melee/cultblade(user))
- C.put_in_hands(new /obj/item/restraints/legcuffs/bola/cult(user))
- ..()
-
-/obj/item/melee/blood_magic/manipulator
- name = "Blood Rite Aura"
- desc = "Absorbs blood from anything you touch. Touching cultists and constructs can heal them. Use in-hand to cast an advanced rite."
- color = "#7D1717"
-
-/obj/item/melee/blood_magic/manipulator/examine(mob/user)
- . = ..()
- . += "Blood spear, blood bolt barrage, and blood beam cost [BLOOD_SPEAR_COST], [BLOOD_BARRAGE_COST], and [BLOOD_BEAM_COST] charges respectively."
-
-/obj/item/melee/blood_magic/manipulator/afterattack(atom/target, mob/living/carbon/human/user, proximity)
- if(proximity)
- if(ishuman(target))
- var/mob/living/carbon/human/H = target
- if(NOBLOOD in H.dna.species.species_traits)
- to_chat(user,"Blood rites do not work on species with no blood!")
- return
- if(iscultist(H))
- if(H.stat == DEAD)
- to_chat(user,"Only a revive rune can bring back the dead!")
- return
- if(H.blood_volume < BLOOD_VOLUME_SAFE)
- var/restore_blood = BLOOD_VOLUME_SAFE - H.blood_volume
- if(uses*2 < restore_blood)
- H.blood_volume += uses*2
- to_chat(user,"You use the last of your blood rites to restore what blood you could!")
- uses = 0
- return ..()
- else
- H.blood_volume = BLOOD_VOLUME_SAFE
- uses -= round(restore_blood/2)
- to_chat(user,"Your blood rites have restored [H == user ? "your" : "[H.p_their()]"] blood to safe levels!")
- var/overall_damage = H.getBruteLoss() + H.getFireLoss() + H.getToxLoss() + H.getOxyLoss()
- if(overall_damage == 0)
- to_chat(user,"That cultist doesn't require healing!")
- else
- var/ratio = uses/overall_damage
- if(H == user)
- to_chat(user,"Your blood healing is far less efficient when used on yourself!")
- ratio *= 0.35 // Healing is half as effective if you can't perform a full heal
- uses -= round(overall_damage) // Healing is 65% more "expensive" even if you can still perform the full heal
- if(ratio>1)
- ratio = 1
- uses -= round(overall_damage)
- H.visible_message("[H] is fully healed by [H==user ? "[H.p_their()]":"[H]'s"]'s blood magic!")
- else
- H.visible_message("[H] is partially healed by [H==user ? "[H.p_their()]":"[H]'s"] blood magic.")
- uses = 0
- ratio *= -1
- H.adjustOxyLoss((overall_damage*ratio) * (H.getOxyLoss() / overall_damage), 0)
- H.adjustToxLoss((overall_damage*ratio) * (H.getToxLoss() / overall_damage), 0)
- H.adjustFireLoss((overall_damage*ratio) * (H.getFireLoss() / overall_damage), 0)
- H.adjustBruteLoss((overall_damage*ratio) * (H.getBruteLoss() / overall_damage), 0)
- H.updatehealth()
- playsound(get_turf(H), 'sound/magic/staff_healing.ogg', 25)
- new /obj/effect/temp_visual/cult/sparks(get_turf(H))
- user.Beam(H,icon_state="sendbeam",time=15)
- else
- if(H.stat == DEAD)
- to_chat(user,"[H.p_their(TRUE)] blood has stopped flowing, you'll have to find another way to extract it.")
- return
- if(H.cultslurring)
- to_chat(user,"[H.p_their(TRUE)] blood has been tainted by an even stronger form of blood magic, it's no use to us like this!")
- return
- if(H.blood_volume > BLOOD_VOLUME_SAFE)
- H.blood_volume -= 100
- uses += 50
- user.Beam(H,icon_state="drainbeam",time=10)
- playsound(get_turf(H), 'sound/magic/enter_blood.ogg', 50)
- H.visible_message("[user] drains some of [H]'s blood!")
- to_chat(user,"Your blood rite gains 50 charges from draining [H]'s blood.")
- new /obj/effect/temp_visual/cult/sparks(get_turf(H))
- else
- to_chat(user,"[H.p_theyre(TRUE)] missing too much blood - you cannot drain [H.p_them()] further!")
- return
- if(isconstruct(target))
- var/mob/living/simple_animal/M = target
- var/missing = M.maxHealth - M.health
- if(missing)
- if(uses > missing)
- M.adjustHealth(-missing)
- M.visible_message("[M] is fully healed by [user]'s blood magic!")
- uses -= missing
- else
- M.adjustHealth(-uses)
- M.visible_message("[M] is partially healed by [user]'s blood magic!")
- uses = 0
- playsound(get_turf(M), 'sound/magic/staff_healing.ogg', 25)
- user.Beam(M,icon_state="sendbeam",time=10)
- if(istype(target, /obj/effect/decal/cleanable/blood))
- blood_draw(target, user)
- ..()
-
-/obj/item/melee/blood_magic/manipulator/proc/blood_draw(atom/target, mob/living/carbon/human/user)
- var/temp = 0
- var/turf/T = get_turf(target)
- if(T)
- for(var/obj/effect/decal/cleanable/blood/B in view(T, 2))
- if(B.blood_state == BLOOD_STATE_HUMAN)
- if(B.bloodiness == 100) //Bonus for "pristine" bloodpools, also to prevent cheese with footprint spam
- temp += 30
- else
- temp += max((B.bloodiness**2)/800,1)
- new /obj/effect/temp_visual/cult/turf/floor(get_turf(B))
- qdel(B)
- if(temp)
- user.Beam(T,icon_state="drainbeam",time=15)
- new /obj/effect/temp_visual/cult/sparks(get_turf(user))
- playsound(T, 'sound/magic/enter_blood.ogg', 50)
- to_chat(user, "Your blood rite has gained [round(temp)] charge\s from blood sources around you!")
- uses += max(1, round(temp))
-
-/obj/item/melee/blood_magic/manipulator/attack_self(mob/living/user)
- if(iscultist(user))
- var/list/options = list("Blood Spear (150)", "Blood Beam (500)")
- var/choice = input(user, "Choose a greater blood rite...", "Greater Blood Rites") as null|anything in options
- if(!choice)
- to_chat(user, "You decide against conducting a greater blood rite.")
- return
- switch(choice)
- if("Blood Spear (150)")
- if(uses < BLOOD_SPEAR_COST)
- to_chat(user, "You need [BLOOD_SPEAR_COST] charges to perform this rite.")
- else
- uses -= BLOOD_SPEAR_COST
- var/turf/T = get_turf(user)
- qdel(src)
- var/datum/action/innate/cult/spear/S = new(user)
- var/obj/item/cult_spear/rite = new(T)
- S.Grant(user, rite)
- rite.spear_act = S
- if(user.put_in_hands(rite))
- to_chat(user, "A [rite.name] appears in your hand!")
- else
- user.visible_message(
- "A [rite.name] appears at [user]'s feet!", \
- "A [rite.name] materializes at your feet.")
- if("Blood Beam (500)")
- if(uses < BLOOD_BEAM_COST)
- to_chat(user, "You need [BLOOD_BEAM_COST] charges to perform this rite.")
- else
- var/obj/rite = new /obj/item/blood_beam()
- uses -= BLOOD_BEAM_COST
- qdel(src)
- if(user.put_in_hands(rite))
- to_chat(user, "Your hands glow with POWER OVERWHELMING!!!")
- else
- to_chat(user, "You need a free hand for this rite!")
- qdel(rite)
diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm
deleted file mode 100644
index 406c5195603..00000000000
--- a/code/modules/antagonists/cult/cult.dm
+++ /dev/null
@@ -1,401 +0,0 @@
-#define SUMMON_POSSIBILITIES 3
-#define CULT_VICTORY 1
-#define CULT_LOSS 0
-#define CULT_NARSIE_KILLED -1
-
-/datum/antagonist/cult
- name = "Cultist"
- roundend_category = "cultists"
- antagpanel_category = "Cult"
- antag_moodlet = /datum/mood_event/cult
- var/datum/action/innate/cult/comm/communion = new
- var/datum/action/innate/cult/mastervote/vote = new
- var/datum/action/innate/cult/blood_magic/magic = new
- job_rank = ROLE_CULTIST
- antag_hud_type = ANTAG_HUD_CULT
- antag_hud_name = "cult"
- var/ignore_implant = FALSE
- var/give_equipment = FALSE
- var/datum/team/cult/cult_team
-
-
-/datum/antagonist/cult/get_team()
- return cult_team
-
-/datum/antagonist/cult/create_team(datum/team/cult/new_team)
- if(!new_team)
- //todo remove this and allow admin buttons to create more than one cult
- for(var/datum/antagonist/cult/H in GLOB.antagonists)
- if(!H.owner)
- continue
- if(H.cult_team)
- cult_team = H.cult_team
- return
- cult_team = new /datum/team/cult
- cult_team.setup_objectives()
- return
- if(!istype(new_team))
- stack_trace("Wrong team type passed to [type] initialization.")
- cult_team = new_team
-
-/datum/antagonist/cult/proc/add_objectives()
- objectives |= cult_team.objectives
-
-/datum/antagonist/cult/Destroy()
- QDEL_NULL(communion)
- QDEL_NULL(vote)
- return ..()
-
-/datum/antagonist/cult/can_be_owned(datum/mind/new_owner)
- . = ..()
- if(. && !ignore_implant)
- . = is_convertable_to_cult(new_owner.current,cult_team)
-
-/datum/antagonist/cult/greet()
- to_chat(owner, "You are a member of the cult!")
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/bloodcult.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)//subject to change
- owner.announce_objectives()
-
-/datum/antagonist/cult/on_gain()
- . = ..()
- var/mob/living/current = owner.current
- add_objectives()
- if(give_equipment)
- equip_cultist()
- SSticker.mode.cult += owner // Only add after they've been given objectives
- current.log_message("has been converted to the cult of Nar'Sie!", LOG_ATTACK, color="#960000")
-
- if(cult_team.blood_target && cult_team.blood_target_image && current.client)
- current.client.images += cult_team.blood_target_image
-
-
-/datum/antagonist/cult/proc/equip_cultist()
- var/mob/living/carbon/H = owner.current
- if(!istype(H))
- return
- . += cult_give_item(/obj/item/melee/cultblade/dagger, H)
- to_chat(owner, "These will help you jumpstart a cult of your own in this sector. Use them well, and remember - you are not the only one.")
-
-
-/datum/antagonist/cult/proc/cult_give_item(obj/item/item_path, mob/living/carbon/human/mob)
- var/list/slots = list(
- "backpack" = ITEM_SLOT_BACKPACK,
- "left pocket" = ITEM_SLOT_LPOCKET,
- "right pocket" = ITEM_SLOT_RPOCKET
- )
-
- var/T = new item_path(mob)
- var/item_name = initial(item_path.name)
- var/where = mob.equip_in_one_of_slots(T, slots)
- if(!where)
- to_chat(mob, "Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).")
- return 0
- else
- to_chat(mob, "You have a [item_name] in your [where].")
- if(where == "backpack")
- SEND_SIGNAL(mob.back, COMSIG_TRY_STORAGE_SHOW, mob)
- return TRUE
-
-/datum/antagonist/cult/apply_innate_effects(mob/living/mob_override)
- . = ..()
- var/mob/living/current = owner.current
- if(mob_override)
- current = mob_override
- add_antag_hud(antag_hud_type, antag_hud_name, current)
- handle_clown_mutation(current, mob_override ? null : "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
- current.faction |= "cult"
- current.grant_language(/datum/language/narsie, TRUE, TRUE, LANGUAGE_CULTIST)
- if(!cult_team.cult_master)
- vote.Grant(current)
- communion.Grant(current)
- if(ishuman(current))
- magic.Grant(current)
- current.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense)
- if(cult_team.cult_risen)
- cult_team.rise(current)
- if(cult_team.cult_ascendent)
- cult_team.ascend(current)
-
-/datum/antagonist/cult/remove_innate_effects(mob/living/mob_override)
- . = ..()
- var/mob/living/current = owner.current
- if(mob_override)
- current = mob_override
- remove_antag_hud(antag_hud_type, current)
- handle_clown_mutation(current, removing = FALSE)
- current.faction -= "cult"
- current.remove_language(/datum/language/narsie, TRUE, TRUE, LANGUAGE_CULTIST)
- vote.Remove(current)
- communion.Remove(current)
- magic.Remove(current)
- current.clear_alert("bloodsense")
- if(ishuman(current))
- var/mob/living/carbon/human/H = current
- H.eye_color = initial(H.eye_color)
- H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
- REMOVE_TRAIT(H, CULT_EYES, null)
- H.remove_overlay(HALO_LAYER)
- H.update_body()
-
-/datum/antagonist/cult/on_removal()
- SSticker.mode.cult -= owner
- if(!silent)
- owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current)
- to_chat(owner.current, "An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.")
- owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000")
- if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client)
- owner.current.client.images -= cult_team.blood_target_image
- . = ..()
-
-/datum/antagonist/cult/admin_add(datum/mind/new_owner,mob/admin)
- give_equipment = FALSE
- new_owner.add_antag_datum(src)
- message_admins("[key_name_admin(admin)] has cult'ed [key_name_admin(new_owner)].")
- log_admin("[key_name(admin)] has cult'ed [key_name(new_owner)].")
-
-/datum/antagonist/cult/admin_remove(mob/user)
- message_admins("[key_name_admin(user)] has decult'ed [key_name_admin(owner)].")
- log_admin("[key_name(user)] has decult'ed [key_name(owner)].")
- SSticker.mode.remove_cultist(owner,silent=TRUE) //disgusting
-
-/datum/antagonist/cult/get_admin_commands()
- . = ..()
- .["Dagger"] = CALLBACK(src, PROC_REF(admin_give_dagger))
- .["Metal"] = CALLBACK(src, PROC_REF(admin_take_all))
-
-/datum/antagonist/cult/proc/admin_give_dagger(mob/admin)
- if(!equip_cultist())
- to_chat(admin, "Spawning dagger failed!")
-
-/datum/antagonist/cult/proc/admin_take_all(mob/admin)
- var/mob/living/current = owner.current
- for(var/o in current.GetAllContents())
- if(istype(o, /obj/item/melee/cultblade/dagger))
- qdel(o)
-
-/datum/antagonist/cult/master
- ignore_implant = TRUE
- show_in_antagpanel = FALSE //Feel free to add this later
- var/datum/action/innate/cult/master/finalreck/reckoning = new
- var/datum/action/innate/cult/master/cultmark/bloodmark = new
- var/datum/action/innate/cult/master/pulse/throwing = new
-
-/datum/antagonist/cult/master/Destroy()
- QDEL_NULL(reckoning)
- QDEL_NULL(bloodmark)
- QDEL_NULL(throwing)
- return ..()
-
-/datum/antagonist/cult/master/on_gain()
- . = ..()
- var/mob/living/current = owner.current
- set_antag_hud(current, "cultmaster")
-
-/datum/antagonist/cult/master/greet()
- to_chat(owner.current, "You are the cult's Master. As the cult's Master, you have a unique title and loud voice when communicating, are capable of marking \
- targets, such as a location or a noncultist, to direct the cult to them, and, finally, you are capable of summoning the entire living cult to your location once.")
- to_chat(owner.current, "Use these abilities to direct the cult to victory at any cost.")
-
-/datum/antagonist/cult/master/apply_innate_effects(mob/living/mob_override)
- . = ..()
- var/mob/living/current = owner.current
- if(mob_override)
- current = mob_override
- if(!cult_team.reckoning_complete)
- reckoning.Grant(current)
- bloodmark.Grant(current)
- throwing.Grant(current)
- current.update_action_buttons_icon()
- current.apply_status_effect(/datum/status_effect/cult_master)
- if(cult_team.cult_risen)
- cult_team.rise(current)
- if(cult_team.cult_ascendent)
- cult_team.ascend(current)
-
-/datum/antagonist/cult/master/remove_innate_effects(mob/living/mob_override)
- . = ..()
- var/mob/living/current = owner.current
- if(mob_override)
- current = mob_override
- reckoning.Remove(current)
- bloodmark.Remove(current)
- throwing.Remove(current)
- current.update_action_buttons_icon()
- current.remove_status_effect(/datum/status_effect/cult_master)
-
- if(ishuman(current))
- var/mob/living/carbon/human/H = current
- H.eye_color = initial(H.eye_color)
- H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
- REMOVE_TRAIT(H, CULT_EYES, null)
- H.remove_overlay(HALO_LAYER)
- H.update_body()
-
-/datum/team/cult
- name = "Cult"
-
- var/blood_target
- var/image/blood_target_image
- var/blood_target_reset_timer
-
- var/cult_vote_called = FALSE
- var/mob/living/cult_master
- var/reckoning_complete = FALSE
- var/cult_risen = FALSE
- var/cult_ascendent = FALSE
-
-/datum/team/cult/proc/check_size()
- if(cult_ascendent)
- return
- var/alive = 0
- var/cultplayers = 0
- for(var/I in GLOB.player_list)
- var/mob/M = I
- if(M.stat != DEAD)
- if(iscultist(M))
- ++cultplayers
- else
- ++alive
- var/ratio = cultplayers/alive
- if(ratio > CULT_RISEN && !cult_risen)
- for(var/datum/mind/B in members)
- if(B.current)
- SEND_SOUND(B.current, 'sound/hallucinations/i_see_you2.ogg')
- to_chat(B.current, "The veil weakens as your cult grows, your eyes begin to glow...")
- addtimer(CALLBACK(src, PROC_REF(rise), B.current), 200)
- cult_risen = TRUE
-
- if(ratio > CULT_ASCENDENT && !cult_ascendent)
- for(var/datum/mind/B in members)
- if(B.current)
- SEND_SOUND(B.current, 'sound/hallucinations/im_here1.ogg')
- to_chat(B.current, "Your cult is ascendent and the red harvest approaches - you cannot hide your true nature for much longer!!")
- addtimer(CALLBACK(src, PROC_REF(ascend), B.current), 200)
- cult_ascendent = TRUE
-
-
-/datum/team/cult/proc/rise(cultist)
- if(ishuman(cultist))
- var/mob/living/carbon/human/H = cultist
- H.eye_color = "f00"
- H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
- ADD_TRAIT(H, CULT_EYES, CULT_TRAIT)
- H.update_body()
-
-/datum/team/cult/proc/ascend(cultist)
- if(ishuman(cultist))
- var/mob/living/carbon/human/H = cultist
- new /obj/effect/temp_visual/cult/sparks(get_turf(H), H.dir)
- var/istate = pick("halo1","halo2","halo3","halo4","halo5","halo6")
- var/mutable_appearance/new_halo_overlay = mutable_appearance('icons/effects/32x64.dmi', istate, -HALO_LAYER)
- H.overlays_standing[HALO_LAYER] = new_halo_overlay
- H.apply_overlay(HALO_LAYER)
-
-/datum/objective/sacrifice/find_target(dupe_search_range)
- if(!istype(team, /datum/team/cult))
- return
- var/datum/team/cult/C = team
- var/list/target_candidates = list()
- for(var/mob/living/carbon/human/player in GLOB.player_list)
- if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && !is_convertable_to_cult(player) && player.stat != DEAD)
- target_candidates += player.mind
- if(target_candidates.len == 0)
- message_admins("Cult Sacrifice: Could not find unconvertible target, checking for convertible target.")
- for(var/mob/living/carbon/human/player in GLOB.player_list)
- if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && player.stat != DEAD)
- target_candidates += player.mind
- listclearnulls(target_candidates)
- if(LAZYLEN(target_candidates))
- target = pick(target_candidates)
- update_explanation_text()
- else
- message_admins("Cult Sacrifice: Could not find unconvertible or convertible target. WELP!")
- for(var/datum/mind/M in C.members)
- if(M.current)
- M.current.clear_alert("bloodsense")
- M.current.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense)
-
-/datum/team/cult/proc/setup_objectives()
- var/datum/objective/sacrifice/sac_objective = new
- sac_objective.team = src
- sac_objective.find_target()
- objectives += sac_objective
-
- var/datum/objective/eldergod/summon_objective = new
- summon_objective.team = src
- objectives += summon_objective
-
-
-/datum/objective/sacrifice
- var/sacced = FALSE
- var/sac_image
-
-/datum/objective/sacrifice/check_completion()
- return sacced || completed
-
-/datum/objective/sacrifice/update_explanation_text()
- if(target)
- explanation_text = "Sacrifice [target], the [target.assigned_role] via invoking an Offer rune with [target.p_them()] on it and three acolytes around it."
- else
- explanation_text = "The veil has already been weakened here, proceed to the final objective."
-
-/datum/objective/eldergod
- var/summoned = FALSE
- var/killed = FALSE
- var/list/summon_spots = list()
-
-/datum/objective/eldergod/New()
- ..()
- var/sanity = 0
- while(summon_spots.len < SUMMON_POSSIBILITIES && sanity < 100)
- var/area/summon_area = pick(GLOB.sortedAreas - summon_spots)
- if(summon_area && (summon_area.area_flags & VALID_TERRITORY))
- summon_spots += summon_area
- sanity++
- update_explanation_text()
-
-/datum/objective/eldergod/update_explanation_text()
- explanation_text = "Summon Nar'Sie by invoking the rune 'Summon Nar'Sie'. The summoning can only be accomplished in [english_list(summon_spots)] - where the veil is weak enough for the ritual to begin."
-
-/datum/objective/eldergod/check_completion()
- if(killed)
- return CULT_NARSIE_KILLED // You failed so hard that even the code went backwards.
- return summoned || completed
-
-/datum/team/cult/proc/check_cult_victory()
- for(var/datum/objective/O in objectives)
- if(O.check_completion() == CULT_NARSIE_KILLED)
- return CULT_NARSIE_KILLED
- else if(!O.check_completion())
- return CULT_LOSS
- return CULT_VICTORY
-
-/datum/team/cult/roundend_report()
- var/list/parts = list()
- var/victory = check_cult_victory()
-
- if(victory == CULT_NARSIE_KILLED) // Epic failure, you summoned your god and then someone killed it.
- parts += "Nar'sie has been killed! The cult will haunt the universe no longer!"
- else if(victory)
- parts += "The cult has succeeded! Nar'Sie has snuffed out another torch in the void!"
- else
- parts += "The staff managed to stop the cult! Dark words and heresy are no match for Nanotrasen's finest!"
-
- if(objectives.len)
- parts += "The cultists' objectives were:"
- var/count = 1
- for(var/datum/objective/objective in objectives)
- if(objective.check_completion())
- parts += "Objective #[count]: [objective.explanation_text] Success!"
- else
- parts += "Objective #[count]: [objective.explanation_text] Fail."
- count++
-
- if(members.len)
- parts += "The cultists were:"
- parts += printplayerlist(members)
-
- return "
[parts.Join(" ")]
"
-
-/datum/team/cult/is_gamemode_hero()
- return SSticker.mode.name == "cult"
diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm
deleted file mode 100644
index 0c070e8e423..00000000000
--- a/code/modules/antagonists/cult/cult_comms.dm
+++ /dev/null
@@ -1,461 +0,0 @@
-// Contains cult communion, guide, and cult master abilities
-
-/datum/action/innate/cult
- icon_icon = 'icons/mob/actions/actions_cult.dmi'
- background_icon_state = "bg_demon"
- buttontooltipstyle = "cult"
- check_flags = AB_CHECK_HANDS_BLOCKED|AB_CHECK_IMMOBILE|AB_CHECK_CONSCIOUS
-
-/datum/action/innate/cult/IsAvailable()
- if(!iscultist(owner))
- return FALSE
- return ..()
-
-/datum/action/innate/cult/comm
- name = "Communion"
- desc = "Whispered words that all cultists can hear. Warning:Nearby non-cultists can still hear you."
- button_icon_state = "cult_comms"
-
-/datum/action/innate/cult/comm/Activate()
- var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "")
- if(!input || !IsAvailable())
- return
- if(CHAT_FILTER_CHECK(input))
- to_chat(usr, "You cannot send a message that contains a word prohibited in IC chat!")
- return
- cultist_commune(usr, input)
-
-/datum/action/innate/cult/comm/proc/cultist_commune(mob/living/user, message)
- var/my_message
- if(!message)
- return
- user.whisper("O bidai nabora se[pick("'","`")]sma!", language = /datum/language/common)
- user.whisper(html_decode(message))
- var/title = "Acolyte"
- var/span = "cult italic"
- if(user.mind && user.mind.has_antag_datum(/datum/antagonist/cult/master))
- span = "cultlarge"
- title = "Master"
- else if(!ishuman(user))
- title = "Construct"
- my_message = "[title] [findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]: [message]"
- for(var/i in GLOB.player_list)
- var/mob/M = i
- if(iscultist(M))
- to_chat(M, my_message)
- else if(M in GLOB.dead_mob_list)
- var/link = FOLLOW_LINK(M, user)
- to_chat(M, "[link] [my_message]")
-
- user.log_talk(message, LOG_SAY, tag="cult")
-
-/datum/action/innate/cult/comm/spirit
- name = "Spiritual Communion"
- desc = "Conveys a message from the spirit realm that all cultists can hear."
-
-/datum/action/innate/cult/comm/spirit/IsAvailable()
- if(iscultist(owner.mind.current))
- return TRUE
-
-/datum/action/innate/cult/comm/spirit/cultist_commune(mob/living/user, message)
- var/my_message
- if(!message)
- return
- my_message = "The [user.name]: [message]"
- for(var/i in GLOB.player_list)
- var/mob/M = i
- if(iscultist(M))
- to_chat(M, my_message)
- else if(M in GLOB.dead_mob_list)
- var/link = FOLLOW_LINK(M, user)
- to_chat(M, "[link] [my_message]")
-
-/datum/action/innate/cult/mastervote
- name = "Assert Leadership"
- button_icon_state = "cultvote"
-
-/datum/action/innate/cult/mastervote/IsAvailable()
- var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(!C || C.cult_team.cult_vote_called || !ishuman(owner))
- return FALSE
- return ..()
-
-/datum/action/innate/cult/mastervote/Activate()
- var/choice = alert(owner, "The mantle of leadership is heavy. Success in this role requires an expert level of communication and experience. Are you sure?",, "Yes", "No")
- if(choice == "Yes" && IsAvailable())
- var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- pollCultists(owner,C.cult_team)
-
-/proc/pollCultists(mob/living/Nominee,datum/team/cult/team) //Cult Master Poll
- if(world.time < CULT_POLL_WAIT)
- to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [DisplayTimeText(CULT_POLL_WAIT-world.time)].")
- return
- team.cult_vote_called = TRUE //somebody's trying to be a master, make sure we don't let anyone else try
- for(var/datum/mind/B in team.members)
- if(B.current)
- B.current.update_action_buttons_icon()
- if(!B.current.incapacitated())
- SEND_SOUND(B.current, 'sound/hallucinations/im_here1.ogg')
- to_chat(B.current, "Acolyte [Nominee] has asserted that [Nominee.p_theyre()] worthy of leading the cult. A vote will be called shortly.")
- sleep(100)
- var/list/asked_cultists = list()
- for(var/datum/mind/B in team.members)
- if(B.current && B.current != Nominee && !B.current.incapacitated())
- SEND_SOUND(B.current, 'sound/magic/exit_blood.ogg')
- asked_cultists += B.current
- var/list/yes_voters = pollCandidates("[Nominee] seeks to lead your cult, do you support [Nominee.p_them()]?", poll_time = 300, group = asked_cultists)
- if(QDELETED(Nominee) || Nominee.incapacitated())
- team.cult_vote_called = FALSE
- for(var/datum/mind/B in team.members)
- if(B.current)
- B.current.update_action_buttons_icon()
- if(!B.current.incapacitated())
- to_chat(B.current,"[Nominee] has died in the process of attempting to win the cult's support!")
- return FALSE
- if(!Nominee.mind)
- team.cult_vote_called = FALSE
- for(var/datum/mind/B in team.members)
- if(B.current)
- B.current.update_action_buttons_icon()
- if(!B.current.incapacitated())
- to_chat(B.current,"[Nominee] has gone catatonic in the process of attempting to win the cult's support!")
- return FALSE
- if(LAZYLEN(yes_voters) <= LAZYLEN(asked_cultists) * 0.5)
- team.cult_vote_called = FALSE
- for(var/datum/mind/B in team.members)
- if(B.current)
- B.current.update_action_buttons_icon()
- if(!B.current.incapacitated())
- to_chat(B.current, "[Nominee] could not win the cult's support and shall continue to serve as an acolyte.")
- return FALSE
- team.cult_master = Nominee
- SSticker.mode.remove_cultist(Nominee.mind, TRUE)
- Nominee.mind.add_antag_datum(/datum/antagonist/cult/master)
- for(var/datum/mind/B in team.members)
- if(B.current)
- for(var/datum/action/innate/cult/mastervote/vote in B.current.actions)
- vote.Remove(B.current)
- if(!B.current.incapacitated())
- to_chat(B.current,"[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of your ability!")
- return TRUE
-
-/datum/action/innate/cult/master/IsAvailable()
- if(!owner.mind || !owner.mind.has_antag_datum(/datum/antagonist/cult/master) || GLOB.cult_narsie)
- return 0
- return ..()
-
-/datum/action/innate/cult/master/finalreck
- name = "Final Reckoning"
- desc = "A single-use spell that brings the entire cult to the master's location."
- button_icon_state = "sintouch"
-
-/datum/action/innate/cult/master/finalreck/Activate()
- var/datum/antagonist/cult/antag = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(!antag)
- return
- for(var/i in 1 to 4)
- chant(i)
- var/list/destinations = list()
- for(var/turf/T in orange(1, owner))
- if(!T.is_blocked_turf(TRUE))
- destinations += T
- if(!LAZYLEN(destinations))
- to_chat(owner, "You need more space to summon your cult!")
- return
- if(do_after(owner, 30, target = owner))
- for(var/datum/mind/B in antag.cult_team.members)
- if(B.current && B.current.stat != DEAD)
- var/turf/mobloc = get_turf(B.current)
- switch(i)
- if(1)
- new /obj/effect/temp_visual/cult/sparks(mobloc, B.current.dir)
- playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- if(2)
- new /obj/effect/temp_visual/dir_setting/cult/phase/out(mobloc, B.current.dir)
- playsound(mobloc, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- if(3)
- new /obj/effect/temp_visual/dir_setting/cult/phase(mobloc, B.current.dir)
- playsound(mobloc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- if(4)
- playsound(mobloc, 'sound/magic/exit_blood.ogg', 100, TRUE)
- if(B.current != owner)
- var/turf/final = pick(destinations)
- if(istype(B.current.loc, /obj/item/soulstone))
- var/obj/item/soulstone/S = B.current.loc
- S.release_shades(owner)
- B.current.setDir(SOUTH)
- new /obj/effect/temp_visual/cult/blood(final)
- addtimer(CALLBACK(B.current, TYPE_PROC_REF(/mob, reckon), final), 10)
- else
- return
- antag.cult_team.reckoning_complete = TRUE
- Remove(owner)
-
-/mob/proc/reckon(turf/final)
- new /obj/effect/temp_visual/cult/blood/out(get_turf(src))
- forceMove(final)
-
-/datum/action/innate/cult/master/finalreck/proc/chant(chant_number)
- switch(chant_number)
- if(1)
- owner.say("C'arta forbici!", language = /datum/language/common, forced = "cult invocation")
- if(2)
- owner.say("Pleggh e'ntrath!", language = /datum/language/common, forced = "cult invocation")
- playsound(get_turf(owner),'sound/magic/clockwork/narsie_attack.ogg', 50, TRUE)
- if(3)
- owner.say("Barhah hra zar'garis!", language = /datum/language/common, forced = "cult invocation")
- playsound(get_turf(owner),'sound/magic/clockwork/narsie_attack.ogg', 75, TRUE)
- if(4)
- owner.say("N'ath reth sh'yro eth d'rekkathnor!!!", language = /datum/language/common, forced = "cult invocation")
- playsound(get_turf(owner),'sound/magic/clockwork/narsie_attack.ogg', 100, TRUE)
-
-/datum/action/innate/cult/master/cultmark
- name = "Mark Target"
- desc = "Marks a target for the cult."
- button_icon_state = "cult_mark"
- var/obj/effect/proc_holder/cultmark/CM
- var/cooldown = 0
- var/base_cooldown = 1200
-
-/datum/action/innate/cult/master/cultmark/New(Target)
- CM = new()
- CM.attached_action = src
- ..()
-
-/datum/action/innate/cult/master/cultmark/IsAvailable()
- if(cooldown > world.time)
- if(!CM.active)
- to_chat(owner, "You need to wait [DisplayTimeText(cooldown - world.time)] before you can mark another target!")
- return FALSE
- return ..()
-
-/datum/action/innate/cult/master/cultmark/Destroy()
- QDEL_NULL(CM)
- return ..()
-
-/datum/action/innate/cult/master/cultmark/Activate()
- CM.toggle(owner) //the important bit
- return TRUE
-
-/obj/effect/proc_holder/cultmark
- active = FALSE
- ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
- var/datum/action/innate/cult/master/cultmark/attached_action
-
-/obj/effect/proc_holder/cultmark/Destroy()
- attached_action = null
- return ..()
-
-/obj/effect/proc_holder/cultmark/proc/toggle(mob/user)
- if(active)
- remove_ranged_ability("You cease the marking ritual.")
- else
- add_ranged_ability(user, "You prepare to mark a target for your cult...")
-
-/obj/effect/proc_holder/cultmark/InterceptClickOn(mob/living/caller, params, atom/target)
- if(..())
- return
- if(ranged_ability_user.incapacitated())
- remove_ranged_ability()
- return
- var/turf/T = get_turf(ranged_ability_user)
- if(!isturf(T))
- return FALSE
-
- var/datum/antagonist/cult/C = caller.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
-
- if(target in view(7, get_turf(ranged_ability_user)))
- if(C.cult_team.blood_target)
- to_chat(ranged_ability_user, "The cult has already designated a target!")
- return FALSE
- C.cult_team.blood_target = target
- var/area/A = get_area(target)
- attached_action.cooldown = world.time + attached_action.base_cooldown
- addtimer(CALLBACK(attached_action.owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), attached_action.base_cooldown)
- C.cult_team.blood_target_image = image('icons/effects/mouse_pointers/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER)
- C.cult_team.blood_target_image.appearance_flags = RESET_COLOR
- C.cult_team.blood_target_image.pixel_x = -target.pixel_x
- C.cult_team.blood_target_image.pixel_y = -target.pixel_y
- for(var/datum/mind/B in SSticker.mode.cult)
- if(B.current && B.current.stat != DEAD && B.current.client)
- to_chat(B.current, "[ranged_ability_user] has marked [C.cult_team.blood_target] in the [A.name] as the cult's top priority, get there immediately!")
- SEND_SOUND(B.current, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75))
- B.current.client.images += C.cult_team.blood_target_image
- attached_action.owner.update_action_buttons_icon()
- remove_ranged_ability("The marking rite is complete! It will last for 90 seconds.")
- C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reset_blood_target),C.cult_team), 900, TIMER_STOPPABLE)
- return TRUE
- return FALSE
-
-/proc/reset_blood_target(datum/team/cult/team)
- for(var/datum/mind/B in team.members)
- if(B.current && B.current.stat != DEAD && B.current.client)
- if(team.blood_target)
- to_chat(B.current,"The blood mark has expired!")
- B.current.client.images -= team.blood_target_image
- QDEL_NULL(team.blood_target_image)
- team.blood_target = null
-
-
-/datum/action/innate/cult/master/cultmark/ghost
- name = "Mark a Blood Target for the Cult"
- desc = "Marks a target for the entire cult to track."
-
-/datum/action/innate/cult/master/cultmark/ghost/IsAvailable()
- if(istype(owner, /mob/dead/observer) && iscultist(owner.mind.current))
- return TRUE
- else
- qdel(src)
-
-/datum/action/innate/cult/ghostmark //Ghost version
- name = "Blood Mark your Target"
- desc = "Marks whatever you are orbitting - for the entire cult to track."
- button_icon_state = "cult_mark"
- var/tracking = FALSE
- var/cooldown = 0
- var/base_cooldown = 600
-
-/datum/action/innate/cult/ghostmark/IsAvailable()
- if(istype(owner, /mob/dead/observer) && iscultist(owner.mind.current))
- return TRUE
- else
- qdel(src)
-
-/datum/action/innate/cult/ghostmark/proc/reset_button()
- if(owner)
- name = "Blood Mark your Target"
- desc = "Marks whatever you are orbitting - for the entire cult to track."
- button_icon_state = "cult_mark"
- owner.update_action_buttons_icon()
- SEND_SOUND(owner, 'sound/magic/enter_blood.ogg')
- to_chat(owner,"Your previous mark is gone - you are now ready to create a new blood mark.")
-
-/datum/action/innate/cult/ghostmark/Activate()
- var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(C.cult_team.blood_target)
- if(cooldown>world.time)
- reset_blood_target(C.cult_team)
- to_chat(owner, "You have cleared the cult's blood target!")
- deltimer(C.cult_team.blood_target_reset_timer)
- return
- else
- to_chat(owner, "The cult has already designated a target!")
- return
- if(cooldown>world.time)
- to_chat(owner, "You aren't ready to place another blood mark yet!")
- return
- target = owner.orbiting?.parent || get_turf(owner)
- if(!target)
- return
- C.cult_team.blood_target = target
- var/area/A = get_area(target)
- cooldown = world.time + base_cooldown
- addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), base_cooldown)
- C.cult_team.blood_target_image = image('icons/effects/mouse_pointers/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER)
- C.cult_team.blood_target_image.appearance_flags = RESET_COLOR
- C.cult_team.blood_target_image.pixel_x = -target.pixel_x
- C.cult_team.blood_target_image.pixel_y = -target.pixel_y
- SEND_SOUND(owner, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75))
- owner.client.images += C.cult_team.blood_target_image
- for(var/datum/mind/B in SSticker.mode.cult)
- if(B.current && B.current.stat != DEAD && B.current.client)
- to_chat(B.current, "[owner] has marked [C.cult_team.blood_target] in the [A.name] as the cult's top priority, get there immediately!")
- SEND_SOUND(B.current, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75))
- B.current.client.images += C.cult_team.blood_target_image
- to_chat(owner,"You have marked the [target] for the cult! It will last for [DisplayTimeText(base_cooldown)].")
- name = "Clear the Blood Mark"
- desc = "Remove the Blood Mark you previously set."
- button_icon_state = "emp"
- owner.update_action_buttons_icon()
- C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reset_blood_target),C.cult_team), base_cooldown, TIMER_STOPPABLE)
- addtimer(CALLBACK(src, PROC_REF(reset_button)), base_cooldown)
-
-
-//////// ELDRITCH PULSE /////////
-
-
-
-/datum/action/innate/cult/master/pulse
- name = "Eldritch Pulse"
- desc = "Seize upon a fellow cultist or cult structure and teleport it to a nearby location."
- icon_icon = 'icons/mob/actions/actions_spells.dmi'
- button_icon_state = "arcane_barrage"
- var/obj/effect/proc_holder/pulse/PM
- var/cooldown = 0
- var/base_cooldown = 150
- var/throwing = FALSE
- var/mob/living/throwee
-
-/datum/action/innate/cult/master/pulse/New()
- PM = new()
- PM.attached_action = src
- ..()
-
-/datum/action/innate/cult/master/pulse/IsAvailable()
- if(!owner.mind || !owner.mind.has_antag_datum(/datum/antagonist/cult/master))
- return FALSE
- if(cooldown > world.time)
- if(!PM.active)
- to_chat(owner, "You need to wait [DisplayTimeText(cooldown - world.time)] before you can pulse again!")
- return FALSE
- return ..()
-
-/datum/action/innate/cult/master/pulse/Destroy()
- PM.attached_action = null //What the fuck is even going on here.
- QDEL_NULL(PM)
- return ..()
-
-
-/datum/action/innate/cult/master/pulse/Activate()
- PM.toggle(owner) //the important bit
- return TRUE
-
-/obj/effect/proc_holder/pulse
- active = FALSE
- ranged_mousepointer = 'icons/effects/mouse_pointers/throw_target.dmi'
- var/datum/action/innate/cult/master/pulse/attached_action
-
-/obj/effect/proc_holder/pulse/Destroy()
- attached_action = null
- return ..()
-
-
-/obj/effect/proc_holder/pulse/proc/toggle(mob/user)
- if(active)
- remove_ranged_ability("You cease your preparations...")
- attached_action.throwing = FALSE
- else
- add_ranged_ability(user, "You prepare to tear through the fabric of reality...")
-
-/obj/effect/proc_holder/pulse/InterceptClickOn(mob/living/caller, params, atom/target)
- if(..())
- return
- if(ranged_ability_user.incapacitated())
- remove_ranged_ability()
- return
- var/turf/T = get_turf(ranged_ability_user)
- if(!isturf(T))
- return FALSE
- if(target in view(7, get_turf(ranged_ability_user)))
- if((!(iscultist(target) || istype(target, /obj/structure/destructible/cult)) || target == caller) && !(attached_action.throwing))
- return
- if(!attached_action.throwing)
- attached_action.throwing = TRUE
- attached_action.throwee = target
- SEND_SOUND(ranged_ability_user, sound('sound/weapons/thudswoosh.ogg'))
- to_chat(ranged_ability_user,"You reach through the veil with your mind's eye and seize [target]!")
- return
- else
- new /obj/effect/temp_visual/cult/sparks(get_turf(attached_action.throwee), ranged_ability_user.dir)
- var/distance = get_dist(attached_action.throwee, target)
- if(distance >= 16)
- return
- playsound(target,'sound/magic/exit_blood.ogg')
- attached_action.throwee.Beam(target,icon_state="sendbeam",time=4)
- attached_action.throwee.forceMove(get_turf(target))
- new /obj/effect/temp_visual/cult/sparks(get_turf(target), ranged_ability_user.dir)
- attached_action.throwing = FALSE
- attached_action.cooldown = world.time + attached_action.base_cooldown
- remove_ranged_ability("A pulse of blood magic surges through you as you shift [attached_action.throwee] through time and space.")
- caller.update_action_buttons_icon()
- addtimer(CALLBACK(caller, TYPE_PROC_REF(/mob, update_action_buttons_icon)), attached_action.base_cooldown)
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
deleted file mode 100644
index 53d17bf325a..00000000000
--- a/code/modules/antagonists/cult/cult_items.dm
+++ /dev/null
@@ -1,910 +0,0 @@
-/obj/item/tome
- name = "arcane tome"
- desc = "An old, dusty tome with frayed edges and a sinister-looking cover."
- icon_state ="tome"
- throw_speed = 2
- throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/melee/cultblade/dagger
- name = "ritual dagger"
- desc = "A strange dagger said to be used by sinister groups for \"preparing\" a corpse before sacrificing it to their dark gods."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "render"
- item_state = "cultdagger"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- inhand_x_dimension = 32
- inhand_y_dimension = 32
- w_class = WEIGHT_CLASS_SMALL
- force = 15
- throwforce = 25
- armour_penetration = 35
- actions_types = list(/datum/action/item_action/cult_dagger)
- var/drawing_rune = FALSE
-
-/obj/item/melee/cultblade/dagger/Initialize()
- . = ..()
- var/image/I = image(icon = 'icons/effects/blood.dmi' , icon_state = null, loc = src)
- I.override = TRUE
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_dagger", I)
-
-/obj/item/melee/cultblade
- name = "eldritch longsword"
- desc = "A sword humming with unholy energy. It glows with a dim red light."
- icon_state = "cultblade"
- item_state = "cultblade"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- flags_1 = CONDUCT_1
- sharpness = IS_SHARP
- w_class = WEIGHT_CLASS_BULKY
- force = 30
- throwforce = 10
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended")
-
-/obj/item/melee/cultblade/Initialize()
- . = ..()
- AddComponent(/datum/component/butchering, 40, 100)
-
-/obj/item/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user)
- if(!iscultist(user))
- user.Paralyze(100)
- user.dropItemToGround(src, TRUE)
- user.visible_message(
- "A powerful force shoves [user] away from [target]!", \
- "\"You shouldn't play with sharp things. You'll poke someone's eye out.\"")
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- H.apply_damage(rand(force/2, force), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
- else
- user.adjustBruteLoss(rand(force/2,force))
- return
- ..()
-
-/obj/item/melee/cultblade/ghost
- name = "eldritch sword"
- force = 19 //can't break normal airlocks
- item_flags = NEEDS_PERMIT | DROPDEL
- flags_1 = NONE
-
-/obj/item/melee/cultblade/ghost/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
-
-/obj/item/melee/cultblade/pickup(mob/living/user)
- ..()
- if(!iscultist(user))
- to_chat(user, "\"I wouldn't advise that.\"")
-
-/obj/item/cult_bastard
- name = "geometric bastard sword"
- desc = "An enormous sword, once used by Nar'Sien cultists to rapidly harvest the souls of non-believers. It still yet hungers to taste inpure blood."
- w_class = WEIGHT_CLASS_HUGE
- block_chance = 50
- throwforce = 20
- force = 30
- armour_penetration = 45
- throw_speed = 1
- throw_range = 3
- sharpness = IS_SHARP
- light_system = MOVABLE_LIGHT
- light_range = 4
- light_color = COLOR_RED
- attack_verb = list("cleaved", "bisected", "tore", "brutalized", "smashed", "ripped", "diced", "carved")
- icon_state = "cultbastard"
- item_state = "cultbastard"
- hitsound = 'sound/weapons/bladeslice.ogg'
- lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
- inhand_x_dimension = 64
- inhand_y_dimension = 64
- actions_types = list()
- item_flags = SLOWS_WHILE_IN_HAND
- var/datum/action/innate/dash/cult/jaunt
- var/datum/action/innate/cult/spin2win/linked_action
- var/spinning = FALSE
- var/spin_cooldown = 250
- var/dash_toggled = TRUE
- var/list/nemesis_factions = list("mining", "boss")
- var/faction_bonus_force = 25
-
-/obj/item/cult_bastard/Initialize()
- . = ..()
- jaunt = new(src)
- linked_action = new(src)
- AddComponent(/datum/component/butchering, 50, 120)
- AddComponent(/datum/component/two_handed, require_twohands=TRUE)
-
-/obj/item/cult_bastard/attack(mob/living/target, mob/living/carbon/human/user)
- var/nemesis_faction = FALSE
- if(LAZYLEN(nemesis_factions))
- for(var/F in target.faction)
- if(F in nemesis_factions)
- nemesis_faction = TRUE
- force += faction_bonus_force
- throwforce += faction_bonus_force
- nemesis_effects(user, target)
- break
- . = ..()
- if(nemesis_faction)
- force -= faction_bonus_force
- throwforce -= faction_bonus_force
-
-/obj/item/cult_bastard/proc/nemesis_effects(mob/living/user, mob/living/target)
- return
-
-/obj/item/cult_bastard/Destroy()
- QDEL_NULL(jaunt)
- QDEL_NULL(linked_action)
- return ..()
-
-/obj/item/cult_bastard/examine(mob/user)
- . = ..()
- . += "This weapon will absorb the souls of unconscious human foes."
- if(contents.len)
- . += "There are [contents.len] souls trapped within the sword's core."
- else
- . += "The sword appears to be quite lifeless."
-
-/obj/item/cult_bastard/can_be_pulled(user)
- return FALSE
-
-/obj/item/cult_bastard/attack_self(mob/user)
- dash_toggled = !dash_toggled
- if(dash_toggled)
- to_chat(loc, "You raise [src] and prepare to jaunt with it.")
- else
- to_chat(loc, "You lower [src] and prepare to swing it normally.")
-
-/obj/item/cult_bastard/pickup(mob/living/user)
- . = ..()
- force = initial(force)
- jaunt.Grant(user, src)
- linked_action.Grant(user, src)
- user.update_icons()
-
-/obj/item/cult_bastard/dropped(mob/user)
- . = ..()
- linked_action.Remove(user)
- jaunt.Remove(user)
- user.update_icons()
-
-/obj/item/cult_bastard/IsReflect()
- if(spinning)
- playsound(src, 'sound/weapons/effects/deflect.ogg', 100, TRUE)
- return TRUE
- else
- ..()
-
-/obj/item/cult_bastard/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(prob(final_block_chance))
- if(attack_type == PROJECTILE_ATTACK)
- owner.visible_message("[owner] deflects [attack_text] with [src]!")
- playsound(src, 'sound/weapons/effects/deflect.ogg', 100, TRUE)
- return TRUE
- else
- playsound(src, 'sound/weapons/parry.ogg', 75, TRUE)
- owner.visible_message("[owner] parries [attack_text] with [src]!")
- return TRUE
- return FALSE
-
-/obj/item/cult_bastard/afterattack(atom/target, mob/user, proximity, click_parameters)
- . = ..()
- if(dash_toggled && !proximity)
- jaunt.Teleport(user, target)
- return
- if(proximity)
- if(ishuman(target))
- var/mob/living/carbon/human/H = target
- if(H.stat != CONSCIOUS)
- var/obj/item/soulstone/anybody/SS = new /obj/item/soulstone/anybody(src)
- SS.attack(H, user)
- if(!LAZYLEN(SS.contents))
- qdel(SS)
- if(istype(target, /obj/structure/constructshell) && contents.len)
- var/obj/item/soulstone/anybody/SS = contents[1]
- if(istype(SS))
- SS.transfer_soul("CONSTRUCT",target,user)
- qdel(SS)
-
-/datum/action/innate/dash/cult
- name = "Rend the Veil"
- desc = "Use the sword to shear open the flimsy fabric of this reality and teleport to your target."
- icon_icon = 'icons/mob/actions/actions_cult.dmi'
- button_icon_state = "phaseshift"
- dash_sound = 'sound/magic/enter_blood.ogg'
- recharge_sound = 'sound/magic/exit_blood.ogg'
- beam_effect = "sendbeam"
- phasein = /obj/effect/temp_visual/dir_setting/cult/phase
- phaseout = /obj/effect/temp_visual/dir_setting/cult/phase/out
-
-/datum/action/innate/dash/cult/IsAvailable()
- if(iscultist(owner) && current_charges)
- return TRUE
- else
- return FALSE
-
-
-
-/datum/action/innate/cult/spin2win
- name = "Geometer's Fury"
- desc = "You draw on the power of the sword's ancient runes, spinning it wildly around you as you become immune to most attacks."
- background_icon_state = "bg_demon"
- button_icon_state = "sintouch"
- var/cooldown = 0
- var/mob/living/carbon/human/holder
- var/obj/item/cult_bastard/sword
-
-/datum/action/innate/cult/spin2win/Grant(mob/user, obj/bastard)
- . = ..()
- sword = bastard
- holder = user
-
-/datum/action/innate/cult/spin2win/IsAvailable()
- if(cooldown <= world.time)
- return TRUE
- else
- return FALSE
-
-/datum/action/innate/cult/spin2win/Activate()
- cooldown = world.time + sword.spin_cooldown
- holder.changeNext_move(50)
- holder.apply_status_effect(/datum/status_effect/sword_spin)
- sword.spinning = TRUE
- sword.block_chance = 100
- sword.slowdown += 1.5
- addtimer(CALLBACK(src, PROC_REF(stop_spinning)), 50)
- holder.update_action_buttons_icon()
-
-/datum/action/innate/cult/spin2win/proc/stop_spinning()
- sword.spinning = FALSE
- sword.block_chance = 50
- sword.slowdown -= 1.5
- sleep(sword.spin_cooldown)
- holder.update_action_buttons_icon()
-
-/obj/item/restraints/legcuffs/bola/cult
- name = "\improper Nar'Sien bola"
- desc = "A strong bola, bound with dark magic that allows it to pass harmlessly through Nar'Sien cultists. Throw it to trip and slow your victim."
- icon_state = "bola_cult"
- item_state = "bola_cult"
- breakouttime = 60
- knockdown = 30
-
-/obj/item/restraints/legcuffs/bola/cult/attack_hand(mob/living/user)
- . = ..()
- if(!iscultist(user))
- to_chat(user, "The bola seems to take on a life of its own!")
- ensnare(user)
-
-/obj/item/restraints/legcuffs/bola/cult/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- if(iscultist(hit_atom))
- return
- . = ..()
-
-
-/obj/item/clothing/head/hooded/cult_hoodie
- name = "ancient cultist hood"
- icon_state = "culthood"
- desc = "A torn, dust-caked hood. Strange letters line the inside."
- flags_inv = HIDEFACE|HIDEHAIR|HIDEEARS
- flags_cover = HEADCOVERSEYES
- armor = list("melee" = 40, "bullet" = 30, "laser" = 40,"energy" = 40, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10)
- cold_protection = HEAD
- min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
- heat_protection = HEAD
- max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
-
-/obj/item/clothing/suit/hooded/cultrobes
- name = "ancient cultist robes"
- desc = "A ragged, dusty set of robes. Strange letters line the inside."
- icon_state = "cultrobes"
- item_state = "cultrobes"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank)
- armor = list("melee" = 40, "bullet" = 30, "laser" = 40,"energy" = 40, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10)
- flags_inv = HIDEJUMPSUIT
- cold_protection = CHEST|GROIN|LEGS|ARMS
- min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
- heat_protection = CHEST|GROIN|LEGS|ARMS
- max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
- hoodtype = /obj/item/clothing/head/hooded/cult_hoodie
-
-
-/obj/item/clothing/head/hooded/cult_hoodie/alt
- name = "cultist hood"
- desc = "An armored hood worn by the followers of Nar'Sie."
- icon_state = "cult_hoodalt"
- item_state = "cult_hoodalt"
-
-/obj/item/clothing/suit/hooded/cultrobes/alt
- name = "cultist robes"
- desc = "An armored set of robes worn by the followers of Nar'Sie."
- icon_state = "cultrobesalt"
- item_state = "cultrobesalt"
- hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/alt
-
-/obj/item/clothing/suit/hooded/cultrobes/alt/ghost
- item_flags = DROPDEL
-
-/obj/item/clothing/suit/hooded/cultrobes/alt/ghost/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
-
-
-/obj/item/clothing/head/magus
- name = "magus helm"
- icon_state = "magus"
- item_state = "magus"
- desc = "A helm worn by the followers of Nar'Sie."
- flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES
- armor = list("melee" = 50, "bullet" = 30, "laser" = 50,"energy" = 50, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10)
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-
-/obj/item/clothing/suit/magusred
- name = "magus robes"
- desc = "A set of armored robes worn by the followers of Nar'Sie."
- icon_state = "magusred"
- item_state = "magusred"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
- armor = list("melee" = 50, "bullet" = 30, "laser" = 50,"energy" = 50, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10)
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
-/obj/item/clothing/head/helmet/space/hardsuit/cult
- name = "\improper Nar'Sien hardened helmet"
- desc = "A heavily-armored helmet worn by warriors of the Nar'Sien cult. It can withstand hard vacuum."
- icon_state = "cult_helmet"
- item_state = "cult_helmet"
- armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 40, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75)
- light_system = NO_LIGHT_SUPPORT
- light_range = 0
- actions_types = list()
-
-/obj/item/clothing/suit/space/hardsuit/cult
- name = "\improper Nar'Sien hardened armor"
- icon_state = "cult_armor"
- item_state = "cult_armor"
- desc = "A heavily-armored exosuit worn by warriors of the Nar'Sien cult. It can withstand hard vacuum."
- w_class = WEIGHT_CLASS_BULKY
- allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank/internals/)
- armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 40, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75)
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cult
-
-/obj/item/sharpener/cult
- name = "eldritch whetstone"
- desc = "A block, empowered by dark magic. Sharp weapons will be enhanced when used on the stone."
- icon_state = "cult_sharpener"
- used = 0
- increment = 5
- max = 40
- prefix = "darkened"
-
-/obj/item/sharpener/cult/update_icon_state()
- icon_state = "cult_sharpener[used ? "_used" : ""]"
- return ..()
-
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield
- name = "empowered cultist armor"
- desc = "Empowered armor which creates a powerful shield around the user."
- icon_state = "cult_armor"
- item_state = "cult_armor"
- w_class = WEIGHT_CLASS_BULKY
- armor = list("melee" = 50, "bullet" = 40, "laser" = 50,"energy" = 50, "bomb" = 50, "bio" = 30, "rad" = 30, "fire" = 50, "acid" = 60)
- var/current_charges = 3
- hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/cult_shield
-
-/obj/item/clothing/head/hooded/cult_hoodie/cult_shield
- name = "empowered cultist helmet"
- desc = "Empowered helmet which creates a powerful shield around the user."
- icon_state = "cult_hoodalt"
- armor = list("melee" = 50, "bullet" = 40, "laser" = 50,"energy" = 50, "bomb" = 50, "bio" = 30, "rad" = 30, "fire" = 50, "acid" = 60)
-
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/living/user, slot)
- ..()
- if(!iscultist(user))
- to_chat(user, "\"I wouldn't advise that.\"")
- to_chat(user, "An overwhelming sense of nausea overpowers you!")
- user.dropItemToGround(src, TRUE)
- user.Dizzy(30)
- user.Paralyze(100)
-
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(current_charges)
- owner.visible_message("\The [attack_text] is deflected in a burst of blood-red sparks!")
- current_charges--
- new /obj/effect/temp_visual/cult/sparks(get_turf(owner))
- if(!current_charges)
- owner.visible_message("The runed shield around [owner] suddenly disappears!")
- owner.update_inv_wear_suit()
- return 1
- return 0
-
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/worn_overlays(isinhands)
- . = list()
- if(!isinhands && current_charges)
- . += mutable_appearance('icons/effects/cult_effects.dmi', "shield-cult", MOB_LAYER + 0.01)
-
-/obj/item/clothing/suit/hooded/cultrobes/berserker
- name = "flagellant's robes"
- desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage."
- allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
- armor = list("melee" = -45, "bullet" = -45, "laser" = -45,"energy" = -55, "bomb" = -45, "bio" = -45, "rad" = -45, "fire" = 0, "acid" = 0)
- slowdown = -0.6
- hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood
-
-/obj/item/clothing/head/hooded/cult_hoodie/berserkerhood
- name = "flagellant's hood"
- desc = "Blood-soaked hood infused with dark magic."
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-
-/obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/living/user, slot)
- ..()
- if(!iscultist(user))
- to_chat(user, "\"I wouldn't advise that.\"")
- to_chat(user, "An overwhelming sense of nausea overpowers you!")
- user.dropItemToGround(src, TRUE)
- user.Dizzy(30)
- user.Paralyze(100)
-
-/obj/item/clothing/glasses/hud/health/night/cultblind
- desc = "may Nar'Sie guide you through the darkness and shield you from the light."
- name = "zealot's blindfold"
- icon_state = "blindfold"
- item_state = "blindfold"
- flash_protect = FLASH_PROTECTION_FLASH
-
-/obj/item/clothing/glasses/hud/health/night/cultblind/equipped(mob/living/user, slot)
- ..()
- if(prob(30))
- to_chat(user, "\"You want to be blind, do you?\"")
- user.dropItemToGround(src, TRUE)
- user.Dizzy(30)
- user.Paralyze(100)
- user.blind_eyes(30)
- else
- return
-
-/obj/item/reagent_containers/glass/beaker/unholywater
- name = "flask of unholy water"
- desc = "Toxic to nonbelievers; reinvigorating to the faithful - this flask may be sipped or thrown."
- icon = 'icons/obj/drinks/drinks.dmi'
- icon_state = "holyflask"
- color = "#333333"
- list_reagents = list(/datum/reagent/fuel/unholywater = 50)
- can_have_cap = FALSE
- cap_icon_state = null
- cap_on = FALSE
-
-/obj/item/cult_shift
- name = "veil shifter"
- desc = "This relic instantly teleports you, and anything you're pulling, forward by a moderate distance."
- icon = 'icons/obj/cult.dmi'
- icon_state ="shifter"
- var/uses = 4
-
-/obj/item/cult_shift/examine(mob/user)
- . = ..()
- if(uses)
- . += "It has [uses] use\s remaining."
- else
- . += "It seems drained."
-
-/obj/item/cult_shift/proc/handle_teleport_grab(turf/T, mob/user)
- var/mob/living/carbon/C = user
- if(C.pulling)
- var/atom/movable/pulled = C.pulling
- do_teleport(pulled, T, channel = TELEPORT_CHANNEL_CULT)
- . = pulled
-
-/obj/item/cult_shift/attack_self(mob/user)
- if(!uses || !iscarbon(user))
- to_chat(user, "\The [src] is dull and unmoving in your hands.")
- return
-
- var/mob/living/carbon/C = user
- var/turf/mobloc = get_turf(C)
- var/turf/destination = get_teleport_loc(mobloc,C,9,1,3,1,0,1)
-
- if(destination)
- uses--
- if(uses <= 0)
- icon_state ="shifter_drained"
- playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- new /obj/effect/temp_visual/dir_setting/cult/phase/out(mobloc, C.dir)
-
- var/atom/movable/pulled = handle_teleport_grab(destination, C)
- if(do_teleport(C, destination, channel = TELEPORT_CHANNEL_CULT))
- if(pulled)
- C.start_pulling(pulled) //forcemove resets pulls, so we need to re-pull
- new /obj/effect/temp_visual/dir_setting/cult/phase(destination, C.dir)
- playsound(destination, 'sound/effects/phasein.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
-
- else
- to_chat(C, "The veil cannot be torn here!")
-
-/obj/item/flashlight/flare/culttorch
- name = "void torch"
- desc = "Used by veteran cultists to instantly transport items to their needful brethren."
- w_class = WEIGHT_CLASS_SMALL
- light_range = 1
- icon_state = "torch"
- item_state = "torch"
- color = "#ff0000"
- on_damage = 15
- slot_flags = null
- on = TRUE
- var/charges = 5
-
-/obj/item/flashlight/flare/culttorch/afterattack(atom/movable/A, mob/user, proximity)
- if(!proximity)
- return
- if(!iscultist(user))
- to_chat(user, "That doesn't seem to do anything useful.")
- return
-
- if(istype(A, /obj/item))
-
- var/list/cultists = list()
- for(var/datum/mind/M in SSticker.mode.cult)
- if(M.current && M.current.stat != DEAD)
- cultists |= M.current
- var/mob/living/cultist_to_receive = input(user, "Who do you wish to call to [src]?", "Followers of the Geometer") as null|anything in (cultists - user)
- if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated())
- return
- if(!cultist_to_receive)
- to_chat(user, "You require a destination!")
- log_game("Void torch failed - no target")
- return
- if(cultist_to_receive.stat == DEAD)
- to_chat(user, "[cultist_to_receive] has died!")
- log_game("Void torch failed - target died")
- return
- if(!iscultist(cultist_to_receive))
- to_chat(user, "[cultist_to_receive] is not a follower of the Geometer!")
- log_game("Void torch failed - target was deconverted")
- return
- if(A in user.GetAllContents())
- to_chat(user, "[A] must be on a surface in order to teleport it!")
- return
- to_chat(user, "You ignite [A] with \the [src], turning it to ash, but through the torch's flames you see that [A] has reached [cultist_to_receive]!")
- cultist_to_receive.put_in_hands(A)
- charges--
- to_chat(user, "\The [src] now has [charges] charge\s.")
- if(charges == 0)
- qdel(src)
-
- else
- ..()
- to_chat(user, "\The [src] can only transport items!")
-
-
-/obj/item/cult_spear
- name = "blood halberd"
- desc = "A sickening spear composed entirely of crystallized blood."
- icon_state = "bloodspear0"
- base_icon_state = "occultpoleaxe"
- lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
- slot_flags = 0
- force = 17
- throwforce = 40
- throw_speed = 2
- armour_penetration = 30
- block_chance = 30
- attack_verb = list("attacked", "impaled", "stabbed", "torn", "gored")
- sharpness = IS_SHARP
- hitsound = 'sound/weapons/bladeslice.ogg'
- var/datum/action/innate/cult/spear/spear_act
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/cult_spear/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
-
-/obj/item/cult_spear/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/butchering, 100, 90)
- AddComponent(/datum/component/two_handed, force_unwielded=17, force_wielded=24, icon_wielded="[base_icon_state]1")
-
-/// triggered on wield of two handed item
-/obj/item/cult_spear/proc/on_wield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/cult_spear/proc/on_unwield(obj/item/source, mob/user)
- SIGNAL_HANDLER
-
- wielded = FALSE
-
-/obj/item/cult_spear/update_icon_state()
- icon_state = "[base_icon_state]0"
- return ..()
-
-/obj/item/cult_spear/Destroy()
- if(spear_act)
- qdel(spear_act)
- return ..()
-
-/obj/item/cult_spear/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- var/turf/T = get_turf(hit_atom)
- if(isliving(hit_atom))
- var/mob/living/L = hit_atom
- if(iscultist(L))
- playsound(src, 'sound/weapons/throwtap.ogg', 50)
- if(L.put_in_active_hand(src))
- L.visible_message("[L] catches [src] out of the air!")
- else
- L.visible_message("[src] bounces off of [L], as if repelled by an unseen force!")
- else if(!..())
- if(!L.anti_magic_check())
- L.Paralyze(50)
- break_spear(T)
- else
- ..()
-
-/obj/item/cult_spear/proc/break_spear(turf/T)
- if(src)
- if(!T)
- T = get_turf(src)
- if(T)
- T.visible_message("[src] shatters and melts back into blood!")
- new /obj/effect/temp_visual/cult/sparks(T)
- new /obj/effect/decal/cleanable/blood/splatter(T)
- playsound(T, 'sound/effects/glassbr3.ogg', 100)
- qdel(src)
-
-/obj/item/cult_spear/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(wielded)
- final_block_chance *= 2
- if(prob(final_block_chance))
- if(attack_type == PROJECTILE_ATTACK)
- owner.visible_message("[owner] deflects [attack_text] with [src]!")
- playsound(src, 'sound/weapons/effects/deflect.ogg', 100, TRUE)
- return TRUE
- else
- playsound(src, 'sound/weapons/parry.ogg', 100, TRUE)
- owner.visible_message("[owner] parries [attack_text] with [src]!")
- return TRUE
- return FALSE
-
-/datum/action/innate/cult/spear
- name = "Bloody Bond"
- desc = "Call the blood spear back to your hand!"
- background_icon_state = "bg_demon"
- button_icon_state = "bloodspear"
- var/obj/item/cult_spear/spear
- var/cooldown = 0
-
-/datum/action/innate/cult/spear/Grant(mob/user, obj/blood_spear)
- . = ..()
- spear = blood_spear
- button.screen_loc = "6:157,4:-2"
- button.moved = "6:157,4:-2"
-
-/datum/action/innate/cult/spear/Activate()
- if(owner == spear.loc || cooldown > world.time)
- return
- var/ST = get_turf(spear)
- var/OT = get_turf(owner)
- if(get_dist(OT, ST) > 10)
- to_chat(owner,"The spear is too far away!")
- else
- cooldown = world.time + 20
- if(isliving(spear.loc))
- var/mob/living/L = spear.loc
- L.dropItemToGround(spear)
- L.visible_message("An unseen force pulls the blood spear from [L]'s hands!")
- spear.throw_at(owner, 10, 2, owner)
-
-/obj/item/blood_beam
- name = "\improper magical aura"
- desc = "Sinister looking aura that distorts the flow of reality around it."
- icon = 'icons/obj/items_and_weapons.dmi'
- lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
- icon_state = "disintegrate"
- item_state = "disintegrate"
- item_flags = ABSTRACT | DROPDEL
- w_class = WEIGHT_CLASS_HUGE
- throwforce = 0
- throw_range = 0
- throw_speed = 0
- var/charging = FALSE
- var/firing = FALSE
- var/angle
-
-/obj/item/blood_beam/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
-
-
-/obj/item/blood_beam/afterattack(atom/A, mob/living/user, flag, params)
- . = ..()
- if(firing || charging)
- return
- var/C = user.client
- if(ishuman(user) && C)
- angle = mouse_angle_from_client(C)
- else
- qdel(src)
- return
- charging = TRUE
- INVOKE_ASYNC(src, PROC_REF(charge), user)
- if(do_after(user, 90, target = user))
- firing = TRUE
- INVOKE_ASYNC(src, PROC_REF(pewpew), user, params)
- var/obj/structure/emergency_shield/invoker/N = new(user.loc)
- if(do_after(user, 90, target = user))
- user.Paralyze(40)
- to_chat(user, "You have exhausted the power of this spell!")
- firing = FALSE
- if(N)
- qdel(N)
- qdel(src)
- charging = FALSE
-
-/obj/item/blood_beam/proc/charge(mob/user)
- var/obj/O
- playsound(src, 'sound/magic/lightning_chargeup.ogg', 100, TRUE)
- for(var/i in 1 to 12)
- if(!charging)
- break
- if(i > 1)
- sleep(15)
- if(i < 4)
- O = new /obj/effect/temp_visual/cult/rune_spawn/rune1/inner(user.loc, 30, "#ff0000")
- else
- O = new /obj/effect/temp_visual/cult/rune_spawn/rune5(user.loc, 30, "#ff0000")
- new /obj/effect/temp_visual/dir_setting/cult/phase/out(user.loc, user.dir)
- if(O)
- qdel(O)
-
-/obj/item/blood_beam/proc/pewpew(mob/user, params)
- var/turf/targets_from = get_turf(src)
- var/spread = 40
- var/second = FALSE
- var/set_angle = angle
- for(var/i in 1 to 12)
- if(second)
- set_angle = angle - spread
- spread -= 8
- else
- sleep(15)
- set_angle = angle + spread
- second = !second //Handles beam firing in pairs
- if(!firing)
- break
- playsound(src, 'sound/magic/exit_blood.ogg', 75, TRUE)
- new /obj/effect/temp_visual/dir_setting/cult/phase(user.loc, user.dir)
- var/turf/temp_target = get_turf_in_angle(set_angle, targets_from, 40)
- for(var/turf/T in getline(targets_from,temp_target))
- if (locate(/obj/effect/blessing, T))
- temp_target = T
- playsound(T, 'sound/machines/clockcult/ark_damage.ogg', 50, TRUE)
- new /obj/effect/temp_visual/at_shield(T, T)
- break
- T.narsie_act(TRUE, TRUE)
- for(var/mob/living/target in T.contents)
- if(iscultist(target))
- new /obj/effect/temp_visual/cult/sparks(T)
- if(ishuman(target))
- var/mob/living/carbon/human/H = target
- if(H.stat != DEAD)
- H.reagents.add_reagent(/datum/reagent/fuel/unholywater, 7)
- if(isshade(target) || isconstruct(target))
- var/mob/living/simple_animal/M = target
- if(M.health+15 < M.maxHealth)
- M.adjustHealth(-15)
- else
- M.health = M.maxHealth
- else
- var/mob/living/L = target
- if(L.density)
- L.Paralyze(20)
- L.adjustBruteLoss(45)
- playsound(L, 'sound/hallucinations/wail.ogg', 50, TRUE)
- L.emote("scream")
- user.Beam(temp_target, icon_state="blood_beam", time = 7, beam_type = /obj/effect/ebeam/blood)
-
-
-/obj/effect/ebeam/blood
- name = "blood beam"
-
-/obj/item/shield/mirror
- name = "mirror shield"
- desc = "An infamous shield used by Nar'Sien sects to confuse and disorient their enemies. Its edges are weighted for use as a throwing weapon - capable of disabling multiple foes with preternatural accuracy."
- icon_state = "mirror_shield" // eshield1 for expanded
- lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
- force = 5
- throwforce = 15
- throw_speed = 1
- throw_range = 4
- w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("bumped", "prodded")
- hitsound = 'sound/weapons/smash.ogg'
- var/illusions = 2
-
-/obj/item/shield/mirror/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(iscultist(owner))
- if(istype(hitby, /obj/projectile))
- var/obj/projectile/P = hitby
- if(P.damage_type == BRUTE || P.damage_type == BURN)
- if(P.damage >= 30)
- var/turf/T = get_turf(owner)
- T.visible_message("The sheer force from [P] shatters the mirror shield!")
- new /obj/effect/temp_visual/cult/sparks(T)
- playsound(T, 'sound/effects/glassbr3.ogg', 100)
- owner.Paralyze(25)
- qdel(src)
- return FALSE
- if(P.reflectable & REFLECT_NORMAL)
- return FALSE //To avoid reflection chance double-dipping with block chance
- . = ..()
- if(.)
- playsound(src, 'sound/weapons/parry.ogg', 100, TRUE)
- if(illusions > 0)
- illusions--
- addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/shield/mirror, readd)), 450)
- if(prob(60))
- var/mob/living/simple_animal/hostile/illusion/M = new(owner.loc)
- M.faction = list("cult")
- M.Copy_Parent(owner, 70, 10, 5)
- M.move_to_delay = owner.cached_multiplicative_slowdown
- else
- var/mob/living/simple_animal/hostile/illusion/escape/E = new(owner.loc)
- E.Copy_Parent(owner, 70, 10)
- E.GiveTarget(owner)
- E.Goto(owner, owner.cached_multiplicative_slowdown, E.minimum_distance)
- return TRUE
- else
- if(prob(50))
- var/mob/living/simple_animal/hostile/illusion/H = new(owner.loc)
- H.Copy_Parent(owner, 100, 20, 5)
- H.faction = list("cult")
- H.GiveTarget(owner)
- H.move_to_delay = owner.cached_multiplicative_slowdown
- to_chat(owner, "[src] betrays you!")
- return FALSE
-
-/obj/item/shield/mirror/proc/readd()
- illusions++
- if(illusions == initial(illusions) && isliving(loc))
- var/mob/living/holder = loc
- to_chat(holder, "The shield's illusions are back at full strength!")
-
-/obj/item/shield/mirror/IsReflect()
- if(prob(block_chance))
- return TRUE
- return FALSE
-
-/obj/item/shield/mirror/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- var/turf/T = get_turf(hit_atom)
- var/datum/thrownthing/D = throwingdatum
- if(isliving(hit_atom))
- var/mob/living/L = hit_atom
- if(iscultist(L))
- playsound(src, 'sound/weapons/throwtap.ogg', 50)
- if(L.put_in_active_hand(src))
- L.visible_message("[L] catches [src] out of the air!")
- else
- L.visible_message("[src] bounces off of [L], as if repelled by an unseen force!")
- else if(!..())
- if(!L.anti_magic_check())
- L.Paralyze(30)
- if(D?.thrower)
- for(var/mob/living/Next in orange(2, T))
- if(!Next.density || iscultist(Next))
- continue
- throw_at(Next, 3, 1, D.thrower)
- return
- throw_at(D.thrower, 7, 1, null)
- else
- ..()
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
deleted file mode 100644
index 60816a90d45..00000000000
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ /dev/null
@@ -1,295 +0,0 @@
-/obj/structure/destructible/cult
- density = TRUE
- anchored = TRUE
- icon = 'icons/obj/cult.dmi'
- light_power = 2
- var/cooldowntime = 0
- break_sound = 'sound/hallucinations/veryfar_noise.ogg'
- debris = list(/obj/item/stack/sheet/mineral/hidden/hellstone = 1)
-
-/obj/structure/destructible/cult/proc/conceal() //for spells that hide cult presence
- density = FALSE
- visible_message("[src] fades away.")
- invisibility = INVISIBILITY_OBSERVER
- alpha = 100 //To help ghosts distinguish hidden runes
- light_range = 0
- light_power = 0
- update_light()
- STOP_PROCESSING(SSfastprocess, src)
-
-/obj/structure/destructible/cult/proc/reveal() //for spells that reveal cult presence
- density = initial(density)
- invisibility = 0
- visible_message("[src] suddenly appears!")
- alpha = initial(alpha)
- light_range = initial(light_range)
- light_power = initial(light_power)
- update_light()
- START_PROCESSING(SSfastprocess, src)
-
-
-/obj/structure/destructible/cult/examine(mob/user)
- . = ..()
- . += "\The [src] is [anchored ? "":"not "]secured to the floor."
- if((iscultist(user) || isobserver(user)) && cooldowntime > world.time)
- . += "The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)]."
-
-/obj/structure/destructible/cult/examine_status(mob/user)
- if(iscultist(user) || isobserver(user))
- var/t_It = p_they(TRUE)
- var/t_is = p_are()
- return "[t_It] [t_is] at [round(obj_integrity * 100 / max_integrity)]% stability."
- return ..()
-
-/obj/structure/destructible/cult/attack_animal(mob/living/simple_animal/M)
- if(istype(M, /mob/living/simple_animal/hostile/construct/artificer))
- if(obj_integrity < max_integrity)
- M.changeNext_move(CLICK_CD_MELEE)
- obj_integrity = min(max_integrity, obj_integrity + 5)
- Beam(M, icon_state="sendbeam", time=4)
- M.visible_message("[M] repairs \the [src].", \
- "You repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.")
- else
- to_chat(M, "You cannot repair [src], as [p_theyre()] undamaged!")
- else
- ..()
-
-/obj/structure/destructible/cult/set_anchored(anchorvalue)
- . = ..()
- if(isnull(.))
- return
- update_appearance()
-
-/obj/structure/destructible/cult/update_icon_state()
- icon_state = "[initial(icon_state)][anchored ? null : "_off"]"
- return ..()
-
-/obj/structure/destructible/cult/attackby(obj/I, mob/user, params)
- if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user))
- set_anchored(!anchored)
- to_chat(user, "You [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor.")
- else
- return ..()
-
-/obj/structure/destructible/cult/proc/check_menu(mob/user)
- if(!istype(user))
- return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
- return FALSE
- return TRUE
-
-/obj/structure/destructible/cult/talisman
- name = "altar"
- desc = "A bloodstained altar dedicated to Nar'Sie."
- icon_state = "talismanaltar"
- break_message = "The altar shatters, leaving only the wailing of the damned!"
-
-/obj/structure/destructible/cult/talisman/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- if(!iscultist(user))
- to_chat(user, "You're pretty sure you know exactly what this is used for and you can't seem to touch it.")
- return
- if(!anchored)
- to_chat(user, "You need to anchor [src] to the floor with your dagger first.")
- return
- if(cooldowntime > world.time)
- to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].")
- return
- var/list/items = list(
- "Eldritch Whetstone" = image(icon = 'icons/obj/kitchen.dmi', icon_state = "cult_sharpener"),
- "Construct Shell" = image(icon = 'icons/obj/wizard.dmi', icon_state = "construct_cult"),
- "Flask of Unholy Water" = image(icon = 'icons/obj/drinks/drinks.dmi', icon_state = "holyflask")
- )
- var/choice = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
- var/list/pickedtype = list()
- switch(choice)
- if("Eldritch Whetstone")
- pickedtype += /obj/item/sharpener/cult
- if("Construct Shell")
- pickedtype += /obj/structure/constructshell
- if("Flask of Unholy Water")
- pickedtype += /obj/item/reagent_containers/glass/beaker/unholywater
- else
- return
- if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)
- cooldowntime = world.time + 2400
- for(var/N in pickedtype)
- new N(get_turf(src))
- to_chat(user, "You kneel before the altar and your faith is rewarded with the [choice]!")
-
-/obj/structure/destructible/cult/forge
- name = "daemon forge"
- desc = "A forge used in crafting the unholy weapons used by the armies of Nar'Sie."
- icon_state = "forge"
- light_range = 2
- light_color = LIGHT_COLOR_LAVA
- break_message = "The force breaks apart into shards with a howling scream!"
-
-/obj/structure/destructible/cult/forge/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- if(!iscultist(user))
- to_chat(user, "The heat radiating from [src] pushes you back.")
- return
- if(!anchored)
- to_chat(user, "You need to anchor [src] to the floor with your dagger first.")
- return
- if(cooldowntime > world.time)
- to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].")
- return
- var/list/items = list(
- "Shielded Robe" = image(icon = 'icons/obj/clothing/suits.dmi', icon_state = "cult_armor"),
- "Flagellant's Robe" = image(icon = 'icons/obj/clothing/suits.dmi', icon_state = "cultrobes"),
- "Mirror Shield" = image(icon = 'icons/obj/shields.dmi', icon_state = "mirror_shield")
- )
- var/choice = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
- var/list/pickedtype = list()
- switch(choice)
- if("Shielded Robe")
- pickedtype += /obj/item/clothing/suit/hooded/cultrobes/cult_shield
- if("Flagellant's Robe")
- pickedtype += /obj/item/clothing/suit/hooded/cultrobes/berserker
- if("Mirror Shield")
- pickedtype += /obj/item/shield/mirror
- else
- return
- if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)
- cooldowntime = world.time + 2400
- for(var/N in pickedtype)
- new N(get_turf(src))
- to_chat(user, "You work the forge as dark knowledge guides your hands, creating the [choice]!")
-
-
-
-/obj/structure/destructible/cult/pylon
- name = "pylon"
- desc = "A floating crystal that slowly heals those faithful to Nar'Sie."
- icon_state = "pylon"
- light_range = 1.5
- light_color = COLOR_SOFT_RED
- break_sound = 'sound/effects/glassbr2.ogg'
- break_message = "The blood-red crystal falls to the floor and shatters!"
- var/heal_delay = 25
- var/last_heal = 0
- var/corrupt_delay = 50
- var/last_corrupt = 0
-
-/obj/structure/destructible/cult/pylon/New()
- START_PROCESSING(SSfastprocess, src)
- ..()
-
-/obj/structure/destructible/cult/pylon/Destroy()
- STOP_PROCESSING(SSfastprocess, src)
- return ..()
-
-/obj/structure/destructible/cult/pylon/process()
- if(!anchored)
- return
- if(last_heal <= world.time)
- last_heal = world.time + heal_delay
- for(var/mob/living/L in range(5, src))
- if(iscultist(L) || isshade(L) || isconstruct(L))
- if(L.health != L.maxHealth)
- new /obj/effect/temp_visual/heal(get_turf(src), "#960000")
- if(ishuman(L))
- L.adjustBruteLoss(-1, 0)
- L.adjustFireLoss(-1, 0)
- L.updatehealth()
- if(isshade(L) || isconstruct(L))
- var/mob/living/simple_animal/M = L
- if(M.health < M.maxHealth)
- M.adjustHealth(-3)
- if(ishuman(L) && L.blood_volume < BLOOD_VOLUME_NORMAL)
- L.blood_volume += 1.0
- CHECK_TICK
- if(last_corrupt <= world.time)
- var/list/validturfs = list()
- var/list/cultturfs = list()
- for(var/T in circleviewturfs(src, 5))
- if(istype(T, /turf/open/floor/engine/cult))
- cultturfs |= T
- continue
- var/static/list/blacklisted_pylon_turfs = typecacheof(list(
- /turf/closed,
- /turf/open/floor/engine/cult,
- /turf/open/space,
- /turf/open/lava,
- /turf/open/chasm))
- if(is_type_in_typecache(T, blacklisted_pylon_turfs))
- continue
- else
- validturfs |= T
-
- last_corrupt = world.time + corrupt_delay
-
- if(length(validturfs))
- var/turf/T = pick(validturfs)
- if(istype(T, /turf/open/floor/plating))
- T.PlaceOnTop(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
- else
- T.ChangeTurf(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
- else if (length(cultturfs))
- var/turf/open/floor/engine/cult/F = pick(cultturfs)
- new /obj/effect/temp_visual/cult/turf/floor(F)
- else
- // Are we in space or something? No cult turfs or
- // convertable turfs?
- last_corrupt = world.time + corrupt_delay*2
-
-/obj/structure/destructible/cult/tome
- name = "archives"
- desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl."
- icon_state = "tomealtar"
- light_range = 1.5
- light_color = LIGHT_COLOR_FIRE
- break_message = "The books and tomes of the archives burn into ash as the desk shatters!"
-
-/obj/structure/destructible/cult/tome/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- if(!iscultist(user))
- to_chat(user, "These books won't open and it hurts to even try and read the covers.")
- return
- if(!anchored)
- to_chat(user, "You need to anchor [src] to the floor with your dagger first.")
- return
- if(cooldowntime > world.time)
- to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].")
- return
- var/list/items = list(
- "Zealot's Blindfold" = image(icon = 'icons/obj/clothing/glasses.dmi', icon_state = "blindfold"),
- "Veil Walker Set" = image(icon = 'icons/obj/cult.dmi', icon_state = "shifter")
- )
- var/choice = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
- var/list/pickedtype = list()
- switch(choice)
- if("Zealot's Blindfold")
- pickedtype += /obj/item/clothing/glasses/hud/health/night/cultblind
- if("Veil Walker Set")
- pickedtype += /obj/item/cult_shift
- pickedtype += /obj/item/flashlight/flare/culttorch
- else
- return
- if(src && !QDELETED(src) && anchored && pickedtype.len && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)
- cooldowntime = world.time + 2400
- for(var/N in pickedtype)
- new N(get_turf(src))
- to_chat(user, "You summon the [choice] from the archives!")
-
-/obj/effect/gateway
- name = "gateway"
- desc = "You're pretty sure that abyss is staring back."
- icon = 'icons/obj/cult.dmi'
- icon_state = "hole"
- density = TRUE
- anchored = TRUE
-
-/obj/effect/gateway/singularity_act()
- return
-
-/obj/effect/gateway/singularity_pull()
- return
diff --git a/code/modules/antagonists/cult/cult_turf_overlay.dm b/code/modules/antagonists/cult/cult_turf_overlay.dm
deleted file mode 100644
index 2e950326bf8..00000000000
--- a/code/modules/antagonists/cult/cult_turf_overlay.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-//an "overlay" used by clockwork walls and floors to appear normal to mesons.
-/obj/effect/cult_turf/overlay
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- var/atom/linked
-
-/obj/effect/cult_turf/overlay/examine(mob/user)
- if(linked)
- linked.examine(user)
-
-/obj/effect/cult_turf/overlay/ex_act()
- return FALSE
-
-/obj/effect/cult_turf/overlay/singularity_act()
- return
-/obj/effect/cult_turf/overlay/singularity_pull()
- return
-
-/obj/effect/cult_turf/overlay/singularity_pull(S, current_size)
- return
-
-/obj/effect/cult_turf/overlay/Destroy()
- if(linked)
- linked = null
- . = ..()
-
-/obj/effect/cult_turf/overlay/floor
- icon = 'icons/turf/floors.dmi'
- icon_state = "clockwork_floor"
- layer = TURF_LAYER
-
-/obj/effect/cult_turf/overlay/floor/bloodcult
- icon_state = "cult"
diff --git a/code/modules/antagonists/cult/ritual.dm b/code/modules/antagonists/cult/ritual.dm
deleted file mode 100644
index 1ea84bd83a1..00000000000
--- a/code/modules/antagonists/cult/ritual.dm
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-
-This file contains the cult dagger and rune list code
-
-*/
-
-
-/obj/item/melee/cultblade/dagger/Initialize()
- . = ..()
- if(!LAZYLEN(GLOB.rune_types))
- GLOB.rune_types = list()
- var/static/list/non_revealed_runes = (subtypesof(/obj/effect/rune) - /obj/effect/rune/malformed)
- for(var/i_can_do_loops_now_thanks_remie in non_revealed_runes)
- var/obj/effect/rune/R = i_can_do_loops_now_thanks_remie
- GLOB.rune_types[initial(R.cultist_name)] = R //Uses the cultist name for displaying purposes
-
-/obj/item/melee/cultblade/dagger/examine(mob/user)
- . = ..()
- if(iscultist(user) || isobserver(user))
- . += {"The scriptures of the Geometer. Allows the scribing of runes and access to the knowledge archives of the cult of Nar'Sie.\n
- Striking a cult structure will unanchor or reanchor it.\n
- Striking another cultist with it will purge holy water from them.\n
- Striking a noncultist, however, will tear their flesh."}
-
-/obj/item/melee/cultblade/dagger/attack(mob/living/M, mob/living/user)
- if(iscultist(M))
- if(M.reagents && M.reagents.has_reagent(/datum/reagent/water/holywater)) //allows cultists to be rescued from the clutches of ordained religion
- to_chat(user, "You remove the taint from [M]." )
- var/holy2unholy = M.reagents.get_reagent_amount(/datum/reagent/water/holywater)
- M.reagents.del_reagent(/datum/reagent/water/holywater)
- M.reagents.add_reagent(/datum/reagent/fuel/unholywater,holy2unholy)
- log_combat(user, M, "smacked", src, " removing the holy water from them")
- return FALSE
- . = ..()
-
-/obj/item/melee/cultblade/dagger/attack_self(mob/user)
- if(!iscultist(user))
- to_chat(user, "[src] is covered in unintelligible shapes and markings.")
- return
- scribe_rune(user)
-
-/obj/item/melee/cultblade/dagger/proc/scribe_rune(mob/living/user)
- if(drawing_rune)
- return
- drawing_rune = TRUE
- scribe_rune_attempt(user)
- drawing_rune = FALSE
-
-/obj/item/melee/cultblade/dagger/proc/scribe_rune_attempt(mob/living/user)
- var/turf/Turf = get_turf(user)
- var/chosen_keyword
- var/obj/effect/rune/rune_to_scribe
- var/entered_rune_name
- var/list/shields = list()
- var/area/A = get_area(src)
- var/datum/antagonist/cult/user_antag = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(!user_antag)
- return
- if(!check_rune_turf(Turf, user))
- return
- entered_rune_name = input(user, "Choose a rite to scribe.", "Sigils of Power") as null|anything in GLOB.rune_types
- if(!src || QDELETED(src) || !Adjacent(user) || user.incapacitated() || !check_rune_turf(Turf, user))
- return
- rune_to_scribe = GLOB.rune_types[entered_rune_name]
- if(!rune_to_scribe)
- return
- if(initial(rune_to_scribe.req_keyword))
- chosen_keyword = stripped_input(user, "Enter a keyword for the new rune.", "Words of Power")
- if(!chosen_keyword)
- drawing_rune = FALSE
- scribe_rune(user) //Go back a menu!
- return
- Turf = get_turf(user) //we may have moved. adjust as needed...
- A = get_area(src)
- if(!src || QDELETED(src) || !Adjacent(user) || user.incapacitated() || !check_rune_turf(Turf, user))
- return
- if(ispath(rune_to_scribe, /obj/effect/rune/summon) && initial(A.name) == "Space")
- to_chat(user, "The veil is not weak enough here to summon a cultist!")
- return
- if(ispath(rune_to_scribe, /obj/effect/rune/apocalypse))
- if((world.time - SSticker.round_start_time) <= 6000)
- var/wait = 6000 - (world.time - SSticker.round_start_time)
- to_chat(user, "The veil is not yet weak enough for this rune - it will be available in [DisplayTimeText(wait)].")
- return
- var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives
- if(!(A in summon_objective.summon_spots))
- to_chat(user, "The Apocalypse rune will remove a ritual site (where Nar'Sie can be summoned), it can only be scribed in [english_list(summon_objective.summon_spots)]!")
- return
- if(summon_objective.summon_spots.len < 2)
- to_chat(user, "Only one ritual site remains - it must be reserved for the final summoning!")
- return
- if(ispath(rune_to_scribe, /obj/effect/rune/narsie))
- var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives
- var/datum/objective/sacrifice/sac_objective = locate() in user_antag.cult_team.objectives
- if(!summon_objective)
- to_chat(user, "Nar'Sie does not wish to be summoned!")
- return
- if(sac_objective && !sac_objective.check_completion())
- to_chat(user, "The sacrifice is not complete. The portal would lack the power to open if you tried!")
- return
- if(summon_objective.check_completion())
- to_chat(user, "\"I am already here. There is no need to try to summon me now.\"")
- return
- if(!(A in summon_objective.summon_spots))
- to_chat(user, "The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!")
- return
- var/confirm_final = alert(user, "This is the FINAL step to summon Nar'Sie; it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar'Sie!", "No")
- if(confirm_final == "No")
- to_chat(user, "You decide to prepare further before scribing the rune.")
- return
- Turf = get_turf(user)
- A = get_area(src)
- if(!(A in summon_objective.summon_spots)) // Check again to make sure they didn't move
- to_chat(user, "The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!")
- return
- priority_announce("Figments from an eldritch god are being summoned by [user] into [initial(A.name)] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensional Affairs", 'sound/ai/spanomalies.ogg')
- for(var/B in spiral_range_turfs(1, user, 1))
- var/obj/structure/emergency_shield/sanguine/N = new(B)
- shields += N
- user.visible_message(
- "[user] [user.blood_volume ? "cuts open [user.p_their()] arm and begins writing in [user.p_their()] own blood":"begins sketching out a strange design"]!", \
- "You [user.blood_volume ? "slice open your arm and ":""]begin drawing a sigil of the Geometer.")
- if(user.blood_volume)
- user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
- var/scribe_mod = initial(rune_to_scribe.scribe_delay)
- if(istype(get_turf(user), /turf/open/floor/engine/cult) && !(ispath(rune_to_scribe, /obj/effect/rune/narsie)))
- scribe_mod *= 0.5
- if(!do_after(user, scribe_mod, target = get_turf(user)))
- for(var/V in shields)
- var/obj/structure/emergency_shield/sanguine/S = V
- if(S && !QDELETED(S))
- qdel(S)
- return
- if(!check_rune_turf(Turf, user))
- return
- user.visible_message(
- "[user] creates a strange circle[user.blood_volume ? " in [user.p_their()] own blood":""].", \
- "You finish drawing the arcane markings of the Geometer.")
- for(var/V in shields)
- var/obj/structure/emergency_shield/S = V
- if(S && !QDELETED(S))
- qdel(S)
- var/obj/effect/rune/R = new rune_to_scribe(Turf, chosen_keyword)
- R.add_mob_blood(user)
- to_chat(user, "The [lowertext(R.cultist_name)] rune [R.cultist_desc]")
- SSblackbox.record_feedback("tally", "cult_runes_scribed", 1, R.cultist_name)
-
-/obj/item/melee/cultblade/dagger/proc/check_rune_turf(turf/T, mob/user)
- if(isspaceturf(T))
- to_chat(user, "You cannot scribe runes in space!")
- return FALSE
- if(locate(/obj/effect/rune) in T)
- to_chat(user, "There is already a rune here.")
- return FALSE
- return TRUE
diff --git a/code/modules/antagonists/cult/rune_spawn_action.dm b/code/modules/antagonists/cult/rune_spawn_action.dm
deleted file mode 100644
index 2829141405d..00000000000
--- a/code/modules/antagonists/cult/rune_spawn_action.dm
+++ /dev/null
@@ -1,115 +0,0 @@
-//after a delay, creates a rune below you. for constructs creating runes.
-/datum/action/innate/cult/create_rune
- name = "Summon Rune"
- desc = "Summons a rune"
- background_icon_state = "bg_demon"
- var/obj/effect/rune/rune_type
- var/cooldown = 0
- var/base_cooldown = 1800
- var/scribe_time = 60
- var/damage_interrupt = TRUE
- var/action_interrupt = TRUE
- var/obj/effect/temp_visual/cult/rune_spawn/rune_word_type
- var/obj/effect/temp_visual/cult/rune_spawn/rune_innerring_type
- var/obj/effect/temp_visual/cult/rune_spawn/rune_center_type
- var/rune_color
-
-/datum/action/innate/cult/create_rune/IsAvailable()
- if(!rune_type || cooldown > world.time)
- return FALSE
- return ..()
-
-/datum/action/innate/cult/create_rune/proc/turf_check(turf/T)
- if(!T)
- return FALSE
- if(isspaceturf(T))
- to_chat(owner, "You cannot scribe runes in space!")
- return FALSE
- if(locate(/obj/effect/rune) in T)
- to_chat(owner, "There is already a rune here.")
- return FALSE
- return TRUE
-
-
-/datum/action/innate/cult/create_rune/Activate()
- var/turf/T = get_turf(owner)
- if(turf_check(T))
- var/chosen_keyword
- if(initial(rune_type.req_keyword))
- chosen_keyword = stripped_input(owner, "Enter a keyword for the new rune.", "Words of Power")
- if(!chosen_keyword)
- return
- //the outer ring is always the same across all runes
- var/obj/effect/temp_visual/cult/rune_spawn/R1 = new(T, scribe_time, rune_color)
- //the rest are not always the same, so we need types for em
- var/obj/effect/temp_visual/cult/rune_spawn/R2
- if(rune_word_type)
- R2 = new rune_word_type(T, scribe_time, rune_color)
- var/obj/effect/temp_visual/cult/rune_spawn/R3
- if(rune_innerring_type)
- R3 = new rune_innerring_type(T, scribe_time, rune_color)
- var/obj/effect/temp_visual/cult/rune_spawn/R4
- if(rune_center_type)
- R4 = new rune_center_type(T, scribe_time, rune_color)
-
- cooldown = base_cooldown + world.time
- owner.update_action_buttons_icon()
- addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), base_cooldown)
- var/list/health
- if(damage_interrupt && isliving(owner))
- var/mob/living/L = owner
- health = list("health" = L.health)
- var/scribe_mod = scribe_time
- if(istype(T, /turf/open/floor/engine/cult))
- scribe_mod *= 0.5
- playsound(T, 'sound/magic/enter_blood.ogg', 100, FALSE)
- if(do_after(owner, scribe_mod, target = owner, extra_checks = CALLBACK(owner, TYPE_PROC_REF(/mob, break_do_after_checks), health, action_interrupt)))
- var/obj/effect/rune/new_rune = new rune_type(owner.loc)
- new_rune.keyword = chosen_keyword
- else
- qdel(R1)
- if(R2)
- qdel(R2)
- if(R3)
- qdel(R3)
- if(R4)
- qdel(R4)
- cooldown = 0
- owner.update_action_buttons_icon()
-
-//teleport rune
-/datum/action/innate/cult/create_rune/tele
- name = "Summon Teleport Rune"
- desc = "Summons a teleport rune to your location, as though it has been there all along..."
- button_icon_state = "telerune"
- rune_type = /obj/effect/rune/teleport
- rune_word_type = /obj/effect/temp_visual/cult/rune_spawn/rune2
- rune_innerring_type = /obj/effect/temp_visual/cult/rune_spawn/rune2/inner
- rune_center_type = /obj/effect/temp_visual/cult/rune_spawn/rune2/center
- rune_color = RUNE_COLOR_TELEPORT
-
-/datum/action/innate/cult/create_rune/wall
- name = "Summon Barrier Rune"
- desc = "Summons an active barrier rune to your location, as though it has been there all along..."
- button_icon_state = "barrier"
- rune_type = /obj/effect/rune/wall
- rune_word_type = /obj/effect/temp_visual/cult/rune_spawn/rune4
- rune_innerring_type = /obj/effect/temp_visual/cult/rune_spawn/rune4/inner
- rune_center_type = /obj/effect/temp_visual/cult/rune_spawn/rune4/center
- rune_color = RUNE_COLOR_DARKRED
-
-/datum/action/innate/cult/create_rune/wall/Activate()
- . = ..()
- var/obj/effect/rune/wall/W = locate(/obj/effect/rune/wall) in owner.loc
- if(W)
- W.spread_density()
-
-/datum/action/innate/cult/create_rune/revive
- name = "Summon Revive Rune"
- desc = "Summons a revive rune to your location, as though it has been there all along..."
- button_icon_state = "revive"
- rune_type = /obj/effect/rune/raise_dead
- rune_word_type = /obj/effect/temp_visual/cult/rune_spawn/rune1
- rune_innerring_type = /obj/effect/temp_visual/cult/rune_spawn/rune1/inner
- rune_center_type = /obj/effect/temp_visual/cult/rune_spawn/rune1/center
- rune_color = RUNE_COLOR_MEDIUMRED
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
deleted file mode 100644
index 5058dc73f08..00000000000
--- a/code/modules/antagonists/cult/runes.dm
+++ /dev/null
@@ -1,1046 +0,0 @@
-GLOBAL_LIST_EMPTY(sacrificed) //a mixed list of minds and mobs
-GLOBAL_LIST(rune_types) //Every rune that can be drawn by ritual daggers
-GLOBAL_LIST_EMPTY(teleport_runes)
-GLOBAL_LIST_EMPTY(wall_runes)
-/*
-
-This file contains runes.
-Runes are used by the cult to cause many different effects and are paramount to their success.
-They are drawn with a ritual dagger in blood, and are distinguishable to cultists and normal crew by examining.
-Fake runes can be drawn in crayon to fool people.
-Runes can either be invoked by one's self or with many different cultists. Each rune has a specific incantation that the cultists will say when invoking it.
-
-
-*/
-
-/obj/effect/rune
- name = "rune"
- var/cultist_name = "basic rune"
- desc = "An odd collection of symbols drawn in what seems to be blood."
- var/cultist_desc = "a basic rune with no function." //This is shown to cultists who examine the rune in order to determine its true purpose.
- anchored = TRUE
- icon = 'icons/obj/rune.dmi'
- icon_state = "1"
- resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
- layer = SIGIL_LAYER
- color = RUNE_COLOR_RED
-
- var/invocation = "Aiy ele-mayo!" //This is said by cultists when the rune is invoked.
- var/req_cultists = 1 //The amount of cultists required around the rune to invoke it. If only 1, any cultist can invoke it.
- var/req_cultists_text //if we have a description override for required cultists to invoke
- var/rune_in_use = FALSE // Used for some runes, this is for when you want a rune to not be usable when in use.
-
- var/scribe_delay = 40 //how long the rune takes to create
- var/scribe_damage = 0.1 //how much damage you take doing it
- var/invoke_damage = 0 //how much damage invokers take when invoking it
- var/construct_invoke = TRUE //if constructs can invoke it
-
- var/req_keyword = 0 //If the rune requires a keyword - go figure amirite
- var/keyword //The actual keyword for the rune
-
-/obj/effect/rune/Initialize(mapload, set_keyword)
- . = ..()
- if(set_keyword)
- keyword = set_keyword
- var/image/I = image(icon = 'icons/effects/blood.dmi', icon_state = null, loc = src)
- I.override = TRUE
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "cult_runes", I)
-
-/obj/effect/rune/examine(mob/user)
- . = ..()
- if(iscultist(user) || user.stat == DEAD) //If they're a cultist or a ghost, tell them the effects
- . += "Name: [cultist_name]\n"+\
- "Effects: [capitalize(cultist_desc)]\n"+\
- "Required Acolytes: [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]"
- if(req_keyword && keyword)
- . += "Keyword: [keyword]"
-
-/obj/effect/rune/attackby(obj/I, mob/user, params)
- if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user))
- SEND_SOUND(user,'sound/items/sheath.ogg')
- if(do_after(user, 15, target = src))
- to_chat(user, "You carefully erase the [lowertext(cultist_name)] rune.")
- qdel(src)
-
-/obj/effect/rune/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- if(!iscultist(user))
- to_chat(user, "You aren't able to understand the words of [src].")
- return
- var/list/invokers = can_invoke(user)
- if(invokers.len >= req_cultists)
- invoke(invokers)
- else
- to_chat(user, "You need [req_cultists - invokers.len] more adjacent cultists to use this rune in such a manner.")
- fail_invoke()
-
-/obj/effect/rune/attack_animal(mob/living/simple_animal/M)
- if(istype(M, /mob/living/simple_animal/shade) || istype(M, /mob/living/simple_animal/hostile/construct))
- if(istype(M, /mob/living/simple_animal/hostile/construct/wraith/angelic) || istype(M, /mob/living/simple_animal/hostile/construct/juggernaut/angelic) || istype(M, /mob/living/simple_animal/hostile/construct/artificer/angelic))
- to_chat(M, "You purge the rune!")
- qdel(src)
- else if(construct_invoke || !iscultist(M)) //if you're not a cult construct we want the normal fail message
- attack_hand(M)
- else
- to_chat(M, "You are unable to invoke the rune!")
-
-/obj/effect/rune/proc/conceal() //for talisman of revealing/hiding
- visible_message("[src] fades away.")
- invisibility = INVISIBILITY_OBSERVER
- alpha = 100 //To help ghosts distinguish hidden runes
-
-/obj/effect/rune/proc/reveal() //for talisman of revealing/hiding
- invisibility = 0
- visible_message("[src] suddenly appears!")
- alpha = initial(alpha)
-
-/*
-
-There are a few different procs each rune runs through when a cultist activates it.
-can_invoke() is called when a cultist activates the rune with an empty hand. If there are multiple cultists, this rune determines if the required amount is nearby.
-invoke() is the rune's actual effects.
-fail_invoke() is called when the rune fails, via not enough people around or otherwise. Typically this just has a generic 'fizzle' effect.
-structure_check() searches for nearby cultist structures required for the invocation. Proper structures are pylons, forges, archives, and altars.
-
-*/
-
-/obj/effect/rune/proc/can_invoke(mob/living/user=null)
- //This proc determines if the rune can be invoked at the time. If there are multiple required cultists, it will find all nearby cultists.
- var/list/invokers = list() //people eligible to invoke the rune
- if(user)
- invokers += user
- if(req_cultists > 1 || istype(src, /obj/effect/rune/convert))
- var/list/things_in_range = range(1, src)
- for(var/mob/living/L in things_in_range)
- if(iscultist(L))
- if(L == user)
- continue
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- if((HAS_TRAIT(H, TRAIT_MUTE)) || H.silent)
- continue
- if(L.stat)
- continue
- invokers += L
- return invokers
-
-/obj/effect/rune/proc/invoke(list/invokers)
- //This proc contains the effects of the rune as well as things that happen afterwards. If you want it to spawn an object and then delete itself, have both here.
- for(var/M in invokers)
- if(isliving(M))
- var/mob/living/L = M
- if(invocation)
- L.say(invocation, language = /datum/language/common, ignore_spam = TRUE, forced = "cult invocation")
- if(invoke_damage)
- L.apply_damage(invoke_damage, BRUTE)
- to_chat(L, "[src] saps your strength!")
- else if(istype(M, /obj/item/toy/plush/narplush))
- var/obj/item/toy/plush/narplush/P = M
- P.visible_message("[P] squeaks loudly!")
- do_invoke_glow()
-
-/obj/effect/rune/proc/do_invoke_glow()
- set waitfor = FALSE
- animate(src, transform = matrix()*2, alpha = 0, time = 5, flags = ANIMATION_END_NOW) //fade out
- sleep(5)
- animate(src, transform = matrix(), alpha = 255, time = 0, flags = ANIMATION_END_NOW)
-
-/obj/effect/rune/proc/fail_invoke()
- //This proc contains the effects of a rune if it is not invoked correctly, through either invalid wording or not enough cultists. By default, it's just a basic fizzle.
- visible_message("The markings pulse with a small flash of red light, then fall dark.")
- var/oldcolor = color
- color = rgb(255, 0, 0)
- animate(src, color = oldcolor, time = 5)
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 5)
-
-//Malformed Rune: This forms if a rune is not drawn correctly. Invoking it does nothing but hurt the user.
-/obj/effect/rune/malformed
- cultist_name = "malformed rune"
- cultist_desc = "a senseless rune written in gibberish. No good can come from invoking this."
- invocation = "Ra'sha yoka!"
- invoke_damage = 30
-
-/obj/effect/rune/malformed/Initialize(mapload, set_keyword)
- . = ..()
- icon_state = "[rand(1,7)]"
- color = rgb(rand(0,255), rand(0,255), rand(0,255))
-
-/obj/effect/rune/malformed/invoke(list/invokers)
- ..()
- qdel(src)
-
-//Rite of Offering: Converts or sacrifices a target.
-/obj/effect/rune/convert
- cultist_name = "Offer"
- cultist_desc = "offers a noncultist above it to Nar'Sie, either converting them or sacrificing them."
- req_cultists_text = "2 for conversion, 3 for living sacrifices and sacrifice targets."
- invocation = "Mah'weyh pleggh at e'ntrath!"
- icon_state = "3"
- color = RUNE_COLOR_OFFER
- req_cultists = 1
- rune_in_use = FALSE
-
-/obj/effect/rune/convert/do_invoke_glow()
- return
-
-/obj/effect/rune/convert/invoke(list/invokers)
- if(rune_in_use)
- return
- var/list/myriad_targets = list()
- var/turf/T = get_turf(src)
- for(var/mob/living/M in T)
- if(!iscultist(M))
- myriad_targets |= M
- if(!myriad_targets.len)
- fail_invoke()
- log_game("Offer rune failed - no eligible targets")
- return
- rune_in_use = TRUE
- visible_message("[src] pulses blood red!")
- var/oldcolor = color
- color = RUNE_COLOR_DARKRED
- var/mob/living/L = pick(myriad_targets)
-
- var/mob/living/F = invokers[1]
- var/datum/antagonist/cult/C = F.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- var/datum/team/cult/Cult_team = C.cult_team
- var/is_convertable = is_convertable_to_cult(L,C.cult_team)
- if(L.stat != DEAD && is_convertable)
- invocation = "Mah'weyh pleggh at e'ntrath!"
- ..()
- if(is_convertable)
- do_convert(L, invokers)
- else
- invocation = "Barhah hra zar'garis!"
- ..()
- do_sacrifice(L, invokers)
- animate(src, color = oldcolor, time = 5)
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_atom_colour)), 5)
- Cult_team.check_size() // Triggers the eye glow or aura effects if the cult has grown large enough relative to the crew
- rune_in_use = FALSE
-
-/obj/effect/rune/convert/proc/do_convert(mob/living/convertee, list/invokers)
- if(invokers.len < 2)
- for(var/M in invokers)
- to_chat(M, "You need at least two invokers to convert [convertee]!")
- log_game("Offer rune failed - tried conversion with one invoker")
- return 0
- if(convertee.anti_magic_check(TRUE, TRUE, FALSE, 0)) //Not chargecost because it can be spammed
- for(var/M in invokers)
- to_chat(M, "Something is shielding [convertee]'s mind!")
- log_game("Offer rune failed - convertee had anti-magic")
- return 0
- var/brutedamage = convertee.getBruteLoss()
- var/burndamage = convertee.getFireLoss()
- if(brutedamage || burndamage)
- convertee.adjustBruteLoss(-(brutedamage * 0.75))
- convertee.adjustFireLoss(-(burndamage * 0.75))
- convertee.visible_message(
- "[convertee] writhes in pain [brutedamage || burndamage ? "even as [convertee.p_their()] wounds heal and close" : "as the markings below [convertee.p_them()] glow a bloody red"]!", // Hello there buddy! Come here often? I hope you were wondering wtf this string was
- "AAAAAAAAAAAAAA-")
- SSticker.mode.add_cultist(convertee.mind, 1)
- new /obj/item/melee/cultblade/dagger(get_turf(src))
- convertee.mind.special_role = ROLE_CULTIST
- to_chat(convertee, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \
- and something evil takes root.")
- to_chat(convertee, "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve the Geometer above all else. Bring it back.\
- ")
- if(ishuman(convertee))
- var/mob/living/carbon/human/H = convertee
- H.uncuff()
- H.stuttering = 0
- H.cultslurring = 0
- if(prob(1) || SSevents.holidays && SSevents.holidays[APRIL_FOOLS])
- H.say("You son of a bitch! I'm in.", forced = "That son of a bitch! They're in.")
- return 1
-
-/obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers)
- var/mob/living/first_invoker = invokers[1]
- if(!first_invoker)
- return FALSE
- var/datum/antagonist/cult/C = first_invoker.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(!C)
- return
-
-
- var/big_sac = FALSE
- if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3)
- for(var/M in invokers)
- to_chat(M, "[sacrificial] is too greatly linked to the world! You need three acolytes!")
- log_game("Offer rune failed - not enough acolytes and target is living or sac target")
- return FALSE
- if(sacrificial.mind)
- GLOB.sacrificed += sacrificial.mind
- for(var/datum/objective/sacrifice/sac_objective in C.cult_team.objectives)
- if(sac_objective.target == sacrificial.mind)
- sac_objective.sacced = TRUE
- sac_objective.update_explanation_text()
- big_sac = TRUE
- else
- GLOB.sacrificed += sacrificial
-
- new /obj/effect/temp_visual/cult/sac(get_turf(src))
- for(var/M in invokers)
- if(big_sac)
- to_chat(M, "\"Yes! This is the one I desire! You have done well.\"")
- else
- if(ishuman(sacrificial) || iscyborg(sacrificial))
- to_chat(M, "\"I accept this sacrifice.\"")
- else
- to_chat(M, "\"I accept this meager sacrifice.\"")
-
- var/obj/item/soulstone/stone = new /obj/item/soulstone(get_turf(src))
- if(sacrificial.mind)
- stone.invisibility = INVISIBILITY_MAXIMUM //so it's not picked up during transfer_soul()
- stone.transfer_soul("FORCE", sacrificial, usr)
- stone.invisibility = 0
-
- if(sacrificial)
- if(iscyborg(sacrificial))
- playsound(sacrificial, 'sound/magic/disable_tech.ogg', 100, TRUE)
- sacrificial.dust() //To prevent the MMI from remaining
- else
- playsound(sacrificial, 'sound/magic/disintegrate.ogg', 100, TRUE)
- sacrificial.gib()
- return TRUE
-
-
-
-/obj/effect/rune/empower
- cultist_name = "Empower"
- cultist_desc = "allows cultists to prepare greater amounts of blood magic at far less of a cost."
- invocation = "H'drak v'loso, mir'kanas verbot!"
- icon_state = "3"
- color = RUNE_COLOR_TALISMAN
- construct_invoke = FALSE
-
-/obj/effect/rune/empower/invoke(list/invokers)
- . = ..()
- var/mob/living/user = invokers[1] //the first invoker is always the user
- for(var/datum/action/innate/cult/blood_magic/BM in user.actions)
- BM.Activate()
-
-/obj/effect/rune/teleport
- cultist_name = "Teleport"
- cultist_desc = "warps everything above it to another chosen teleport rune."
- invocation = "Sas'so c'arta forbici!"
- icon_state = "2"
- color = RUNE_COLOR_TELEPORT
- req_keyword = TRUE
- light_power = 4
- var/obj/effect/temp_visual/cult/portal/inner_portal //The portal "hint" for off-station teleportations
- var/obj/effect/temp_visual/cult/rune_spawn/rune2/outer_portal
- var/listkey
-
-
-/obj/effect/rune/teleport/Initialize(mapload, set_keyword)
- . = ..()
- var/area/A = get_area(src)
- var/locname = initial(A.name)
- listkey = set_keyword ? "[set_keyword] [locname]":"[locname]"
- GLOB.teleport_runes += src
-
-/obj/effect/rune/teleport/Destroy()
- GLOB.teleport_runes -= src
- return ..()
-
-/obj/effect/rune/teleport/invoke(list/invokers)
- var/mob/living/user = invokers[1] //the first invoker is always the user
- var/list/potential_runes = list()
- var/list/teleportnames = list()
- for(var/R in GLOB.teleport_runes)
- var/obj/effect/rune/teleport/T = R
- if(T != src && !is_away_level(T))
- potential_runes[avoid_assoc_duplicate_keys(T.listkey, teleportnames)] = T
-
- if(!potential_runes.len)
- to_chat(user, "There are no valid runes to teleport to!")
- log_game("Teleport rune failed - no other teleport runes")
- fail_invoke()
- return
-
- var/turf/T = get_turf(src)
- if(is_away_level(T))
- to_chat(user, "You are not in the right dimension!")
- log_game("Teleport rune failed - user in away mission")
- fail_invoke()
- return
-
- var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked
- var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to?
- if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated() || !actual_selected_rune)
- fail_invoke()
- return
-
- var/turf/target = get_turf(actual_selected_rune)
- if(target.is_blocked_turf(TRUE))
- to_chat(user, "The target rune is blocked. Attempting to teleport to it would be massively unwise.")
- fail_invoke()
- return
- var/movedsomething = FALSE
- var/moveuserlater = FALSE
- var/movesuccess = FALSE
- for(var/atom/movable/A in T)
- if(istype(A, /obj/effect/dummy/phased_mob))
- continue
- if(ismob(A))
- if(!isliving(A)) //Let's not teleport ghosts and AI eyes.
- continue
- if(ishuman(A))
- new /obj/effect/temp_visual/dir_setting/cult/phase/out(T, A.dir)
- new /obj/effect/temp_visual/dir_setting/cult/phase(target, A.dir)
- if(A == user)
- moveuserlater = TRUE
- movedsomething = TRUE
- continue
- if(!A.anchored)
- movedsomething = TRUE
- if(do_teleport(A, target, channel = TELEPORT_CHANNEL_CULT))
- movesuccess = TRUE
- if(movedsomething)
- ..()
- if(moveuserlater)
- if(do_teleport(user, target, channel = TELEPORT_CHANNEL_CULT))
- movesuccess = TRUE
- if(movesuccess)
- visible_message("There is a sharp crack of inrushing air, and everything above the rune disappears!", null, "You hear a sharp crack.")
- to_chat(user, "You[moveuserlater ? "r vision blurs, and you suddenly appear somewhere else":" send everything above the rune away"].")
- else
- to_chat(user, "You[moveuserlater ? "r vision blurs briefly, but nothing happens":" try send everything above the rune away, but the teleportation fails"].")
- var/area/A = get_area(T)
- if(initial(A.name) == "Space")
- actual_selected_rune.handle_portal("space", T)
- if(movesuccess)
- target.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "You hear a boom.")
- else
- fail_invoke()
-
-/obj/effect/rune/teleport/proc/handle_portal(portal_type, turf/origin)
- var/turf/T = get_turf(src)
- close_portal() // To avoid stacking descriptions/animations
- playsound(T, pick('sound/effects/sparks1.ogg', 'sound/effects/sparks2.ogg', 'sound/effects/sparks3.ogg', 'sound/effects/sparks4.ogg'), 100, TRUE, 14)
- inner_portal = new /obj/effect/temp_visual/cult/portal(T)
- if(portal_type == "space")
- set_light_color(color)
- desc += " A tear in reality reveals a black void interspersed with dots of light... something recently teleported here from space. The void feels like it's trying to pull you to the [dir2text(get_dir(T, origin))]!"
- else
- inner_portal.icon_state = "lava"
- set_light_color(LIGHT_COLOR_FIRE)
- desc += " A tear in reality reveals a coursing river of lava... something recently teleported here from the Lavaland Mines!"
- outer_portal = new(T, 600, color)
- light_range = 4
- update_light()
- addtimer(CALLBACK(src, PROC_REF(close_portal)), 600, TIMER_UNIQUE)
-
-/obj/effect/rune/teleport/proc/close_portal()
- qdel(inner_portal)
- qdel(outer_portal)
- desc = initial(desc)
- light_range = 0
- update_light()
-
-//Ritual of Dimensional Rending: Calls forth the avatar of Nar'Sie upon the station.
-/obj/effect/rune/narsie
- cultist_name = "Nar'Sie"
- cultist_desc = "tears apart dimensional barriers, calling forth the Geometer. Requires 9 invokers."
- invocation = "TOK-LYR RQA-NAP G'OLT-ULOFT!!"
- req_cultists = 9
- icon = 'icons/effects/96x96.dmi'
- color = RUNE_COLOR_DARKRED
- icon_state = "rune_large"
- pixel_x = -32 //So the big ol' 96x96 sprite shows up right
- pixel_y = -32
- scribe_delay = 500 //how long the rune takes to create
- scribe_damage = 40.1 //how much damage you take doing it
- var/used = FALSE
-
-/obj/effect/rune/narsie/Initialize(mapload, set_keyword)
- . = ..()
- GLOB.poi_list |= src
-
-/obj/effect/rune/narsie/Destroy()
- GLOB.poi_list -= src
- . = ..()
-
-/obj/effect/rune/narsie/conceal() //can't hide this, and you wouldn't want to
- return
-
-/obj/effect/rune/narsie/invoke(list/invokers)
- if(used)
- return
- var/mob/living/user = invokers[1]
- var/datum/antagonist/cult/user_antag = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives
- var/area/place = get_area(src)
- if(!(place in summon_objective.summon_spots))
- to_chat(user, "The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!")
- return
- if(locate(/obj/singularity/narsie) in GLOB.poi_list)
- for(var/M in invokers)
- to_chat(M, "Nar'Sie is already on this plane!")
- log_game("Nar'Sie rune failed - already summoned")
- return
- //BEGIN THE SUMMONING
- used = TRUE
- ..()
- sound_to_playing_players('sound/effects/dimensional_rend.ogg')
- var/turf/T = get_turf(src)
- sleep(40)
- if(src)
- color = RUNE_COLOR_RED
- new /obj/singularity/narsie/large/cult(T) //Causes Nar'Sie to spawn even if the rune has been removed
-
-/obj/effect/rune/narsie/attackby(obj/I, mob/user, params) //Since the narsie rune takes a long time to make, add logging to removal.
- if((istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user)))
- user.visible_message("[user.name] begins erasing [src]...", "You begin erasing [src]...")
- if(do_after(user, 50, target = src)) //Prevents accidental erasures.
- log_game("Summon Narsie rune erased by [key_name(user)] with [I.name]")
- message_admins("[ADMIN_LOOKUPFLW(user)] erased a Narsie rune with [I.name]")
- else
- ..()
-
-//Rite of Resurrection: Requires a dead or inactive cultist. When reviving the dead, you can only perform one revival for every three sacrifices your cult has carried out.
-/obj/effect/rune/raise_dead
- cultist_name = "Revive"
- cultist_desc = "requires a dead, mindless, or inactive cultist placed upon the rune. For each three bodies sacrificed to the dark patron, one body will be mended and their mind awoken"
- invocation = "Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!" //Depends on the name of the user - see below
- icon_state = "1"
- color = RUNE_COLOR_MEDIUMRED
- var/static/sacrifices_used = -SOULS_TO_REVIVE // Cultists get one "free" revive
-
-/obj/effect/rune/raise_dead/examine(mob/user)
- . = ..()
- if(iscultist(user) || user.stat == DEAD)
- . += "Sacrifices unrewarded: [LAZYLEN(GLOB.sacrificed) - sacrifices_used]"
-
-/obj/effect/rune/raise_dead/invoke(list/invokers)
- var/turf/T = get_turf(src)
- var/mob/living/mob_to_revive
- var/list/potential_revive_mobs = list()
- var/mob/living/user = invokers[1]
- if(rune_in_use)
- return
- rune_in_use = TRUE
- for(var/mob/living/M in T.contents)
- if(iscultist(M) && (M.stat == DEAD || !M.client || M.client.is_afk()))
- potential_revive_mobs |= M
- if(!potential_revive_mobs.len)
- to_chat(user, "There are no dead cultists on the rune!")
- log_game("Raise Dead rune failed - no cultists to revive")
- fail_invoke()
- return
- if(potential_revive_mobs.len > 1)
- mob_to_revive = input(user, "Choose a cultist to revive.", "Cultist to Revive") as null|anything in potential_revive_mobs
- else
- mob_to_revive = potential_revive_mobs[1]
- if(QDELETED(src) || !validness_checks(mob_to_revive, user))
- fail_invoke()
- return
- if(user.name == "Herbert West")
- invocation = "To life, to life, I bring them!"
- else
- invocation = initial(invocation)
- ..()
- if(mob_to_revive.stat == DEAD)
- var/diff = LAZYLEN(GLOB.sacrificed) - SOULS_TO_REVIVE - sacrifices_used
- if(diff < 0)
- to_chat(user, "Your cult must carry out [abs(diff)] more sacrifice\s before it can revive another cultist!")
- fail_invoke()
- return
- sacrifices_used += SOULS_TO_REVIVE
- mob_to_revive.revive(full_heal = TRUE, admin_revive = TRUE) //This does remove traits and such, but the rune might actually see some use because of it!
- mob_to_revive.grab_ghost()
- if(!mob_to_revive.client || mob_to_revive.client.is_afk())
- set waitfor = FALSE
- var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [mob_to_revive.name], an inactive blood cultist?", ROLE_CULTIST, null, ROLE_CULTIST, 50, mob_to_revive)
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- to_chat(mob_to_revive.mind, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form.")
- message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(mob_to_revive)]) to replace an AFK player.")
- mob_to_revive.ghostize(0)
- mob_to_revive.key = C.key
- else
- fail_invoke()
- return
- SEND_SOUND(mob_to_revive, 'sound/ambience/antag/bloodcult.ogg')
- to_chat(mob_to_revive, "\"PASNAR SAVRAE YAM'TOTH. Arise.\"")
- mob_to_revive.visible_message(
- "[mob_to_revive] draws in a huge breath, red light shining from [mob_to_revive.p_their()] eyes.", \
- "You awaken suddenly from the void. You're alive!")
- rune_in_use = FALSE
-
-/obj/effect/rune/raise_dead/proc/validness_checks(mob/living/target_mob, mob/living/user)
- var/turf/T = get_turf(src)
- if(QDELETED(user))
- return FALSE
- if(!Adjacent(user) || user.incapacitated())
- return FALSE
- if(QDELETED(target_mob))
- return FALSE
- if(!(target_mob in T.contents))
- to_chat(user, "The cultist to revive has been moved!")
- log_game("Raise Dead rune failed - revival target moved")
- return FALSE
- return TRUE
-
-/obj/effect/rune/raise_dead/fail_invoke()
- ..()
- rune_in_use = FALSE
- for(var/mob/living/M in range(1,src))
- if(iscultist(M) && M.stat == DEAD)
- M.visible_message("[M] twitches.")
-
-//Rite of the Corporeal Shield: When invoked, becomes solid and cannot be passed. Invoke again to undo.
-/obj/effect/rune/wall
- cultist_name = "Barrier"
- cultist_desc = "when invoked, makes a temporary invisible wall to block passage. Can be invoked again to reverse this."
- invocation = "Khari'd! Eske'te tannin!"
- icon_state = "4"
- color = RUNE_COLOR_DARKRED
- CanAtmosPass = ATMOS_PASS_DENSITY
- var/datum/timedevent/density_timer
- var/recharging = FALSE
-
-/obj/effect/rune/wall/Initialize(mapload, set_keyword)
- . = ..()
- GLOB.wall_runes += src
-
-/obj/effect/rune/wall/examine(mob/user)
- . = ..()
- if(density && iscultist(user))
- if(density_timer)
- . += "The air above this rune has hardened into a barrier that will last [DisplayTimeText(density_timer.timeToRun - world.time)]."
-
-/obj/effect/rune/wall/Destroy()
- GLOB.wall_runes -= src
- return ..()
-
-/obj/effect/rune/wall/BlockThermalConductivity()
- return density
-
-/obj/effect/rune/wall/invoke(list/invokers)
- if(recharging)
- return
- var/mob/living/user = invokers[1]
- ..()
- density = !density
- update_state()
- if(density)
- spread_density()
- var/carbon_user = iscarbon(user)
- user.visible_message(
- "[user] [carbon_user ? "places [user.p_their()] hands on":"stares intently at"] [src], and [density ? "the air above it begins to shimmer" : "the shimmer above it fades"].", \
- "You channel [carbon_user ? "your life ":""]energy into [src], [density ? "temporarily preventing" : "allowing"] passage above it.")
- if(carbon_user)
- var/mob/living/carbon/C = user
- C.apply_damage(2, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
-
-/obj/effect/rune/wall/proc/spread_density()
- for(var/R in GLOB.wall_runes)
- var/obj/effect/rune/wall/W = R
- if(W.virtual_z() == virtual_z() && get_dist(src, W) <= 2 && !W.density && !W.recharging)
- W.density = TRUE
- W.update_state()
- W.spread_density()
- density_timer = addtimer(CALLBACK(src, PROC_REF(lose_density)), 3000, TIMER_STOPPABLE)
-
-/obj/effect/rune/wall/proc/lose_density()
- if(density)
- recharging = TRUE
- density = FALSE
- update_state()
- var/oldcolor = color
- add_atom_colour("#696969", FIXED_COLOUR_PRIORITY)
- animate(src, color = oldcolor, time = 50, easing = EASE_IN)
- addtimer(CALLBACK(src, PROC_REF(recharge)), 50)
-
-/obj/effect/rune/wall/proc/recharge()
- recharging = FALSE
- add_atom_colour(RUNE_COLOR_MEDIUMRED, FIXED_COLOUR_PRIORITY)
-
-/obj/effect/rune/wall/proc/update_state()
- deltimer(density_timer)
- air_update_turf(TRUE)
- if(density)
- var/mutable_appearance/shimmer = mutable_appearance('icons/effects/effects.dmi', "barriershimmer", ABOVE_MOB_LAYER)
- shimmer.appearance_flags |= RESET_COLOR
- shimmer.alpha = 60
- shimmer.color = "#701414"
- add_overlay(shimmer)
- add_atom_colour(RUNE_COLOR_RED, FIXED_COLOUR_PRIORITY)
- else
- cut_overlays()
- add_atom_colour(RUNE_COLOR_MEDIUMRED, FIXED_COLOUR_PRIORITY)
-
-//Rite of Joined Souls: Summons a single cultist.
-/obj/effect/rune/summon
- cultist_name = "Summon Cultist"
- cultist_desc = "summons a single cultist to the rune. Requires 2 invokers."
- invocation = "N'ath reth sh'yro eth d'rekkathnor!"
- req_cultists = 2
- invoke_damage = 10
- icon_state = "3"
- color = RUNE_COLOR_SUMMON
-
-/obj/effect/rune/summon/invoke(list/invokers)
- var/mob/living/user = invokers[1]
- var/list/cultists = list()
- for(var/datum/mind/M in SSticker.mode.cult)
- if(!(M.current in invokers) && M.current && M.current.stat != DEAD)
- cultists |= M.current
- var/mob/living/cultist_to_summon = input(user, "Who do you wish to call to [src]?", "Followers of the Geometer") as null|anything in cultists
- if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated())
- return
- if(!cultist_to_summon)
- to_chat(user, "You require a summoning target!")
- fail_invoke()
- log_game("Summon Cultist rune failed - no target")
- return
- if(cultist_to_summon.stat == DEAD)
- to_chat(user, "[cultist_to_summon] has died!")
- fail_invoke()
- log_game("Summon Cultist rune failed - target died")
- return
- if(cultist_to_summon.pulledby || cultist_to_summon.buckled)
- to_chat(user, "[cultist_to_summon] is being held in place!")
- fail_invoke()
- log_game("Summon Cultist rune failed - target restrained")
- return
- if(!iscultist(cultist_to_summon))
- to_chat(user, "[cultist_to_summon] is not a follower of the Geometer!")
- fail_invoke()
- log_game("Summon Cultist rune failed - target was deconverted")
- return
- if(is_away_level(cultist_to_summon))
- to_chat(user, "[cultist_to_summon] is not in our dimension!")
- fail_invoke()
- log_game("Summon Cultist rune failed - target in away mission")
- return
- cultist_to_summon.visible_message(
- "[cultist_to_summon] suddenly disappears in a flash of red light!", \
- "Overwhelming vertigo consumes you as you are hurled through the air!")
- ..()
- visible_message("A foggy shape materializes atop [src] and solidifes into [cultist_to_summon]!")
- cultist_to_summon.forceMove(get_turf(src))
- qdel(src)
-
-//Rite of Boiling Blood: Deals extremely high amounts of damage to non-cultists nearby
-/obj/effect/rune/blood_boil
- cultist_name = "Boil Blood"
- cultist_desc = "boils the blood of non-believers who can see the rune, rapidly dealing extreme amounts of damage. Requires 3 invokers."
- invocation = "Dedo ol'btoh!"
- icon_state = "4"
- color = RUNE_COLOR_BURNTORANGE
- light_color = LIGHT_COLOR_LAVA
- req_cultists = 3
- invoke_damage = 10
- construct_invoke = FALSE
- var/tick_damage = 25
- rune_in_use = FALSE
-
-/obj/effect/rune/blood_boil/do_invoke_glow()
- return
-
-/obj/effect/rune/blood_boil/invoke(list/invokers)
- if(rune_in_use)
- return
- ..()
- rune_in_use = TRUE
- var/turf/T = get_turf(src)
- visible_message("[src] turns a bright, glowing orange!")
- color = "#FC9B54"
- set_light(6, 1, color)
- for(var/mob/living/L in viewers(T))
- if(!iscultist(L) && L.blood_volume)
- var/atom/I = L.anti_magic_check(chargecost = 0)
- if(I)
- if(isitem(I))
- to_chat(L, "[I] suddenly burns hotly before returning to normal!")
- continue
- to_chat(L, "Your blood boils in your veins!")
- animate(src, color = "#FCB56D", time = 4)
- sleep(4)
- if(QDELETED(src))
- return
- do_area_burn(T, 0.5)
- animate(src, color = "#FFDF80", time = 5)
- sleep(5)
- if(QDELETED(src))
- return
- do_area_burn(T, 1)
- animate(src, color = "#FFFDF4", time = 6)
- sleep(6)
- if(QDELETED(src))
- return
- do_area_burn(T, 1.5)
- new /obj/effect/hotspot(T)
- qdel(src)
-
-/obj/effect/rune/blood_boil/proc/do_area_burn(turf/T, multiplier)
- set_light(6, 1, color)
- for(var/mob/living/L in viewers(T))
- if(!iscultist(L) && L.blood_volume)
- if(L.anti_magic_check(chargecost = 0))
- continue
- L.take_overall_damage(tick_damage*multiplier, tick_damage*multiplier)
-
-//Rite of Spectral Manifestation: Summons a ghost on top of the rune as a cultist human with no items. User must stand on the rune at all times, and takes damage for each summoned ghost.
-/obj/effect/rune/manifest
- cultist_name = "Spirit Realm"
- cultist_desc = "manifests a spirit servant of the Geometer and allows you to ascend as a spirit yourself. The invoker must not move from atop the rune, and will take damage for each summoned spirit."
- invocation = "Gal'h'rfikk harfrandid mud'gib!" //how the fuck do you pronounce this
- icon_state = "7"
- invoke_damage = 10
- construct_invoke = FALSE
- color = RUNE_COLOR_DARKRED
- var/mob/living/affecting = null
- var/ghost_limit = 3
- var/ghosts = 0
-
-/obj/effect/rune/manifest/Initialize()
- . = ..()
-
-
-/obj/effect/rune/manifest/can_invoke(mob/living/user)
- if(!(user in get_turf(src)))
- to_chat(user, "You must be standing on [src]!")
- fail_invoke()
- log_game("Manifest rune failed - user not standing on rune")
- return list()
- if(user.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST))
- to_chat(user, "Ghosts can't summon more ghosts!")
- fail_invoke()
- log_game("Manifest rune failed - user is a ghost")
- return list()
- return ..()
-
-/obj/effect/rune/manifest/invoke(list/invokers)
- . = ..()
- var/mob/living/user = invokers[1]
- var/turf/T = get_turf(src)
- var/choice = alert(user,"You tear open a connection to the spirit realm...",,"Summon a Cult Ghost","Ascend as a Dark Spirit","Cancel")
- if(choice == "Summon a Cult Ghost")
- if(ghosts >= ghost_limit)
- to_chat(user, "You are sustaining too many ghosts to summon more!")
- fail_invoke()
- log_game("Manifest rune failed - too many summoned ghosts")
- return list()
- notify_ghosts("Manifest rune invoked in [get_area(src)].", 'sound/effects/ghost2.ogg', source = src, header = "Manifest rune")
- var/list/ghosts_on_rune = list()
- for(var/mob/dead/observer/O in T)
- if(O.client && !is_banned_from(O.ckey, ROLE_CULTIST) && !QDELETED(src) && !(isAdminObserver(O) && (O.client.prefs.toggles & ADMIN_IGNORE_CULT_GHOST)) && !QDELETED(O))
- ghosts_on_rune += O
- if(!ghosts_on_rune.len)
- to_chat(user, "There are no spirits near [src]!")
- fail_invoke()
- log_game("Manifest rune failed - no nearby ghosts")
- return list()
- var/mob/dead/observer/ghost_to_spawn = pick(ghosts_on_rune)
- var/mob/living/carbon/human/cult_ghost/new_human = new(T)
- new_human.real_name = ghost_to_spawn.real_name
- new_human.alpha = 150 //Makes them translucent
- new_human.equipOutfit(/datum/outfit/ghost_cultist) //give them armor
- new_human.apply_status_effect(STATUS_EFFECT_SUMMONEDGHOST) //ghosts can't summon more ghosts
- new_human.see_invisible = SEE_INVISIBLE_OBSERVER
- ghosts++
- playsound(src, 'sound/magic/exit_blood.ogg', 50, TRUE)
- visible_message("A cloud of red mist forms above [src], and from within steps... a [new_human.gender == FEMALE ? "wo":""]man.")
- to_chat(user, "Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...")
- var/obj/structure/emergency_shield/invoker/N = new(T)
- new_human.key = ghost_to_spawn.key
- SSticker.mode.add_cultist(new_human.mind, 0)
- to_chat(new_human, "You are a servant of the Geometer. You have been made semi-corporeal by the cult of Nar'Sie, and you are to serve them at all costs.")
-
- while(!QDELETED(src) && !QDELETED(user) && !QDELETED(new_human) && (user in T))
- if(user.stat != CONSCIOUS || HAS_TRAIT(new_human, TRAIT_CRITICAL_CONDITION))
- break
- user.apply_damage(0.1, BRUTE)
- sleep(1)
-
- qdel(N)
- ghosts--
- if(new_human)
- new_human.visible_message(
- "[new_human] suddenly dissolves into bones and ashes.", \
- "Your link to the world fades. Your form breaks apart.")
- for(var/obj/I in new_human)
- new_human.dropItemToGround(I, TRUE)
- new_human.dust()
- else if(choice == "Ascend as a Dark Spirit")
- affecting = user
- affecting.add_atom_colour(RUNE_COLOR_DARKRED, ADMIN_COLOUR_PRIORITY)
- affecting.visible_message(
- "[affecting] freezes statue-still, glowing an unearthly red.", \
- "You see what lies beyond. All is revealed. In this form you find that your voice booms louder and you can mark targets for the entire cult")
- var/mob/dead/observer/G = affecting.ghostize(1)
- var/datum/action/innate/cult/comm/spirit/CM = new
- var/datum/action/innate/cult/ghostmark/GM = new
- G.name = "Dark Spirit of [G.name]"
- G.color = "red"
- CM.Grant(G)
- GM.Grant(G)
- while(!QDELETED(affecting))
- if(!(affecting in T))
- user.visible_message("A spectral tendril wraps around [affecting] and pulls [affecting.p_them()] back to the rune!")
- Beam(affecting, icon_state="drainbeam", time=2)
- affecting.forceMove(get_turf(src)) //NO ESCAPE :^)
- if(affecting.key)
- affecting.visible_message(
- "[affecting] slowly relaxes, the glow around [affecting.p_them()] dimming.", \
- "You are re-united with your physical form. [src] releases its hold over you.")
- affecting.Paralyze(40)
- break
- if(affecting.health <= 10)
- to_chat(G, "Your body can no longer sustain the connection!")
- break
- sleep(5)
- CM.Remove(G)
- GM.Remove(G)
- affecting.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
- affecting.grab_ghost()
- affecting = null
- rune_in_use = FALSE
-
-/mob/living/carbon/human/cult_ghost/spill_organs(no_brain, no_organs, no_bodyparts) //cult ghosts never drop a brain
- no_brain = TRUE
- . = ..()
-
-/mob/living/carbon/human/cult_ghost/getorganszone(zone, subzones = 0)
- . = ..()
- for(var/obj/item/organ/brain/B in .) //they're not that smart, really
- . -= B
-
-
-/obj/effect/rune/apocalypse
- cultist_name = "Apocalypse"
- cultist_desc = "a harbinger of the end times. Grows in strength with the cult's desperation - but at the risk of... side effects."
- invocation = "Ta'gh fara'qha fel d'amar det!"
- icon = 'icons/effects/96x96.dmi'
- icon_state = "apoc"
- pixel_x = -32
- pixel_y = -32
- color = RUNE_COLOR_DARKRED
- req_cultists = 3
- scribe_delay = 100
-
-/obj/effect/rune/apocalypse/invoke(list/invokers)
- if(rune_in_use)
- return
- . = ..()
- var/area/place = get_area(src)
- var/mob/living/user = invokers[1]
- var/datum/antagonist/cult/user_antag = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives
- if(summon_objective.summon_spots.len <= 1)
- to_chat(user, "Only one ritual site remains - it must be reserved for the final summoning!")
- return
- if(!(place in summon_objective.summon_spots))
- to_chat(user, "The Apocalypse rune will remove a ritual site, where Nar'Sie can be summoned, it can only be scribed in [english_list(summon_objective.summon_spots)]!")
- return
- summon_objective.summon_spots -= place
- rune_in_use = TRUE
- var/turf/T = get_turf(src)
- new /obj/effect/temp_visual/dir_setting/curse/grasp_portal/fading(T)
- var/intensity = 0
- for(var/mob/living/M in GLOB.player_list)
- if(iscultist(M))
- intensity++
- intensity = max(60, 360 - (360*(intensity/GLOB.player_list.len + 0.3)**2)) //significantly lower intensity for "winning" cults
- var/duration = intensity*10
- playsound(T, 'sound/magic/enter_blood.ogg', 100, TRUE)
- visible_message("A colossal shockwave of energy bursts from the rune, disintegrating it in the process!")
- for(var/mob/living/L in range(src, 3))
- L.Paralyze(30)
- empulse(T, 0.42*(intensity), 1)
- var/list/images = list()
- var/zmatch = T.virtual_z()
- var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_SECURITY_ADVANCED]
- for(var/mob/living/M in GLOB.alive_mob_list)
- if(M.virtual_z() != zmatch)
- continue
- if(ishuman(M))
- if(!iscultist(M))
- AH.remove_hud_from(M)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(hudFix), M), duration)
- var/image/A = image('icons/mob/cult.dmi',M,"cultist", ABOVE_MOB_LAYER)
- A.override = 1
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "human_apoc", A, NONE)
- addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance),"human_apoc",TRUE), duration)
- images += A
- SEND_SOUND(M, pick(sound('sound/ambience/antag/bloodcult.ogg'),sound('sound/spookoween/ghost_whisper.ogg'),sound('sound/spookoween/ghosty_wind.ogg')))
- else
- var/construct = pick("floater","artificer","behemoth")
- var/image/B = image('icons/mob/mob.dmi',M,construct, ABOVE_MOB_LAYER)
- B.override = 1
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "mob_apoc", B, NONE)
- addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance),"mob_apoc",TRUE), duration)
- images += B
- if(!iscultist(M))
- if(M.client)
- var/image/C = image('icons/effects/cult_effects.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER)
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE)
- addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, remove_alt_appearance),"cult_apoc",TRUE), duration)
- images += C
- else
- to_chat(M, "An Apocalypse Rune was invoked in the [place.name], it is no longer available as a summoning site!")
- SEND_SOUND(M, 'sound/effects/pope_entry.ogg')
- image_handler(images, duration)
- if(intensity>=285) // Based on the prior formula, this means the cult makes up <15% of current players
- var/outcome = rand(1,80)
- switch(outcome)
- if(1 to 10)
- var/datum/round_event_control/disease_outbreak/D = new()
- // var/datum/round_event_control/mice_migration/M = new()
- D.runEvent()
- // M.runEvent()
- if(11 to 20)
- var/datum/round_event_control/radiation_storm/RS = new()
- RS.runEvent()
- if(21 to 30)
- var/datum/round_event_control/brand_intelligence/BI = new()
- BI.runEvent()
- if(31 to 40)
- var/datum/round_event_control/immovable_rod/R = new()
- R.runEvent()
- R.runEvent()
- R.runEvent()
- if(41 to 50)
- var/datum/round_event_control/meteor_wave/MW = new()
- MW.runEvent()
- if(51 to 60)
- var/datum/round_event_control/spider_infestation/SI = new()
- SI.runEvent()
- if(61 to 80)
- var/datum/round_event_control/spacevine/SV = new()
- var/datum/round_event_control/grey_tide/GT = new()
- SV.runEvent()
- GT.runEvent()
- qdel(src)
-
-/obj/effect/rune/apocalypse/proc/image_handler(list/images, duration)
- var/end = world.time + duration
- set waitfor = 0
- while(end>world.time)
- for(var/image/I in images)
- I.override = FALSE
- animate(I, alpha = 0, time = 25, flags = ANIMATION_PARALLEL)
- sleep(35)
- for(var/image/I in images)
- animate(I, alpha = 255, time = 25, flags = ANIMATION_PARALLEL)
- sleep(25)
- for(var/image/I in images)
- if(I.icon_state != "bloodsparkles")
- I.override = TRUE
- sleep(190)
-
-
-
-/proc/hudFix(mob/living/carbon/human/target)
- if(!target || !target.client)
- return
- var/obj/O = target.get_item_by_slot(ITEM_SLOT_EYES)
- if(istype(O, /obj/item/clothing/glasses/hud/security))
- var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_SECURITY_ADVANCED]
- AH.add_hud_to(target)
diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm
deleted file mode 100644
index ace534f94df..00000000000
--- a/code/modules/antagonists/devil/devil.dm
+++ /dev/null
@@ -1,548 +0,0 @@
-#define BLOOD_THRESHOLD 3 //How many souls are needed per stage.
-#define TRUE_THRESHOLD 7
-#define ARCH_THRESHOLD 12
-
-#define BASIC_DEVIL 0
-#define BLOOD_lizard 1
-#define TRUE_DEVIL 2
-#define ARCH_DEVIL 3
-
-#define LOSS_PER_DEATH 2
-
-#define SOULVALUE soulsOwned.len-reviveNumber
-
-#define DEVILRESURRECTTIME 600
-
-GLOBAL_LIST_EMPTY(allDevils)
-GLOBAL_LIST_INIT(lawlorify, list (
- LORE = list(
- OBLIGATION_FOOD = "This devil seems to always offer its victims food before slaughtering them.",
- OBLIGATION_FIDDLE = "This devil will never turn down a musical challenge.",
- OBLIGATION_DANCEOFF = "This devil will never turn down a dance off.",
- OBLIGATION_GREET = "This devil seems to only be able to converse with people it knows the name of.",
- OBLIGATION_PRESENCEKNOWN = "This devil seems to be unable to attack from stealth.",
- OBLIGATION_SAYNAME = "He will always chant his name upon killing someone.",
- OBLIGATION_ANNOUNCEKILL = "This devil always loudly announces his kills for the world to hear.",
- OBLIGATION_ANSWERTONAME = "This devil always responds to his truename.",
- BAN_HURTWOMAN = "This devil seems to prefer hunting men.",
- BAN_CHAPEL = "This devil avoids holy ground.",
- BAN_HURTPRIEST = "The annointed clergy appear to be immune to his powers.",
- BAN_AVOIDWATER = "The devil seems to have some sort of aversion to water, though it does not appear to harm him.",
- BAN_STRIKEUNCONSCIOUS = "This devil only shows interest in those who are awake.",
- BAN_HURTlizard = "This devil will not strike a lizardman first.",
- BAN_HURTANIMAL = "This devil avoids hurting animals.",
- BANISH_WATER = "To banish the devil, you must infuse its body with holy water.",
- BANISH_COFFIN = "This devil will return to life if its remains are not placed within a coffin.",
- BANISH_FORMALDYHIDE = "To banish the devil, you must inject its lifeless body with embalming fluid.",
- BANISH_RUNES = "This devil will resurrect after death, unless its remains are within a rune.",
- BANISH_CANDLES = "A large number of nearby lit candles will prevent it from resurrecting.",
- BANISH_DESTRUCTION = "Its corpse must be utterly destroyed to prevent resurrection.",
- BANISH_FUNERAL_GARB = "If clad in funeral garments, this devil will be unable to resurrect. Should the clothes not fit, lay them gently on top of the devil's corpse."
- ),
- LAW = list(
- OBLIGATION_FOOD = "When not acting in self defense, you must always offer your victim food before harming them.",
- OBLIGATION_FIDDLE = "When not in immediate danger, if you are challenged to a musical duel, you must accept it. You are not obligated to duel the same person twice.",
- OBLIGATION_DANCEOFF = "When not in immediate danger, if you are challenged to a dance off, you must accept it. You are not obligated to face off with the same person twice.",
- OBLIGATION_GREET = "You must always greet other people by their last name before talking with them.",
- OBLIGATION_PRESENCEKNOWN = "You must always make your presence known before attacking.",
- OBLIGATION_SAYNAME = "You must always say your true name after you kill someone.",
- OBLIGATION_ANNOUNCEKILL = "Upon killing someone, you must make your deed known to all within earshot, over comms if reasonably possible.",
- OBLIGATION_ANSWERTONAME = "If you are not under attack, you must always respond to your true name.",
- BAN_HURTWOMAN = "You must never harm a female outside of self defense.",
- BAN_CHAPEL = "You must never attempt to enter the chapel.",
- BAN_HURTPRIEST = "You must never attack a priest.",
- BAN_AVOIDWATER = "You must never willingly touch a wet surface.",
- BAN_STRIKEUNCONSCIOUS = "You must never strike an unconscious person.",
- BAN_HURTlizard = "You must never harm a lizardman outside of self defense.",
- BAN_HURTANIMAL = "You must never harm a non-sentient creature or robot outside of self defense.",
- BANISH_WATER = "If your corpse is filled with holy water, you will be unable to resurrect.",
- BANISH_COFFIN = "If your corpse is in a coffin, you will be unable to resurrect.",
- BANISH_FORMALDYHIDE = "If your corpse is embalmed, you will be unable to resurrect.",
- BANISH_RUNES = "If your corpse is placed within a rune, you will be unable to resurrect.",
- BANISH_CANDLES = "If your corpse is near lit candles, you will be unable to resurrect.",
- BANISH_DESTRUCTION = "If your corpse is destroyed, you will be unable to resurrect.",
- BANISH_FUNERAL_GARB = "If your corpse is clad in funeral garments, you will be unable to resurrect."
- )
- ))
-
-//These are also used in the codex gigas, so let's declare them globally.
-GLOBAL_LIST_INIT(devil_pre_title, list("Dark ", "Hellish ", "Fallen ", "Fiery ", "Sinful ", "Blood ", "Fluffy "))
-GLOBAL_LIST_INIT(devil_title, list("Lord ", "Prelate ", "Count ", "Viscount ", "Vizier ", "Elder ", "Adept "))
-GLOBAL_LIST_INIT(devil_syllable, list("hal", "ve", "odr", "neit", "ci", "quon", "mya", "folth", "wren", "geyr", "hil", "niet", "twou", "phi", "coa"))
-GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", ", the Lord of all things", ", Jr."))
-/datum/antagonist/devil
- name = "Devil"
- roundend_category = "devils"
- antagpanel_category = "Devil"
- job_rank = ROLE_DEVIL
- antag_hud_type = ANTAG_HUD_DEVIL
- antag_hud_name = "devil"
- show_to_ghosts = TRUE
- var/obligation
- var/ban
- var/banish
- var/truename
- var/list/datum/mind/soulsOwned = new
- var/reviveNumber = 0
- var/form = BASIC_DEVIL
- var/static/list/devil_spells = typecacheof(list(
- /obj/effect/proc_holder/spell/aimed/fireball/hellish,
- /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork,
- /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/greater,
- /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/ascended,
- /obj/effect/proc_holder/spell/targeted/infernal_jaunt,
- /obj/effect/proc_holder/spell/targeted/sintouch,
- /obj/effect/proc_holder/spell/targeted/sintouch/ascended,
- /obj/effect/proc_holder/spell/targeted/summon_contract,
- /obj/effect/proc_holder/spell/targeted/conjure_item/violin,
- /obj/effect/proc_holder/spell/targeted/summon_dancefloor))
- var/ascendable = FALSE
-
-/datum/antagonist/devil/can_be_owned(datum/mind/new_owner)
- . = ..()
- return . && (ishuman(new_owner.current) || iscyborg(new_owner.current))
-
-/datum/antagonist/devil/get_admin_commands()
- . = ..()
- .["Toggle ascendable"] = CALLBACK(src, PROC_REF(admin_toggle_ascendable))
-
-
-/datum/antagonist/devil/proc/admin_toggle_ascendable(mob/admin)
- ascendable = !ascendable
- message_admins("[key_name_admin(admin)] set [key_name_admin(owner)] devil ascendable to [ascendable]")
- log_admin("[key_name_admin(admin)] set [key_name(owner)] devil ascendable to [ascendable])")
-
-/datum/antagonist/devil/admin_add(datum/mind/new_owner,mob/admin)
- switch(alert(admin,"Should the devil be able to ascend",,"Yes","No","Cancel"))
- if("Yes")
- ascendable = TRUE
- if("No")
- ascendable = FALSE
- else
- return
- new_owner.add_antag_datum(src)
- message_admins("[key_name_admin(admin)] has devil'ed [key_name_admin(new_owner)]. [ascendable ? "(Ascendable)":""]")
- log_admin("[key_name(admin)] has devil'ed [key_name(new_owner)]. [ascendable ? "(Ascendable)":""]")
-
-/datum/antagonist/devil/antag_listing_name()
- return ..() + "([truename])"
-
-/proc/devilInfo(name)
- if(GLOB.allDevils[lowertext(name)])
- return GLOB.allDevils[lowertext(name)]
- else
- var/datum/fakeDevil/devil = new /datum/fakeDevil(name)
- GLOB.allDevils[lowertext(name)] = devil
- return devil
-
-/proc/randomDevilName()
- var/name = ""
- if(prob(65))
- if(prob(35))
- name = pick(GLOB.devil_pre_title)
- name += pick(GLOB.devil_title)
- var/probability = 100
- name += pick(GLOB.devil_syllable)
- while(prob(probability))
- name += pick(GLOB.devil_syllable)
- probability -= 20
- if(prob(40))
- name += pick(GLOB.devil_suffix)
- return name
-
-/proc/randomdevilobligation()
- return pick(OBLIGATION_FOOD, OBLIGATION_FIDDLE, OBLIGATION_DANCEOFF, OBLIGATION_GREET, OBLIGATION_PRESENCEKNOWN, OBLIGATION_SAYNAME, OBLIGATION_ANNOUNCEKILL, OBLIGATION_ANSWERTONAME)
-
-/proc/randomdevilban()
- return pick(BAN_HURTWOMAN, BAN_CHAPEL, BAN_HURTPRIEST, BAN_AVOIDWATER, BAN_STRIKEUNCONSCIOUS, BAN_HURTLIZARD, BAN_HURTANIMAL)
-
-/proc/randomdevilbanish()
- return pick(BANISH_WATER, BANISH_COFFIN, BANISH_FORMALDYHIDE, BANISH_RUNES, BANISH_CANDLES, BANISH_DESTRUCTION, BANISH_FUNERAL_GARB)
-
-/datum/antagonist/devil/proc/add_soul(datum/mind/soul)
- if(soulsOwned.Find(soul))
- return
- soulsOwned += soul
- owner.current.set_nutrition(NUTRITION_LEVEL_FULL)
- to_chat(owner.current, "You feel satiated as you received a new soul.")
- update_hud()
- switch(SOULVALUE)
- if(0)
- to_chat(owner.current, "Your hellish powers have been restored.")
- give_appropriate_spells()
- if(BLOOD_THRESHOLD)
- increase_blood_lizard()
- if(TRUE_THRESHOLD)
- increase_true_devil()
- if(ARCH_THRESHOLD)
- increase_arch_devil()
-
-/datum/antagonist/devil/proc/remove_soul(datum/mind/soul)
- if(soulsOwned.Remove(soul))
- check_regression()
- to_chat(owner.current, "You feel as though a soul has slipped from your grasp.")
- update_hud()
-
-/datum/antagonist/devil/proc/check_regression()
- if(form == ARCH_DEVIL)
- return //arch devil can't regress
- //Yes, fallthrough behavior is intended, so I can't use a switch statement.
- if(form == TRUE_DEVIL && SOULVALUE < TRUE_THRESHOLD)
- regress_blood_lizard()
- if(form == BLOOD_lizard && SOULVALUE < BLOOD_THRESHOLD)
- regress_humanoid()
- if(SOULVALUE < 0)
- give_appropriate_spells()
- to_chat(owner.current, "As punishment for your failures, all of your powers except contract creation have been revoked.")
-
-/datum/antagonist/devil/proc/regress_humanoid()
- to_chat(owner.current, "Your powers weaken, have more contracts be signed to regain power.")
- if(ishuman(owner.current))
- var/mob/living/carbon/human/H = owner.current
- H.set_species(/datum/species/human, 1)
- H.regenerate_icons()
- give_appropriate_spells()
- if(istype(owner.current.loc, /obj/effect/dummy/phased_mob/slaughter/))
- owner.current.forceMove(get_turf(owner.current))//Fixes dying while jaunted leaving you permajaunted.
- form = BASIC_DEVIL
-
-/datum/antagonist/devil/proc/regress_blood_lizard()
- var/mob/living/carbon/true_devil/D = owner.current
- to_chat(D, "Your powers weaken, have more contracts be signed to regain power.")
- D.oldform.forceMove(D.drop_location())
- owner.transfer_to(D.oldform)
- give_appropriate_spells()
- qdel(D)
- form = BLOOD_lizard
- update_hud()
-
-
-/datum/antagonist/devil/proc/increase_blood_lizard()
- to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.")
- sleep(50)
- if(ishuman(owner.current))
- var/mob/living/carbon/human/H = owner.current
- H.set_species(/datum/species/lizard, 1)
- H.underwear = "Nude"
- H.undershirt = "Nude"
- H.socks = "Nude"
- H.dna.features["mcolor"] = "511" //A deep red
- H.regenerate_icons()
- else //Did the devil get hit by a staff of transmutation?
- owner.current.color = "#501010"
- give_appropriate_spells()
- form = BLOOD_lizard
-
-
-
-/datum/antagonist/devil/proc/increase_true_devil()
- to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.")
- sleep(50)
- var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc)
- A.faction |= "hell"
- owner.current.forceMove(A)
- A.oldform = owner.current
- owner.transfer_to(A)
- A.set_devil_name()
- give_appropriate_spells()
- form = TRUE_DEVIL
- update_hud()
-
-/datum/antagonist/devil/proc/increase_arch_devil()
- if(!ascendable)
- return
- var/mob/living/carbon/true_devil/D = owner.current
- to_chat(D, "You feel as though your form is about to ascend.")
- sleep(50)
- if(!D)
- return
- D.visible_message("[D]'s skin begins to erupt with spikes.", \
- "Your flesh begins creating a shield around yourself.")
- sleep(100)
- if(!D)
- return
- D.visible_message("The horns on [D]'s head slowly grow and elongate.", \
- "Your body continues to mutate. Your telepathic abilities grow.")
- sleep(90)
- if(!D)
- return
- D.visible_message("[D]'s body begins to violently stretch and contort.", \
- "You begin to rend apart the final barriers to ultimate power.")
- sleep(40)
- if(!D)
- return
- to_chat(D, "Yes!")
- sleep(10)
- if(!D)
- return
- to_chat(D, "YES!!")
- sleep(10)
- if(!D)
- return
- to_chat(D, "YE--")
- sleep(1)
- if(!D)
- return
- send_to_playing_players("\"SLOTH, WRATH, GLUTTONY, ACEDIA, ENVY, GREED, PRIDE! FIRES OF HELL AWAKEN!!\"")
- sound_to_playing_players('sound/hallucinations/veryfar_noise.ogg')
- give_appropriate_spells()
- D.convert_to_archdevil()
- if(istype(D.loc, /obj/effect/dummy/phased_mob/slaughter/))
- D.forceMove(get_turf(D))//Fixes dying while jaunted leaving you permajaunted.
- var/area/A = get_area(owner.current)
- if(A)
- notify_ghosts("An arch devil has ascended in \the [A.name]. Reach out to the devil to be given a new shell for your soul.", source = owner.current, action=NOTIFY_ATTACK)
- sleep(50)
- form = ARCH_DEVIL
-
-/datum/antagonist/devil/proc/remove_spells()
- for(var/X in owner.spell_list)
- var/obj/effect/proc_holder/spell/S = X
- if(is_type_in_typecache(S, devil_spells))
- owner.RemoveSpell(S)
-
-/datum/antagonist/devil/proc/give_summon_contract()
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_contract(null))
- if(obligation == OBLIGATION_FIDDLE)
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/violin(null))
- else if(obligation == OBLIGATION_DANCEOFF)
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_dancefloor(null))
-
-/datum/antagonist/devil/proc/give_appropriate_spells()
- remove_spells()
- give_summon_contract()
- if(SOULVALUE >= ARCH_THRESHOLD && ascendable)
- give_arch_spells()
- else if(SOULVALUE >= TRUE_THRESHOLD)
- give_true_spells()
- else if(SOULVALUE >= BLOOD_THRESHOLD)
- give_blood_spells()
- else if(SOULVALUE >= 0)
- give_base_spells()
-
-/datum/antagonist/devil/proc/give_base_spells()
- owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball/hellish(null))
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork(null))
-
-/datum/antagonist/devil/proc/give_blood_spells()
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork(null))
- owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball/hellish(null))
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/infernal_jaunt(null))
-
-/datum/antagonist/devil/proc/give_true_spells()
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/greater(null))
- owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball/hellish(null))
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/infernal_jaunt(null))
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch(null))
-
-/datum/antagonist/devil/proc/give_arch_spells()
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/ascended(null))
- owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/sintouch/ascended(null))
-
-/datum/antagonist/devil/proc/beginResurrectionCheck(mob/living/body)
- if(SOULVALUE>0)
- to_chat(owner.current, "Your body has been damaged to the point that you may no longer use it. At the cost of some of your power, you will return to life soon. Remain in your body.")
- sleep(DEVILRESURRECTTIME)
- if (!body || body.stat == DEAD)
- if(SOULVALUE>0)
- if(check_banishment(body))
- to_chat(owner.current, "Unfortunately, the mortals have finished a ritual that prevents your resurrection.")
- return -1
- else
- to_chat(owner.current, "WE LIVE AGAIN!")
- return hellish_resurrection(body)
- else
- to_chat(owner.current, "Unfortunately, the power that stemmed from your contracts has been extinguished. You no longer have enough power to resurrect.")
- return -1
- else
- to_chat(owner.current, "You seem to have resurrected without your hellish powers.")
- else
- to_chat(owner.current, "Your hellish powers are too weak to resurrect yourself.")
-
-/datum/antagonist/devil/proc/check_banishment(mob/living/body)
- switch(banish)
- if(BANISH_WATER)
- if(iscarbon(body))
- var/mob/living/carbon/H = body
- return H.reagents.has_reagent(/datum/reagent/water/holywater)
- return 0
- if(BANISH_COFFIN)
- return (body && istype(body.loc, /obj/structure/closet/crate/coffin))
- if(BANISH_FORMALDYHIDE)
- if(iscarbon(body))
- var/mob/living/carbon/H = body
- return H.reagents.has_reagent(/datum/reagent/toxin/formaldehyde)
- return 0
- if(BANISH_RUNES)
- if(body)
- for(var/obj/effect/decal/cleanable/crayon/R in range(0,body))
- if (R.name == "rune")
- return 1
- return 0
- if(BANISH_CANDLES)
- if(body)
- var/count = 0
- for(var/obj/item/candle/C in range(1,body))
- count += C.lit
- if(count>=4)
- return 1
- return 0
- if(BANISH_DESTRUCTION)
- if(body)
- return 0
- return 1
- if(BANISH_FUNERAL_GARB)
- if(ishuman(body))
- var/mob/living/carbon/human/H = body
- if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under/suit/white_on_white))
- return 1
- return 0
- else
- for(var/obj/item/clothing/under/suit/white_on_white/B in range(0,body))
- if(B.loc == get_turf(B)) //Make sure it's not in someone's inventory or something.
- return 1
- return 0
-
-/datum/antagonist/devil/proc/hellish_resurrection(mob/living/body)
- message_admins("[key_name_admin(owner)] (true name is: [truename]) is resurrecting using hellish energy.")
- if(SOULVALUE < ARCH_THRESHOLD || !ascendable) // once ascended, arch devils do not go down in power by any means.
- reviveNumber += LOSS_PER_DEATH
- update_hud()
- if(body)
- body.revive(full_heal = TRUE, admin_revive = TRUE) //Adminrevive also recovers organs, preventing someone from resurrecting without a heart.
- if(istype(body.loc, /obj/effect/dummy/phased_mob/slaughter/))
- body.forceMove(get_turf(body))//Fixes dying while jaunted leaving you permajaunted.
- if(istype(body, /mob/living/carbon/true_devil))
- var/mob/living/carbon/true_devil/D = body
- if(D.oldform)
- D.oldform.revive(full_heal = TRUE, admin_revive = FALSE) // Heal the old body too, so the devil doesn't resurrect, then immediately regress into a dead body.
- if(body.stat == DEAD)
- create_new_body()
- else
- create_new_body()
- check_regression()
-
-/datum/antagonist/devil/proc/create_new_body()
- if(GLOB.blobstart.len > 0)
- var/turf/targetturf = get_turf(pick(GLOB.blobstart))
- var/mob/currentMob = owner.current
- if(!currentMob)
- currentMob = owner.get_ghost()
- if(!currentMob)
- message_admins("[key_name_admin(owner)]'s devil resurrection failed due to client logoff. Aborting.")
- return -1
- if(currentMob.mind != owner)
- message_admins("[key_name_admin(owner)]'s devil resurrection failed due to becoming a new mob. Aborting.")
- return -1
- currentMob.change_mob_type(/mob/living/carbon/human, targetturf, null, 1)
- var/mob/living/carbon/human/H = owner.current
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/lawyer/black(H), ITEM_SLOT_ICLOTHING)
- H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), ITEM_SLOT_FEET)
- H.equip_to_slot_or_del(new /obj/item/storage/briefcase(H), ITEM_SLOT_HANDS)
- H.equip_to_slot_or_del(new /obj/item/pen(H), ITEM_SLOT_LPOCKET)
- if(SOULVALUE >= BLOOD_THRESHOLD)
- H.set_species(/datum/species/lizard, 1)
- H.underwear = "Nude"
- H.undershirt = "Nude"
- H.socks = "Nude"
- H.dna.features["mcolor"] = "511"
- H.regenerate_icons()
- if(SOULVALUE >= TRUE_THRESHOLD) //Yes, BOTH this and the above if statement are to run if soulpower is high enough.
- var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(targetturf)
- A.faction |= "hell"
- H.forceMove(A)
- A.oldform = H
- owner.transfer_to(A, TRUE)
- A.set_devil_name()
- if(SOULVALUE >= ARCH_THRESHOLD && ascendable)
- A.convert_to_archdevil()
- else
- CRASH("Unable to find a blobstart landmark for hellish resurrection")
-
-
-/datum/antagonist/devil/proc/update_hud()
- if(iscarbon(owner.current))
- var/mob/living/C = owner.current
- if(C.hud_used && C.hud_used.devilsouldisplay)
- C.hud_used.devilsouldisplay.update_counter(SOULVALUE)
-
-/datum/antagonist/devil/greet()
- to_chat(owner.current, "You remember your link to the infernal. You are [truename], an agent of hell, a devil. And you were sent to the plane of creation for a reason. A greater purpose. Convince the crew to sin, and embroiden Hell's grasp.")
- to_chat(owner.current, "However, your infernal form is not without weaknesses.")
- to_chat(owner.current, "You may not use violence to coerce someone into selling their soul.")
- to_chat(owner.current, "You may not directly and knowingly physically harm a devil, other than yourself.")
- to_chat(owner.current, GLOB.lawlorify[LAW][ban])
- to_chat(owner.current, GLOB.lawlorify[LAW][obligation])
- to_chat(owner.current, GLOB.lawlorify[LAW][banish])
- to_chat(owner.current, "Remember, the crew can research your weaknesses if they find out your devil name. ")
- .=..()
-
-/datum/antagonist/devil/on_gain()
- truename = randomDevilName()
- ban = randomdevilban()
- obligation = randomdevilobligation()
- banish = randomdevilbanish()
- GLOB.allDevils[lowertext(truename)] = src
-
- antag_memory += "Your devilic true name is [truename] [GLOB.lawlorify[LAW][ban]] You may not use violence to coerce someone into selling their soul. You may not directly and knowingly physically harm a devil, other than yourself. [GLOB.lawlorify[LAW][obligation]] [GLOB.lawlorify[LAW][banish]] "
- if(issilicon(owner.current))
- var/mob/living/silicon/robot_devil = owner.current
- var/laws = list("You may not use violence to coerce someone into selling their soul.", "You may not directly and knowingly physically harm a devil, other than yourself.", GLOB.lawlorify[LAW][ban], GLOB.lawlorify[LAW][obligation], "Accomplish your objectives at all costs.")
- robot_devil.set_law_sixsixsix(laws)
- sleep(10)
- .=..()
-
-/datum/antagonist/devil/on_removal()
- to_chat(owner.current, "Your infernal link has been severed! You are no longer a devil!")
- .=..()
-
-/datum/antagonist/devil/apply_innate_effects(mob/living/mob_override)
- give_appropriate_spells()
- var/mob/living/M = mob_override || owner.current
- add_antag_hud(antag_hud_type, antag_hud_name, M)
- handle_clown_mutation(M, mob_override ? null : "Your infernal nature has allowed you to overcome your clownishness.")
- owner.current.grant_all_languages(TRUE, TRUE, TRUE, LANGUAGE_DEVIL)
- update_hud()
- .=..()
-
-/datum/antagonist/devil/remove_innate_effects(mob/living/mob_override)
- for(var/X in owner.spell_list)
- var/obj/effect/proc_holder/spell/S = X
- if(is_type_in_typecache(S, devil_spells))
- owner.RemoveSpell(S)
- var/mob/living/M = mob_override || owner.current
- remove_antag_hud(antag_hud_type, M)
- handle_clown_mutation(M, removing = FALSE)
- owner.current.remove_all_languages(LANGUAGE_DEVIL)
- .=..()
-
-/datum/antagonist/devil/proc/printdevilinfo()
- var/list/parts = list()
- parts += "The devil's true name is: [truename]"
- parts += "The devil's bans were:"
- parts += "[FOURSPACES][GLOB.lawlorify[LORE][ban]]"
- parts += "[FOURSPACES][GLOB.lawlorify[LORE][obligation]]"
- parts += "[FOURSPACES][GLOB.lawlorify[LORE][banish]]"
- return parts.Join(" ")
-
-/datum/antagonist/devil/roundend_report()
- var/list/parts = list()
- parts += printplayer(owner)
- parts += printdevilinfo()
- parts += printobjectives(objectives)
- return parts.Join(" ")
-
-//A simple super light weight datum for the codex gigas.
-/datum/fakeDevil
- var/truename
- var/obligation
- var/ban
- var/banish
- var/ascendable
-
-/datum/fakeDevil/New(name = randomDevilName())
- truename = name
- obligation = randomdevilobligation()
- ban = randomdevilban()
- banish = randomdevilbanish()
- ascendable = prob(25)
diff --git a/code/modules/antagonists/devil/imp/imp.dm b/code/modules/antagonists/devil/imp/imp.dm
deleted file mode 100644
index 21446d2661d..00000000000
--- a/code/modules/antagonists/devil/imp/imp.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-//////////////////The Monster
-
-/mob/living/simple_animal/imp
- name = "imp"
- real_name = "imp"
- unique_name = TRUE
- desc = "A large, menacing creature covered in armored black scales."
- speak_emote = list("cackles")
- emote_hear = list("cackles","screeches")
- response_help_continuous = "thinks better of touching"
- response_help_simple = "think better of touching"
- response_disarm_continuous = "flails at"
- response_disarm_simple = "flail at"
- response_harm_continuous = "punches"
- response_harm_simple = "punch"
- icon = 'icons/mob/mob.dmi'
- icon_state = "imp"
- icon_living = "imp"
- mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
- speed = 1
- a_intent = INTENT_HARM
- stop_automated_movement = 1
- status_flags = CANPUSH
- attack_sound = 'sound/magic/demon_attack1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 250 //Weak to cold
- maxbodytemp = INFINITY
- faction = list("hell")
- attack_verb_continuous = "wildly tears into"
- attack_verb_simple = "wildly tear into"
- maxHealth = 200
- health = 200
- healable = 0
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES
- obj_damage = 40
- melee_damage_lower = 10
- melee_damage_upper = 15
- see_in_dark = 8
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- del_on_death = TRUE
- deathmessage = "screams in agony as it sublimates into a sulfurous smoke."
- deathsound = 'sound/magic/demon_dies.ogg'
- var/boost = 0
- var/list/consumed_mobs = list()
- var/playstyle_string = "You are an imp, a mischievous creature from hell. You are the lowest rank on the hellish totem pole \
- Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \
- of intentionally harming a fellow devil."
-
-/mob/living/simple_animal/imp/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_BLOODCRAWL_EAT, "innate")
- set_varspeed(1)
- addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living, set_varspeed), 0), 30)
-
-/datum/antagonist/imp
- name = "Imp"
- antagpanel_category = "Devil"
- show_in_roundend = FALSE
-
-/datum/antagonist/imp/on_gain()
- . = ..()
- give_objectives()
-
-/datum/antagonist/imp/proc/give_objectives()
- var/datum/objective/newobjective = new
- newobjective.explanation_text = "Try to get a promotion to a higher devilic rank."
- newobjective.owner = owner
- objectives += newobjective
diff --git a/code/modules/antagonists/devil/sintouched/objectives.dm b/code/modules/antagonists/devil/sintouched/objectives.dm
deleted file mode 100644
index fcbb8dcbb55..00000000000
--- a/code/modules/antagonists/devil/sintouched/objectives.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/datum/objective/sintouched
- completed = 1
-
-/datum/objective/sintouched/gluttony
- explanation_text = "Everything is so delicious. Go eat everything."
-
-/datum/objective/sintouched/greed
- explanation_text = "You want MORE, more money, more wealth, more riches. Go get it, but don't hurt people for it."
-
-/datum/objective/sintouched/sloth
- explanation_text = "You just get tired randomly. Go take a nap at a time that would inconvenience other people."
-
-/datum/objective/sintouched/wrath
- explanation_text = "What have your coworkers ever done for you? Don't offer to help them in any matter, and refuse if asked."
-
-/datum/objective/sintouched/envy
- explanation_text = "Why should you be stuck with your rank? Show everyone you can do other jobs too, and don't let anyone stop you, least of all because you have no training"
-
-/datum/objective/sintouched/pride
- explanation_text = "You are the BEST thing on the station. Make sure everyone knows it."
-
-/datum/objective/sintouched/acedia
- explanation_text = "Angels, devils, good, evil... who cares? Just ignore any hellish threats and do your job."
diff --git a/code/modules/antagonists/devil/sintouched/sintouched.dm b/code/modules/antagonists/devil/sintouched/sintouched.dm
deleted file mode 100644
index 064e1fbaecd..00000000000
--- a/code/modules/antagonists/devil/sintouched/sintouched.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-#define SIN_ACEDIA "acedia"
-#define SIN_GLUTTONY "gluttony"
-#define SIN_GREED "greed"
-#define SIN_SLOTH "sloth"
-#define SIN_WRATH "wrath"
-#define SIN_ENVY "envy"
-#define SIN_PRIDE "pride"
-
-/datum/antagonist/sintouched
- name = "sintouched"
- roundend_category = "sintouched"
- antagpanel_category = "Devil"
- antag_hud_type = ANTAG_HUD_SINTOUCHED
- antag_hud_name = "sintouched"
- var/sin
-
- var/static/list/sins = list(SIN_ACEDIA,SIN_GLUTTONY,SIN_GREED,SIN_SLOTH,SIN_WRATH,SIN_ENVY,SIN_PRIDE)
-
-/datum/antagonist/sintouched/New()
- . = ..()
- sin = pick(sins)
-
-/datum/antagonist/sintouched/proc/forge_objectives()
- var/datum/objective/sintouched/O
- switch(sin)//traditional seven deadly sins... except lust.
- if(SIN_ACEDIA)
- O = new /datum/objective/sintouched/acedia
- if(SIN_GLUTTONY)
- O = new /datum/objective/sintouched/gluttony
- if(SIN_GREED)
- O = new /datum/objective/sintouched/greed
- if(SIN_SLOTH)
- O = new /datum/objective/sintouched/sloth
- if(SIN_WRATH)
- O = new /datum/objective/sintouched/wrath
- if(SIN_ENVY)
- O = new /datum/objective/sintouched/envy
- if(SIN_PRIDE)
- O = new /datum/objective/sintouched/pride
- objectives += O
-
-/datum/antagonist/sintouched/on_gain()
- forge_objectives()
- . = ..()
-
-/datum/antagonist/sintouched/greet()
- owner.announce_objectives()
-
-/datum/antagonist/sintouched/roundend_report()
- return printplayer(owner)
-
-/datum/antagonist/sintouched/admin_add(datum/mind/new_owner,mob/admin)
- var/choices = sins + "Random"
- var/chosen_sin = input(admin,"What kind ?","Sin kind") as null|anything in sortList(choices)
- if(!chosen_sin)
- return
- if(chosen_sin in sins)
- sin = chosen_sin
- . = ..()
-
-/datum/antagonist/sintouched/apply_innate_effects(mob/living/mob_override)
- var/mob/living/M = mob_override || owner.current
- add_antag_hud(antag_hud_type, antag_hud_name, M)
-
-/datum/antagonist/sintouched/remove_innate_effects(mob/living/mob_override)
- var/mob/living/M = mob_override || owner.current
- remove_antag_hud(antag_hud_type, M)
-
-
-#undef SIN_ACEDIA
-#undef SIN_ENVY
-#undef SIN_GLUTTONY
-#undef SIN_GREED
-#undef SIN_PRIDE
-#undef SIN_SLOTH
-#undef SIN_WRATH
diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm
deleted file mode 100644
index 4703f95263f..00000000000
--- a/code/modules/antagonists/devil/true_devil/_true_devil.dm
+++ /dev/null
@@ -1,221 +0,0 @@
-#define DEVIL_HANDS_LAYER 1
-#define DEVIL_HEAD_LAYER 2
-#define DEVIL_TOTAL_LAYERS 2
-
-
-/mob/living/carbon/true_devil
- name = "True Devil"
- desc = "A pile of infernal energy, taking a vaguely humanoid form."
- icon = 'icons/mob/32x64.dmi'
- icon_state = "true_devil"
- gender = NEUTER
- health = 350
- maxHealth = 350
- ventcrawler = VENTCRAWLER_NONE
- density = TRUE
- pass_flags = 0
- sight = (SEE_TURFS | SEE_OBJS)
- status_flags = CANPUSH
- mob_size = MOB_SIZE_LARGE
- held_items = list(null, null)
- bodyparts = list(
- /obj/item/bodypart/chest/devil,
- /obj/item/bodypart/head/devil,
- /obj/item/bodypart/l_arm/devil,
- /obj/item/bodypart/r_arm/devil,
- /obj/item/bodypart/leg/right/devil,
- /obj/item/bodypart/leg/left/devil,
- )
- hud_type = /datum/hud/devil
- var/ascended = FALSE
- var/mob/living/oldform
- var/list/devil_overlays[DEVIL_TOTAL_LAYERS]
-
-/mob/living/carbon/true_devil/Initialize()
- create_bodyparts() //initialize bodyparts
- create_internal_organs()
- grant_all_languages()
- . = ..()
- ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
-
-/mob/living/carbon/true_devil/create_internal_organs()
- internal_organs += new /obj/item/organ/brain
- internal_organs += new /obj/item/organ/tongue
- internal_organs += new /obj/item/organ/eyes
- internal_organs += new /obj/item/organ/ears/invincible //Prevents hearing loss from poorly aimed fireballs.
- ..()
-
-/mob/living/carbon/true_devil/proc/convert_to_archdevil()
- maxHealth = 500 // not an IMPOSSIBLE amount, but still near impossible.
- ascended = TRUE
- health = maxHealth
- icon_state = "arch_devil"
-
-/mob/living/carbon/true_devil/proc/set_devil_name()
- var/datum/antagonist/devil/devilinfo = mind.has_antag_datum(/datum/antagonist/devil)
- name = devilinfo.truename
- real_name = name
-
-/mob/living/carbon/true_devil/Login()
- . = ..()
- if(!. || !client)
- return FALSE
- var/datum/antagonist/devil/devilinfo = mind.has_antag_datum(/datum/antagonist/devil)
- devilinfo.greet()
- mind.announce_objectives()
-
-/mob/living/carbon/true_devil/death(gibbed)
- set_stat(DEAD)
- ..(gibbed)
- drop_all_held_items()
- INVOKE_ASYNC(mind.has_antag_datum(/datum/antagonist/devil), TYPE_PROC_REF(/datum/antagonist/devil, beginResurrectionCheck), src)
-
-
-/mob/living/carbon/true_devil/examine(mob/user)
- . = list("This is [icon2html(src, user)] [src]!")
-
- //Left hand items
- for(var/obj/item/I in held_items)
- if(!(I.item_flags & ABSTRACT))
- . += "It is holding [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))]."
-
- //Braindead
- if(!client && stat != DEAD)
- . += "The devil seems to be in deep contemplation."
-
- //Damaged
- if(stat == DEAD)
- . += "The hellfire seems to have been extinguished, for now at least."
- else if(health < (maxHealth/10))
- . += "You can see hellfire inside its gaping wounds."
- else if(health < (maxHealth/2))
- . += "You can see hellfire inside its wounds."
- . += ""
-
-/mob/living/carbon/true_devil/IsAdvancedToolUser()
- return 1
-
-/mob/living/carbon/true_devil/resist_buckle()
- if(buckled)
- buckled.user_unbuckle_mob(src,src)
- visible_message("[src] easily breaks out of [p_their()] handcuffs!", \
- "With just a thought your handcuffs fall off.")
-
-/mob/living/carbon/true_devil/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE)
- if(incapacitated())
- to_chat(src, "You can't do that right now!")
- return FALSE
- if(be_close && !in_range(M, src))
- to_chat(src, "You are too far away!")
- return FALSE
- return TRUE
-
-/mob/living/carbon/true_devil/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null)
- return 666
-
-/mob/living/carbon/true_devil/soundbang_act()
- return 0
-
-/mob/living/carbon/true_devil/get_ear_protection()
- return 2
-
-
-/mob/living/carbon/true_devil/attacked_by(obj/item/I, mob/living/user, def_zone)
- apply_damage(I.force, I.damtype, def_zone)
- var/message_verb = ""
- if(I.attack_verb && I.attack_verb.len)
- message_verb = "[pick(I.attack_verb)]"
- else if(I.force)
- message_verb = "attacked"
-
- var/attack_message = "[src] has been [message_verb] with [I]."
- if(user)
- user.do_attack_animation(src)
- if(user in viewers(src, null))
- attack_message = "[user] has [message_verb] [src] with [I]!"
- if(message_verb)
- visible_message("[attack_message]",
- "[attack_message]", null, COMBAT_MESSAGE_RANGE)
- return TRUE
-
-/mob/living/carbon/true_devil/singularity_act()
- if(ascended)
- return 0
- return ..()
-
-//ATTACK GHOST IGNORING PARENT RETURN VALUE
-/mob/living/carbon/true_devil/attack_ghost(mob/dead/observer/user as mob)
- if(ascended || user.mind.soulOwner == src.mind)
- var/mob/living/simple_animal/imp/S = new(get_turf(loc))
- S.key = user.key
- var/datum/antagonist/imp/A = new()
- S.mind.add_antag_datum(A)
- to_chat(S, S.playstyle_string)
- else
- return ..()
-
-/mob/living/carbon/true_devil/can_be_revived()
- return 1
-
-/mob/living/carbon/true_devil/resist_fire()
- //They're immune to fire.
-
-/mob/living/carbon/true_devil/attack_hand(mob/living/carbon/human/M)
- . = ..()
- if(.)
- switch(M.a_intent)
- if ("harm")
- var/damage = rand(1, 5)
- playsound(loc, "punch", 25, TRUE, -1)
- visible_message("[M] punches [src]!", \
- "[M] punches you!")
- adjustBruteLoss(damage)
- log_combat(M, src, "attacked")
- updatehealth()
- if ("disarm")
- if (!(mobility_flags & MOBILITY_STAND) && !ascended) //No stealing the arch devil's pitchfork.
- if (prob(5))
- Unconscious(40)
- playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
- log_combat(M, src, "pushed")
- visible_message("[M] pushes [src] down!", \
- "[M] pushes you down!")
- else
- if (prob(25))
- dropItemToGround(get_active_held_item())
- playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
- visible_message("[M] disarms [src]!", \
- "[M] disarms you!")
- else
- playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
- visible_message("[M] fails to disarm [src]!", \
- "[M] fails to disarm you!")
-
-/mob/living/carbon/true_devil/handle_breathing()
- // devils do not need to breathe
-
-/mob/living/carbon/true_devil/is_literate()
- return TRUE
-
-/mob/living/carbon/true_devil/ex_act(severity, ex_target)
- if(!ascended)
- var/b_loss
- switch (severity)
- if (EXPLODE_DEVASTATE)
- b_loss = 500
- if (EXPLODE_HEAVY)
- b_loss = 150
- if (EXPLODE_LIGHT)
- b_loss = 30
- adjustBruteLoss(b_loss)
- return ..()
-
-
-/mob/living/carbon/true_devil/update_body() //we don't use the bodyparts layer for devils.
- return
-
-/mob/living/carbon/true_devil/update_body_parts()
- return
-
-/mob/living/carbon/true_devil/update_damage_overlays() //devils don't have damage overlays.
- return
diff --git a/code/modules/antagonists/devil/true_devil/inventory.dm b/code/modules/antagonists/devil/true_devil/inventory.dm
deleted file mode 100644
index a3d0dbdf582..00000000000
--- a/code/modules/antagonists/devil/true_devil/inventory.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/mob/living/carbon/true_devil/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
- if(..())
- update_inv_hands()
- return 1
- return 0
-
-/mob/living/carbon/true_devil/update_inv_hands()
- //TODO LORDPIDEY: Figure out how to make the hands line up properly. the l/r_hand_overlay should use the down sprite when facing down, left, or right, and the up sprite when facing up.
- remove_overlay(DEVIL_HANDS_LAYER)
- var/list/hands_overlays = list()
- var/obj/item/l_hand = get_item_for_held_index(1) //hardcoded 2-hands only, for now.
- var/obj/item/r_hand = get_item_for_held_index(2)
-
- if(r_hand)
- var/mutable_appearance/r_hand_overlay = r_hand.build_worn_icon(default_layer = DEVIL_HANDS_LAYER, default_icon_file = r_hand.righthand_file, isinhands = TRUE)
-
- hands_overlays += r_hand_overlay
-
- if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- r_hand.layer = ABOVE_HUD_LAYER
- r_hand.plane = ABOVE_HUD_PLANE
- r_hand.screen_loc = ui_hand_position(get_held_index_of_item(r_hand))
- client.screen |= r_hand
-
- if(l_hand)
- var/mutable_appearance/l_hand_overlay = l_hand.build_worn_icon(default_layer = DEVIL_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE)
-
- hands_overlays += l_hand_overlay
-
- if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- l_hand.layer = ABOVE_HUD_LAYER
- l_hand.plane = ABOVE_HUD_PLANE
- l_hand.screen_loc = ui_hand_position(get_held_index_of_item(l_hand))
- client.screen |= l_hand
- if(hands_overlays.len)
- devil_overlays[DEVIL_HANDS_LAYER] = hands_overlays
- apply_overlay(DEVIL_HANDS_LAYER)
-
-/mob/living/carbon/true_devil/remove_overlay(cache_index)
- var/I = devil_overlays[cache_index]
- if(I)
- cut_overlay(I)
- devil_overlays[cache_index] = null
-
-
-/mob/living/carbon/true_devil/apply_overlay(cache_index)
- if((. = devil_overlays[cache_index]))
- add_overlay(.)
diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm
index cb0cc12be0b..d96e39733ef 100644
--- a/code/modules/antagonists/disease/disease_datum.dm
+++ b/code/modules/antagonists/disease/disease_datum.dm
@@ -86,13 +86,3 @@
/datum/objective/disease_infect_centcom
explanation_text = "Ensure that at least one infected host escapes on the shuttle or an escape pod."
-
-/datum/objective/disease_infect_centcom/check_completion()
- var/mob/camera/disease/D = owner.current
- if(!istype(D))
- return FALSE
- for(var/V in D.hosts)
- var/mob/living/L = V
- if(L.onCentCom() || L.onSyndieBase())
- return TRUE
- return FALSE
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index 25b0b4e1f8c..9b06d144baf 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -7,7 +7,7 @@
name = "Emergency Response Officer"
var/datum/team/ert/ert_team
var/leader = FALSE
- var/datum/outfit/outfit = /datum/outfit/centcom/ert/security
+ var/datum/outfit/outfit = /datum/outfit/job/independent/ert
var/role = "Security Officer"
var/list/name_source
var/random_names = TRUE
@@ -60,9 +60,9 @@
var/missiondesc = "Your team is being sent to [station_name()]. "
if(leader) //If Squad Leader
- missiondesc += " Lead your team to ensure the completion of your objectives."
+ missiondesc += "Lead your team to ensure the completion of your objectives."
else
- missiondesc += " Follow orders given to you by your squad leader."
+ missiondesc += "Follow orders given to you by your squad leader."
if(deathsquad)
missiondesc += "Leave no witnesses."
diff --git a/code/modules/antagonists/ert/frontiersmen.dm b/code/modules/antagonists/ert/frontiersmen.dm
index d6a1a5182cf..da1cb0c6812 100644
--- a/code/modules/antagonists/ert/frontiersmen.dm
+++ b/code/modules/antagonists/ert/frontiersmen.dm
@@ -18,31 +18,53 @@
missiondesc += " Your Mission: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
+/datum/antagonist/ert/frontier/skm
+ outfit = /datum/outfit/job/frontiersmen/ert/skm
+
+/datum/antagonist/ert/frontier/unarmed
+ outfit = /datum/outfit/job/frontiersmen/ert/unarmed
+
/datum/antagonist/ert/frontier/random
outfit = /datum/outfit/job/frontiersmen/ert/random
+// officers
+
/datum/antagonist/ert/frontier/leader
name = "Frontiersmen Officer"
outfit = /datum/outfit/job/frontiersmen/ert/leader
role = "Officer"
-/datum/antagonist/ert/frontier/leader/unnarmed
- outfit = /datum/outfit/job/frontiersmen/ert/leader/unnarmed
+/datum/antagonist/ert/frontier/leader/heavy
+ outfit = /datum/outfit/job/frontiersmen/ert/leader/heavy
+
+/datum/antagonist/ert/frontier/leader/unarmed
+ outfit = /datum/outfit/job/frontiersmen/ert/leader/unarmed
+
+// doctors
/datum/antagonist/ert/frontier/medic
name = "Frontiersmen Medic"
outfit = /datum/outfit/job/frontiersmen/ert/medic
role = "Stretcher-Bearer"
+/datum/antagonist/ert/frontier/medic/heavy
+ outfit = /datum/outfit/job/frontiersmen/ert/medic/heavy
+
+// engineers
+
/datum/antagonist/ert/frontier/engineer
name = "Frontiersmen Engineer"
outfit = /datum/outfit/job/frontiersmen/ert/engineer
role = "Sapper"
-/datum/antagonist/ert/frontier/better
- name = "Frontiersmen Grunt"
- outfit = /datum/outfit/job/frontiersmen/ert/grunt/skm
+// heavy weapons guy
+
+/datum/antagonist/ert/frontier/flamer
+ name = "Frontiersmen Flametrooper"
+ outfit = /datum/outfit/job/frontiersmen/ert/flamer
+ role = "Flametrooper"
-/datum/antagonist/ert/frontier/unnarmed
- name = "Frontiersmen Grunt"
- outfit = /datum/outfit/job/frontiersmen/ert/grunt
+/datum/antagonist/ert/frontier/sentry
+ name = "Frontiersmen Sentry"
+ outfit = /datum/outfit/job/frontiersmen/ert/sentry
+ role = "Sentinel"
diff --git a/code/modules/antagonists/ert/gezena.dm b/code/modules/antagonists/ert/gezena.dm
new file mode 100644
index 00000000000..73ac1eb9ddb
--- /dev/null
+++ b/code/modules/antagonists/ert/gezena.dm
@@ -0,0 +1,29 @@
+/datum/antagonist/ert/gezena
+ name = "PGF Marine"
+ outfit = /datum/outfit/job/gezena/ert
+ role = "Rifleman"
+
+/datum/antagonist/ert/gezena/leader
+ name = "PGF Sergeant"
+ outfit = /datum/outfit/job/gezena/ert/leader
+ role = "Gunnery Sergeant"
+
+/datum/antagonist/ert/gezena/engineer
+ name = "PGF Combat Engineer"
+ outfit = /datum/outfit/job/gezena/ert/engineer
+ role = "Engineer"
+
+/datum/antagonist/ert/gezena/gunner
+ name = "PGF Gunner"
+ outfit = /datum/outfit/job/gezena/ert/gunner
+ role = "Machinegunner"
+
+/datum/antagonist/ert/gezena/medic
+ name = "PGF Corpsman"
+ outfit = /datum/outfit/job/gezena/ert/medic
+ role = "Corpsman"
+
+/datum/antagonist/ert/gezena/inspector
+ name = "PGF Naval Observer"
+ outfit = /datum/outfit/job/gezena/ert/inspector
+ role = "Observer"
diff --git a/code/modules/antagonists/ert/indie.dm b/code/modules/antagonists/ert/indie.dm
index 265af27bd2d..d56a6ea84e7 100644
--- a/code/modules/antagonists/ert/indie.dm
+++ b/code/modules/antagonists/ert/indie.dm
@@ -8,7 +8,7 @@
role = "Security Officer"
/datum/antagonist/ert/independent/greet()
- to_chat(owner, "You are the [name].")
+ to_chat(owner, "You are \a [name].")
var/missiondesc = "You are one of the many Independent contractors, workers and students on [station_name()]. "
if(leader) //If Squad Leader
missiondesc += "Lead your team to complete your objectives."
@@ -23,6 +23,9 @@
outfit = /datum/outfit/job/independent/ert/emt
role = "Paramedic"
+/datum/antagonist/ert/independent/emt/eva
+ outfit = /datum/outfit/job/independent/ert/emt/eva
+
/datum/antagonist/ert/independent/firefighter
name = "Independent Firefighter"
outfit = /datum/outfit/job/independent/ert/firefighter
@@ -42,3 +45,18 @@
name = "Independent Technician"
outfit = /datum/outfit/job/independent/ert/technician
role = "Technician"
+
+/datum/antagonist/ert/independent/deathsquad
+ name = "Deathsquad Commando"
+ outfit = /datum/outfit/job/independent/ert/deathsquad
+ role = "Commando"
+
+/datum/antagonist/ert/independent/pizza
+ name = "Pizza Delivery Worker"
+ outfit = /datum/outfit/job/independent/ert/pizza
+ role = "Delivery Worker"
+
+/datum/antagonist/ert/independent/janitor
+ name = "Independent Sanitation Technician"
+ outfit = /datum/outfit/job/independent/ert/janitor
+ role = "Sanitation Technician"
diff --git a/code/modules/antagonists/ert/inteq.dm b/code/modules/antagonists/ert/inteq.dm
index 591ad684cc1..6666c626c8c 100644
--- a/code/modules/antagonists/ert/inteq.dm
+++ b/code/modules/antagonists/ert/inteq.dm
@@ -1,10 +1,9 @@
/datum/antagonist/ert/inteq
name = "Inteq Mercenary"
- outfit = /datum/outfit/job/inteq/security
+ outfit = /datum/outfit/job/inteq/ert
random_names = TRUE
role = "Enforcer"
-
/datum/antagonist/ert/inteq/greet()
to_chat(owner, "You are the [name].")
var/missiondesc = "You're one of the many mercenaries under the Inteq Risk Management Group sent to [station_name()]. "
@@ -18,7 +17,40 @@
missiondesc += " Contract Terms: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
+/datum/antagonist/ert/inteq/eva
+ outfit = /datum/outfit/job/inteq/ert/eva
+
/datum/antagonist/ert/inteq/leader
name = "Inteq Mercenary Leader"
- outfit = /datum/outfit/job/inteq/captain
+ outfit = /datum/outfit/job/inteq/ert/leader
role = "Vanguard"
+
+/datum/antagonist/ert/inteq/leader/eva
+ outfit = /datum/outfit/job/inteq/ert/leader/eva
+
+/datum/antagonist/ert/inteq/medic
+ name = "Inteq Corpsman"
+ outfit = /datum/outfit/job/inteq/ert/medic
+ role = "Corpsman"
+
+/datum/antagonist/ert/inteq/medic/eva
+ outfit = /datum/outfit/job/inteq/ert/medic/eva
+
+/datum/antagonist/ert/inteq/engineer
+ name = "Inteq Artificer"
+ outfit = /datum/outfit/job/inteq/ert/engineer
+ role = "Artificer"
+
+/datum/antagonist/ert/inteq/engineer/eva
+ outfit = /datum/outfit/job/inteq/ert/engineer/eva
+
+/datum/antagonist/ert/inteq/honor_guard
+ name = "Inteq Honor Guard"
+ outfit = /datum/outfit/job/inteq/ert/honor_guard
+ role = "Guardsman"
+
+/datum/antagonist/ert/inteq/inspector
+ name = "Mothership Investigator"
+ outfit = /datum/outfit/job/inteq/ert/inspector
+ random_names = FALSE
+ role = "Investigator"
diff --git a/code/modules/antagonists/ert/minutemen.dm b/code/modules/antagonists/ert/minutemen.dm
index 069ab6625c3..5e772227fd6 100644
--- a/code/modules/antagonists/ert/minutemen.dm
+++ b/code/modules/antagonists/ert/minutemen.dm
@@ -3,17 +3,20 @@
// ********************************************************************
/datum/antagonist/ert/minutemen
- name = "CLIP Minutemen"
+ name = "C-MM Minuteman"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/armed
role = "Minuteman"
+/datum/antagonist/ert/minutemen/eva
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
+
/datum/antagonist/ert/minutemen/greet()
to_chat(owner, "You are \the [role].")
- var/missiondesc = "You serve in the armed forced of the Confederated League of Independent Planets (CLIP), an independent government. You are being deployed to the sector of [station_name()]. "
+ var/missiondesc = "You serve in the Colonial Minutemen, the armed forces of the Confederated League of Independent Planets. You are being deployed to the sector of [station_name()]. "
if(leader) //If Squad Leader
missiondesc += "Lead your squad to complete all objectives."
else
- missiondesc += "Follow orders given to you by your Leader, the Sergent."
+ missiondesc += "Follow orders given to you by your squadron leader."
if(deathsquad)
missiondesc += "You have been given the order to fire at will."
@@ -21,70 +24,82 @@
to_chat(owner,missiondesc)
/datum/antagonist/ert/minutemen/leader
- name = "CLIP Minutemen Field Sergeant"
+ name = "C-MM Sergeant"
leader = TRUE
outfit = /datum/outfit/job/clip/minutemen/grunt/lead
role = "Sergeant"
+/datum/antagonist/ert/minutemen/leader/eva
+ outfit = /datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit
+
/datum/antagonist/ert/minutemen/corpsman
+ name = "C-MM Field Corpsman"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/med/armed
- role = "Field Corpsman"
+ role = "Corpsman"
/datum/antagonist/ert/minutemen/engi
+ name = "C-MM Field Engineer"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed
- role = "Field Engineer"
+ role = "Engineer"
/datum/antagonist/ert/minutemen/gunner
+ name = "C-MM Machinegunner"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed
role = "Field Gunner"
/datum/antagonist/ert/minutemen/bard
- name = "BARD Infantry"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard
- role = "Minuteman"
+ name = "BARD Field Agent"
+ outfit = /datum/outfit/job/clip/minutemen/bard
+ role = "Agent"
+
+/datum/antagonist/ert/minutemen/bard/emergency
+ name = "BARD Xenofauna Specialist"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency
+ role = "Specialist"
/datum/antagonist/ert/minutemen/bard/flamer
- name = "BARD Flamethrower Infantry"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/flamer
+ name = "BARD Fire Control Specialist"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency/flamer
+ role = "Fire Specialist"
/datum/antagonist/ert/minutemen/bard/medic
- name = "BARD Corpsman"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic
- role = "Corpsman"
+ name = "BARD Medical Aid Specialist"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency/medic
+ role = "Medical Specialist"
-/datum/antagonist/ert/minutemen/bard/leader
- name = "BARD Sergeant"
+/datum/antagonist/ert/minutemen/bard/emergency/leader
+ name = "BARD Master Sergeant"
leader = TRUE
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader
- role = "Sergeant"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency/leader
+ role = "Master Sergeant"
-/datum/antagonist/ert/minutemen/riot
- name = "Riot Officer"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/riot
- role = "Minuteman"
+/datum/antagonist/ert/minutemen/military_police
+ name = "C-MM Military Police"
+ outfit = /datum/outfit/job/clip/minutemen/military_police
+ role = "Officer"
-/datum/antagonist/ert/minutemen/riot/leader
- name = "Riot Sergeant"
+/datum/antagonist/ert/minutemen/military_police/riot
+ outfit = /datum/outfit/job/clip/minutemen/military_police/riot
+
+/datum/antagonist/ert/minutemen/military_police/leader
+ name = "C-MM Chief Military Police"
leader = TRUE
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader
- role = "Sergeant"
+ outfit = /datum/outfit/job/clip/minutemen/military_police/leader
+ role = "Chief Officer"
+
+/datum/antagonist/ert/minutemen/military_police/leader/riot
+ outfit = /datum/outfit/job/clip/minutemen/military_police/leader/riot
-/datum/antagonist/ert/official/minutemen
+/datum/antagonist/ert/minutemen/inspector
name = "GOLD Inspector"
- outfit = /datum/outfit/job/clip/investigator
+ outfit = /datum/outfit/job/clip/investigator/cm5
role = "Lieutenant"
-/datum/antagonist/ert/official/minutemen/greet()
- to_chat(owner, "You are the GOLD Inspector.")
+/datum/antagonist/ert/minutemen/inspector/greet()
+ to_chat(owner, "You are a Labor Division Inspector.")
to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the CLIP Government. Your task: [ert_team.mission.explanation_text]")
-/datum/antagonist/ert/minutemen/eva
- name = "CLIP Minutemen"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
- role = "Minuteman"
-
-/datum/antagonist/ert/minutemen/eva/leader
- name = "CLIP Minutemen Field Sergeant"
- leader = TRUE
- outfit = /datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit
- role = "Sergeant"
+/datum/antagonist/ert/minutemen/correspondant
+ name = "C-MM War Correspondant"
+ outfit = /datum/outfit/job/clip/correspondant
+ role = "Correspondant"
diff --git a/code/modules/antagonists/ert/nanotrasen.dm b/code/modules/antagonists/ert/nanotrasen.dm
index 11537e4bcea..9ea1aa42216 100644
--- a/code/modules/antagonists/ert/nanotrasen.dm
+++ b/code/modules/antagonists/ert/nanotrasen.dm
@@ -1,152 +1,39 @@
-// Official
-/datum/antagonist/ert/official
- name = "CentCom Official"
- show_name_in_check_antagonists = TRUE
- var/datum/objective/mission
- role = "Inspector"
- random_names = FALSE
- outfit = /datum/outfit/centcom/centcom_official
-
-/datum/antagonist/ert/official/greet()
- to_chat(owner, "You are a CentCom Official.")
- if (ert_team)
- to_chat(owner, "Central Command is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
- else
- to_chat(owner, "Central Command is sending you to [station_name()] with the task: [mission.explanation_text]")
-
-/datum/antagonist/ert/official/forge_objectives()
- if (ert_team)
- return ..()
- if(mission)
- return
- var/datum/objective/missionobj = new ()
- missionobj.owner = owner
- missionobj.explanation_text = "Conduct a routine performance review of [station_name()]'s vessels."
- missionobj.completed = TRUE
- mission = missionobj
- objectives |= mission
-
-// Standard ERT
-
-/datum/antagonist/ert/security // kinda handled by the base template but here for completion
-
-/datum/antagonist/ert/security/red
- outfit = /datum/outfit/centcom/ert/security/alert
-
-/datum/antagonist/ert/engineer
- role = "Engineer"
- outfit = /datum/outfit/centcom/ert/engineer
-
-/datum/antagonist/ert/engineer/red
- outfit = /datum/outfit/centcom/ert/engineer/alert
-
-/datum/antagonist/ert/medic
- role = "Medical Officer"
- outfit = /datum/outfit/centcom/ert/medic
-
-/datum/antagonist/ert/medic/red
- outfit = /datum/outfit/centcom/ert/medic/alert
-
-/datum/antagonist/ert/commander
- role = "Commander"
- outfit = /datum/outfit/centcom/ert/commander
-
-/datum/antagonist/ert/commander/red
- outfit = /datum/outfit/centcom/ert/commander/alert
-
-// Deathsquad
-
-/datum/antagonist/ert/deathsquad
- name = "Deathsquad Trooper"
- outfit = /datum/outfit/centcom/death_commando
- role = "Trooper"
- deathsquad = TRUE
-
-/datum/antagonist/ert/deathsquad/leader
- name = "Deathsquad Officer"
- outfit = /datum/outfit/centcom/death_commando
- role = "Officer"
-
-/datum/antagonist/ert/deathsquad/New()
- . = ..()
- name_source = GLOB.commando_names
-
-/datum/antagonist/ert/deathsquad/apply_innate_effects(mob/living/mob_override)
- ADD_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
-
-/datum/antagonist/ert/deathsquad/remove_innate_effects(mob/living/mob_override)
- REMOVE_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
-
-// Janitor
-
-/datum/antagonist/ert/janitor
- role = "Janitor"
- outfit = /datum/outfit/centcom/ert/janitor
-
-/datum/antagonist/ert/janitor/heavy
- role = "Heavy Duty Janitor"
- outfit = /datum/outfit/centcom/ert/janitor/heavy
-
-// Intern
-
-/datum/antagonist/ert/intern
- name = "CentCom Intern"
- outfit = /datum/outfit/centcom/centcom_intern
- random_names = FALSE
- role = "Intern"
-
-/datum/antagonist/ert/intern/leader
- name = "CentCom Head Intern"
- outfit = /datum/outfit/centcom/centcom_intern/leader
- role = "Head Intern"
-
-/datum/antagonist/ert/intern/unarmed
- outfit = /datum/outfit/centcom/centcom_intern/unarmed
-
-/datum/antagonist/ert/intern/leader/unarmed
- outfit = /datum/outfit/centcom/centcom_intern/leader/unarmed
-
-// Marine
-
-/datum/antagonist/ert/marine
- name = "Marine Commander"
- outfit = /datum/outfit/centcom/ert/marine
- role = "Commander"
-
-/datum/antagonist/ert/marine/security
- name = "Marine Heavy"
- outfit = /datum/outfit/centcom/ert/marine/security
- role = "Trooper"
-
-/datum/antagonist/ert/marine/engineer
- name = "Marine Engineer"
- outfit = /datum/outfit/centcom/ert/marine/engineer
- role = "Engineer"
-
-/datum/antagonist/ert/marine/medic
- name = "Marine Medic"
- outfit = /datum/outfit/centcom/ert/marine/medic
- role = "Medical Officer"
-
-// Loss Prevention
-
-/datum/antagonist/ert/lp
- name = "Loss Prevention Security Specialist"
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp
- role = "Security Specialist"
-
-/datum/antagonist/ert/lp/medic
- name = "Loss Prevention Medical Specialist"
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp/medic
- role = "Medical Specialist"
-
-/datum/antagonist/ert/lp/engineer
- name = "Loss Prevention Engineering Specialist"
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp/engineer
- role = "Engineering Specialist"
-
-/datum/antagonist/ert/lp/lieutenant
- name = "Loss Prevention Lieutenant"
- leader = TRUE
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp/lieutenant
- role = "Lieutenant"
+/datum/antagonist/ert/nanotrasen
+ name = "Vigilitas Security Officer"
+ outfit = /datum/outfit/job/nanotrasen/ert
+ role = "Security Officer"
+
+/datum/antagonist/ert/nanotrasen/delivery
+ name = "N+S Cargo Technician"
+ outfit = /datum/outfit/job/nanotrasen/cargo_tech
+ role = "Cargo Technician"
+
+/datum/antagonist/ert/nanotrasen/inspector
+ name = "Nanotrasen Central Command Liaison"
+ outfit = /datum/outfit/job/nanotrasen/ert/inspector
+ role = "Liaison"
+
+// /datum/antagonist/ert/nanotrasen/emergency
+// name = "Vigilitas Response Officer"
+// outfit = /datum/outfit/job/nanotrasen/ert/emergency
+// role = "Response Officer"
+
+/datum/antagonist/ert/nanotrasen/leader
+ name = "Vigilitas Security Corporal"
+ outfit = /datum/outfit/job/nanotrasen/ert/leader
+ role = "Corporal"
+
+// /datum/antagonist/ert/nanotrasen/leader/emergency
+// name = "Vigilitas Response Lieutenant"
+// outfit = /datum/outfit/job/nanotrasen/ert/leader/emergency
+// role = "Lieutenant"
+
+// /datum/antagonist/ert/nanotrasen/medic/emergency
+// name = "Vigilitas Medical Response Officer"
+// outfit = /datum/outfit/job/nanotrasen/ert/medic/emergency
+// role = "Medic"
+
+// /datum/antagonist/ert/nanotrasen/emergency/engineer
+// name = "Vigilitas Engineering Response Officer"
+// outfit = /datum/outfit/job/nanotrasen/ert/emergency/engineer
+// role = "Engineer"
diff --git a/code/modules/antagonists/ert/roumain.dm b/code/modules/antagonists/ert/roumain.dm
new file mode 100644
index 00000000000..d27c8f39e5c
--- /dev/null
+++ b/code/modules/antagonists/ert/roumain.dm
@@ -0,0 +1,50 @@
+/datum/antagonist/ert/roumain
+ name = "Saint-Roumain Hunter"
+ outfit = /datum/outfit/job/roumain/ert
+ role = "Hunter"
+
+/datum/antagonist/ert/roumain/greet()
+ to_chat(owner, "You are the [role].")
+ var/missiondesc = "You are one of the devoted members of the Saint-Roumain Militia. You are being directed to the sector of [station_name()]. "
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your squad to complete all objectives."
+ else
+ missiondesc += "Follow orders given to you by your Leader, the Montage."
+ if(deathsquad)
+ missiondesc += "You have been given the order to fire at will."
+
+ missiondesc += " Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/roumain/vickland
+ outfit = /datum/outfit/job/roumain/ert/vickland
+
+/datum/antagonist/ert/roumain/firestorm
+ outfit = /datum/outfit/job/roumain/ert/firestorm
+
+/datum/antagonist/ert/roumain/scout
+ outfit = /datum/outfit/job/roumain/ert/scout
+
+/datum/antagonist/ert/roumain/leader
+ name = "Saint-Roumain Hunter Montagne"
+ leader = TRUE
+ outfit = /datum/outfit/job/roumain/ert/leader
+ role = "Hunter Montagne"
+
+/datum/antagonist/ert/roumain/leader/colligne
+ name = "Saint-Roumain Hunter Colligne"
+ outfit = /datum/outfit/job/roumain/ert/leader/colligne
+ role = "Hunter clligne"
+
+/datum/antagonist/ert/roumain/leader/twobore
+ outfit = /datum/outfit/job/roumain/ert/leader/twobore
+
+/datum/antagonist/ert/roumain/medic
+ name = "Saint-Roumain Hunter Doctor"
+ outfit = /datum/outfit/job/roumain/ert/medic
+ role = "Doctor"
+
+/datum/antagonist/ert/roumain/engineer
+ name = "Saint-Roumain Machinist"
+ outfit = /datum/outfit/job/roumain/ert/engineer
+ role = "Hunter"
diff --git a/code/modules/antagonists/ert/solgov.dm b/code/modules/antagonists/ert/solgov.dm
index 6868fe9eb9b..c01f88a0096 100644
--- a/code/modules/antagonists/ert/solgov.dm
+++ b/code/modules/antagonists/ert/solgov.dm
@@ -7,14 +7,11 @@
random_names = FALSE
role = "Sonnensöldner"
-/datum/antagonist/ert/official/solgov
+/datum/antagonist/ert/solgov/inspector
name = "SolGov Inspector"
outfit = /datum/outfit/job/solgov/ert/inspector
role = "Solarian Inspector"
-/datum/antagonist/ert/official/solgov/greet()
- to_chat(owner, "You are a Solarian Inspector.")
- if (ert_team)
- to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
- else
- to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [mission.explanation_text]")
+/datum/antagonist/ert/solgov/inspector/greet()
+ to_chat(owner, "You are the Solarian Inspector.")
+ to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
diff --git a/code/modules/antagonists/ert/syndicate.dm b/code/modules/antagonists/ert/syndicate.dm
index ab8fa4abc5f..7f2de02571b 100644
--- a/code/modules/antagonists/ert/syndicate.dm
+++ b/code/modules/antagonists/ert/syndicate.dm
@@ -22,14 +22,23 @@
outfit = /datum/outfit/job/syndicate/ert/leader
role = "Sergeant"
-/datum/antagonist/ert/syndicate/gorlex
- name = "2nd Battlegroup Trooper"
- outfit = /datum/outfit/job/syndicate/ert/gorlex
- role = "Trooper"
+/datum/antagonist/ert/syndicate/inspector
+ name = "ACLF Inspector"
+ outfit = /datum/outfit/job/syndicate/ert/inspector
+ role = "Inspector"
+
+/datum/antagonist/ert/official/syndicate/greet()
+ to_chat(owner, "You are a mid-rank official from the Liberation Front.")
+ to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
-/datum/antagonist/ert/syndicate/gorlex/greet()
+/datum/antagonist/ert/syndicate/ngr
+ name = "Gorlex Republic Serviceman"
+ outfit = /datum/outfit/job/syndicate/ert/ngr
+ role = "Serviceman"
+
+/datum/antagonist/ert/syndicate/ngr/greet()
to_chat(owner, "You are the [name].")
- var/missiondesc = "You're a soldier of the New Gorlex Republic sent to [station_name()]. "
+ var/missiondesc = "You're an enlistee of the New Gorlex Republic sent to [station_name()]. "
if(leader) //If Squad Leader
missiondesc += "Lead your team to ensure the completion of your objectives."
else
@@ -38,26 +47,31 @@
missiondesc += " Your Mission: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
-/datum/antagonist/ert/syndicate/gorlex/pointman
- name = "Gorlex Republic Shotgunner"
- outfit = /datum/outfit/job/syndicate/ert/gorlex/pointman
- role = "Pointman"
+/datum/antagonist/ert/syndicate/ngr/grenadier
+ name = "Gorlex Republic Grenadier"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/grenadier
+ role = "Grenadier"
-/datum/antagonist/ert/syndicate/gorlex/medic
- name = "Gorlex Republic Medic"
- outfit = /datum/outfit/job/syndicate/ert/gorlex/medic
+/datum/antagonist/ert/syndicate/ngr/medic
+ name = "Gorlex Republic Field Medic"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/medic
role = "Medic"
-/datum/antagonist/ert/syndicate/gorlex/sniper
- name = "Gorlex Republic Sniper"
- outfit = /datum/outfit/job/syndicate/ert/gorlex/sniper
+/datum/antagonist/ert/syndicate/ngr/sniper
+ name = "Gorlex Republic Marksman"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/sniper
role = "Marksman"
-/datum/antagonist/ert/syndicate/gorlex/leader
+/datum/antagonist/ert/syndicate/ngr/leader
name = "Gorlex Republic Sergeant"
leader = TRUE
- outfit = /datum/outfit/job/syndicate/ert/gorlex/leader
- role = "Sergeant"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/leader
+ role = "Officer"
+
+/datum/antagonist/ert/syndicate/ngr/inspector
+ name = "Gorlex Republic Official"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/inspector
+ role = "Official"
// cybersun
@@ -73,7 +87,7 @@
missiondesc += "Lead your team to ensure the completion of your objectives."
else
missiondesc += "Follow orders given to you by your Sergeant."
- if(prob(50) && !leader)
+ if(prob(50) && !leader && random_names)
missiondesc += " In addition to your contract with Cybersun, you are also a Gorlex Hardliner. You do not like Cybersun, but you work with them regardless."
missiondesc += " Your Mission: [ert_team.mission.explanation_text]"
@@ -107,16 +121,50 @@
outfit = /datum/outfit/job/syndicate/ert/cybersun/medic/leader
role = "Lead Medical Technician"
-// inspector
+/datum/antagonist/ert/syndicate/cybersun/inspector
+ name = "Cybersun Representative"
+ outfit = /datum/outfit/job/syndicate/ert/cybersun/inspector
+ role = "Representative"
-/datum/antagonist/ert/official/syndicate
- name = "Syndicate Inspector"
- outfit = /datum/outfit/job/syndicate/ert/inspector
- role = "Syndicate Inspector"
+/datum/antagonist/ert/syndicate/hardliner
+ name = "Hardliner Mercenary"
+ outfit = /datum/outfit/job/syndicate/ert/hardliner
+ role = "Mercenary"
-/datum/antagonist/ert/official/syndicate/greet()
- to_chat(owner, "You are a Syndicate Inspector.")
- if (ert_team)
- to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
- else
- to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [mission.explanation_text]")
+/datum/antagonist/ert/syndicate/hardliner/medic
+ name = "Hardliner Medic"
+ outfit = /datum/outfit/job/syndicate/ert/hardliner/medic
+ role = "Medic"
+
+/datum/antagonist/ert/syndicate/hardliner/engineer
+ name = "Hardliner Mechanic"
+ outfit = /datum/outfit/job/syndicate/ert/hardliner/engineer
+ role = "Mechanic"
+
+/datum/antagonist/ert/syndicate/hardliner/leader
+ name = "Hardliner Sergeant"
+ leader = TRUE
+ outfit = /datum/outfit/job/syndicate/ert/hardliner/leader
+ role = "Sergeant"
+
+// ramzi
+
+/datum/antagonist/ert/syndicate/ramzi
+ name = "Ramzi Clique Cell Member"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi
+ role = "Cell Member"
+
+/datum/antagonist/ert/syndicate/ramzi/medic
+ name = "Ramzi Clique Medic"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi/medic
+ role = "Cell Medic"
+
+/datum/antagonist/ert/syndicate/ramzi/demolitionist
+ name = "Ramzi Clique Demolitonist"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi/demolitionist
+ role = "Cell Demolitonist"
+
+/datum/antagonist/ert/syndicate/ramzi/leader
+ name = "Ramzi Clique Cell Leader"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi/leader
+ role = "Cell Leader"
diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm
index 8f73b93f8fd..a1b493b87b7 100644
--- a/code/modules/antagonists/gang/gang.dm
+++ b/code/modules/antagonists/gang/gang.dm
@@ -112,7 +112,6 @@
/obj/item/clothing/under/color/darkgreen,
/obj/item/clothing/neck/scarf/green,
/obj/item/clothing/head/beanie/green,
- /obj/item/clothing/suit/poncho/green,
/obj/item/clothing/mask/bandana/green)
free_clothes = list(/obj/item/clothing/mask/bandana/green,
/obj/item/clothing/under/color/darkgreen,
@@ -286,27 +285,18 @@
gang_id = "YAK"
acceptable_clothes = list(/obj/item/clothing/head/soft/yellow,
/obj/item/clothing/under/costume/yakuza,
- /obj/item/clothing/shoes/yakuza,
/obj/item/clothing/neck/scarf/yellow,
/obj/item/clothing/head/beanie/yellow,
/obj/item/clothing/mask/bandana/gold,
- /obj/item/clothing/head/hardhat,
- /obj/item/clothing/suit/yakuza)
+ /obj/item/clothing/head/hardhat)
free_clothes = list(/obj/item/clothing/under/costume/yakuza,
- /obj/item/clothing/shoes/yakuza,
- /obj/item/clothing/suit/yakuza,
/obj/item/clothing/head/hardhat,
/obj/item/toy/crayon/spraycan)
gang_objective = "The boss is thrilled about this new construction opportunity we've all been given, yadda yadda, look, he knows we're here to expand our business ventures for the clan, but Majima wanted it made VERY clear that we do NOT fuck this station's infrastructure up. If more than 15% of this station is busted when we get the hell out of here, it's your ass on the line."
antag_hud_name = "Tojo"
/datum/antagonist/gang/yakuza/check_gang_objective()
- var/datum/station_state/current_state = new /datum/station_state()
- current_state.count()
- var/station_integrity = min(PERCENT(GLOB.start_state.score(current_state)), 100)
- if(station_integrity < 85)
- return FALSE
- return TRUE
+ CRASH("Sorry this was cruft")
/datum/antagonist/gang/jackbros
name = "Jack Bros"
@@ -315,12 +305,8 @@
gang_id = "JB"
acceptable_clothes = list(/obj/item/clothing/head/soft/blue,
/obj/item/clothing/under/costume/jackbros,
- /obj/item/clothing/shoes/jackbros,
- /obj/item/clothing/head/jackbros,
/obj/item/clothing/mask/bandana/blue)
free_clothes = list(/obj/item/clothing/under/costume/jackbros,
- /obj/item/clothing/shoes/jackbros,
- /obj/item/clothing/head/jackbros,
/obj/item/toy/crayon/spraycan)
gang_objective = "Hee-hello friends! We need to expand our influence, ho! Get a King Frost in as the Captain of this joint! Either get the original Captain on board with the program, or Hee-ho a fellow Jack Frost into the position yourselves!"
antag_hud_name = "JackFrost"
diff --git a/code/modules/antagonists/gang/outfits.dm b/code/modules/antagonists/gang/outfits.dm
index ae16ec95647..f76bf026e12 100644
--- a/code/modules/antagonists/gang/outfits.dm
+++ b/code/modules/antagonists/gang/outfits.dm
@@ -23,7 +23,6 @@
glasses = /obj/item/clothing/glasses/hud/spacecop
ears = /obj/item/radio/headset/headset_sec
mask = null
- head = /obj/item/clothing/head/spacepolice
belt = /obj/item/gun/ballistic/automatic/pistol/candor
r_pocket = /obj/item/lighter
l_pocket = /obj/item/restraints/handcuffs
@@ -31,10 +30,7 @@
backpack_contents = list(/obj/item/storage/box/handcuffs = 1,
/obj/item/storage/box/teargas = 1,
/obj/item/storage/box/flashbangs = 1,
- /obj/item/shield/riot/tele = 1,
- /obj/item/ammo_box/magazine/m45 = 3,
- /obj/item/ammo_box/c45 = 2)
-
+ /obj/item/shield/riot/tele = 1)
/datum/outfit/families_police/beatcop/armored
name = "Families: Armored Beat Cop"
@@ -54,8 +50,7 @@
backpack_contents = list(/obj/item/storage/box/handcuffs = 1,
/obj/item/storage/box/teargas = 1,
/obj/item/storage/box/flashbangs = 1,
- /obj/item/shield/riot/tele = 1,
- /obj/item/storage/box/lethalshot = 2)
+ /obj/item/shield/riot/tele = 1)
/datum/outfit/families_police/beatcop/fbi
name = "Families: Space FBI Officer"
@@ -66,8 +61,7 @@
/obj/item/storage/box/teargas = 1,
/obj/item/storage/box/flashbangs = 1,
/obj/item/shield/riot/tele = 1,
- /obj/item/ammo_box/magazine/smgm9mm = 3,
- /obj/item/ammo_box/c9mm = 2)
+ /obj/item/ammo_box/magazine/smgm9mm = 3)
/datum/outfit/families_police/beatcop/military
name = "Families: Space Military"
diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm
index 19b0cc89152..9f9d4140cc6 100644
--- a/code/modules/antagonists/morph/morph.dm
+++ b/code/modules/antagonists/morph/morph.dm
@@ -16,7 +16,7 @@
status_flags = CANPUSH
pass_flags = PASSTABLE
ventcrawler = VENTCRAWLER_ALWAYS
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxHealth = 150
health = 150
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index 4fcceb227a7..88a3b176a2f 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -87,7 +87,6 @@
C.visible_message("[C] coughs up a half-digested telecrystal","You cough up a half-digested telecrystal!")
break
- CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY))
SSblackbox.record_feedback("amount", "nuclear_challenge_mode", 1)
qdel(src)
@@ -99,9 +98,6 @@
if(GLOB.player_list.len < CHALLENGE_MIN_PLAYERS)
to_chat(user, "The enemy crew is too small to be worth declaring war on.")
return FALSE
- if(!user.onSyndieBase())
- to_chat(user, "You have to be at your base to use this.")
- return FALSE
if(world.time-SSticker.round_start_time > CHALLENGE_TIME_LIMIT)
to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.")
return FALSE
diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
index 64880318566..e18f6ff922e 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
@@ -38,7 +38,7 @@
core = new /obj/item/nuke_core(src)
STOP_PROCESSING(SSobj, core)
update_appearance()
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
previous_level = get_security_level()
/obj/machinery/nuclearbomb/Destroy()
@@ -46,7 +46,7 @@
if(!exploding)
// If we're not exploding, set the alert level back to normal
set_safety()
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
GLOB.nuke_list -= src
QDEL_NULL(countdown)
QDEL_NULL(core)
@@ -436,11 +436,6 @@
else
. = timer_set
-/obj/machinery/nuclearbomb/blob_act(obj/structure/blob/B)
- if(exploding)
- return
- qdel(src)
-
/obj/machinery/nuclearbomb/zap_act(power, zap_flags)
..()
if(zap_flags & ZAP_MACHINE_EXPLOSIVE)
@@ -478,8 +473,6 @@
off_station = NUKE_NEAR_MISS
if((bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE)))
off_station = NUKE_NEAR_MISS
- else if(bomb_location.onSyndieBase())
- off_station = NUKE_SYNDICATE_BASE
else
off_station = NUKE_MISS_STATION
@@ -530,6 +523,10 @@
return TRUE
return ..()
+/obj/machinery/nuclearbomb/beer/empty/Initialize()
+ . = ..()
+ keg.reagent_id = null
+
/obj/machinery/nuclearbomb/beer/actually_explode()
//Unblock roundend, we're not actually exploding.
SSticker.roundend_check_paused = FALSE
@@ -613,10 +610,10 @@ This is here to make the tiles around the station mininuke change when it's arme
/obj/item/disk/nuclear/Initialize()
. = ..()
- AddElement(/datum/element/bed_tuckable, 6, -6, 0)
+ AddElement(/datum/element/bed_tuckable, 6, -6, 0, FALSE, FALSE)
if(!fake)
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
last_disk_move = world.time
START_PROCESSING(SSobj, src)
@@ -663,24 +660,10 @@ This is here to make the tiles around the station mininuke change when it's arme
if(isobserver(user) || HAS_TRAIT(user.mind, TRAIT_DISK_VERIFIER))
. += "The serial numbers on [src] are incorrect."
-/obj/item/disk/nuclear/attackby(obj/item/I, mob/living/user, params)
- if(istype(I, /obj/item/claymore/highlander) && !fake)
- var/obj/item/claymore/highlander/H = I
- if(H.nuke_disk)
- to_chat(user, "Wait... what?")
- qdel(H.nuke_disk)
- H.nuke_disk = null
- return
- user.visible_message("[user] captures [src]!", "You've got the disk! Defend it with your life!")
- forceMove(H)
- H.nuke_disk = src
- return TRUE
- return ..()
-
/obj/item/disk/nuclear/Destroy(force=FALSE)
// respawning is handled in /obj/Destroy()
if(force)
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
. = ..()
/obj/item/disk/nuclear/fake
diff --git a/code/modules/antagonists/nukeop/equipment/pinpointer.dm b/code/modules/antagonists/nukeop/equipment/pinpointer.dm
index b316e60c5e1..c1f9ffa3742 100644
--- a/code/modules/antagonists/nukeop/equipment/pinpointer.dm
+++ b/code/modules/antagonists/nukeop/equipment/pinpointer.dm
@@ -32,7 +32,7 @@
target = null
switch(mode)
if(TRACK_NUKE_DISK)
- var/obj/item/disk/nuclear/N = locate() in GLOB.poi_list
+ var/obj/item/disk/nuclear/N = locate() in SSpoints_of_interest.other_points_of_interest
target = N
if(TRACK_MALF_AI)
for(var/V in GLOB.ai_list)
diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm
index 9f807d9521e..f51c6414245 100644
--- a/code/modules/antagonists/nukeop/nukeop.dm
+++ b/code/modules/antagonists/nukeop/nukeop.dm
@@ -345,7 +345,7 @@
/datum/team/nuclear/antag_listing_entry()
var/disk_report = "Nuclear Disk(s) "
disk_report += "
"
- for(var/obj/item/disk/nuclear/N in GLOB.poi_list)
+ for(var/obj/item/disk/nuclear/N in SSpoints_of_interest.other_points_of_interest)
disk_report += "
[N.name], "
var/atom/disk_loc = N.loc
while(!isturf(disk_loc))
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index 084176f4b8c..d348531bfab 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -36,7 +36,7 @@
response_harm_simple = "punch through"
unsuitable_atmos_damage = 0
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) //I don't know how you'd apply those, but revenants no-sell them anyway.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = INFINITY
harm_intent_damage = 0
@@ -176,9 +176,6 @@
/mob/living/simple_animal/revenant/ex_act(severity, target)
return 1 //Immune to the effects of explosions.
-/mob/living/simple_animal/revenant/blob_act(obj/structure/blob/B)
- return //blah blah blobs aren't in tune with the spirit world, or something.
-
/mob/living/simple_animal/revenant/singularity_act()
return //don't walk into the singularity expecting to find corpses, okay?
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index ca568bce631..c623376dbda 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -248,7 +248,7 @@
qdel(B)
new /obj/effect/temp_visual/revenant(T)
- if(!isplatingturf(T) && !istype(T, /turf/open/floor/engine/cult) && isfloorturf(T) && prob(15))
+ if(!isplatingturf(T) && isfloorturf(T) && prob(15))
var/turf/open/floor/floor = T
if(floor.intact && floor.floor_tile)
new floor.floor_tile(floor)
diff --git a/code/modules/antagonists/santa/santa.dm b/code/modules/antagonists/santa/santa.dm
index 996a53f316d..59c4afa6995 100644
--- a/code/modules/antagonists/santa/santa.dm
+++ b/code/modules/antagonists/santa/santa.dm
@@ -17,11 +17,6 @@
to_chat(owner, "You are Santa! Your objective is to bring joy to the people on this station. You have a magical bag, which generates presents as long as you have it! You can examine the presents to take a peek inside, to make sure that you give the right gift to the right person.")
/datum/antagonist/santa/proc/give_equipment()
- var/mob/living/carbon/human/H = owner.current
- if(istype(H))
- H.equipOutfit(/datum/outfit/santa)
- H.dna.update_dna_identity()
-
owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport/santa)
/datum/antagonist/santa/proc/give_objective()
diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm
index 595fbb27f61..56e5d76fb65 100644
--- a/code/modules/antagonists/slaughter/slaughter.dm
+++ b/code/modules/antagonists/slaughter/slaughter.dm
@@ -23,7 +23,7 @@
attack_sound = 'sound/magic/demon_attack1.ogg'
var/feast_sound = 'sound/magic/demon_consume.ogg'
deathsound = 'sound/magic/demon_dies.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = INFINITY
faction = list("slaughter")
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
deleted file mode 100644
index ea6fe83c8a0..00000000000
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ /dev/null
@@ -1,677 +0,0 @@
-////Deactivated swarmer shell////
-/obj/item/deactivated_swarmer
- name = "deactivated swarmer"
- desc = "A shell of swarmer that was completely powered down. It can no longer activate itself."
- icon = 'icons/mob/swarmer.dmi'
- icon_state = "swarmer_unactivated"
- custom_materials = list(/datum/material/iron=10000, /datum/material/glass=4000)
-
-/obj/effect/mob_spawn/swarmer
- name = "unactivated swarmer"
- desc = "A currently unactivated swarmer. Swarmers can self activate at any time, so it would be wise to immediately dispose of this."
- icon = 'icons/mob/swarmer.dmi'
- icon_state = "swarmer_unactivated"
- density = FALSE
- anchored = FALSE
-
- mob_type = /mob/living/simple_animal/hostile/swarmer
- mob_name = "a swarmer"
- death = FALSE
- roundstart = FALSE
- short_desc = "You are a swarmer, a weapon of a long dead civilization."
- flavour_text = {"
- You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate.
- Clicking on any object will try to consume it, either deconstructing it into its components, destroying it, or integrating any materials it has into you if successful.
- Ctrl-Clicking on a mob will attempt to remove it from the area and place it in a safe environment for storage.
- Objectives:
- 1. Consume resources and replicate until there are no more resources left.
- 2. Ensure that this location is fit for invasion at a later date; do not perform actions that would render it dangerous or inhospitable.
- 3. Biological resources will be harvested at a later date; do not harm them.
- "}
-
-/obj/effect/mob_spawn/swarmer/Initialize()
- . = ..()
- var/area/A = get_area(src)
- if(A)
- notify_ghosts("A swarmer shell has been created in [A.name].", 'sound/effects/bin_close.ogg', source = src, action = NOTIFY_ATTACK, flashwindow = FALSE)
-
-/obj/effect/mob_spawn/swarmer/attack_hand(mob/living/user)
- . = ..()
- if(.)
- return
- to_chat(user, "Picking up the swarmer may cause it to activate. You should be careful about this.")
-
-/obj/effect/mob_spawn/swarmer/attackby(obj/item/W, mob/user, params)
- if(W.tool_behaviour == TOOL_SCREWDRIVER && user.a_intent != INTENT_HARM)
- user.visible_message("[usr.name] deactivates [src].",
- "After some fiddling, you find a way to disable [src]'s power source.",
- "You hear clicking.")
- new /obj/item/deactivated_swarmer(get_turf(src))
- qdel(src)
- else
- ..()
-
-////The Mob itself////
-
-/mob/living/simple_animal/hostile/swarmer
- name = "Swarmer"
- unique_name = 1
- icon = 'icons/mob/swarmer.dmi'
- desc = "Robotic constructs of unknown design, swarmers seek only to consume materials and replicate themselves indefinitely."
- speak_emote = list("tones")
- initial_language_holder = /datum/language_holder/swarmer
- bubble_icon = "swarmer"
- mob_biotypes = MOB_ROBOTIC
- health = 40
- maxHealth = 40
- status_flags = CANPUSH
- icon_state = "swarmer"
- icon_living = "swarmer"
- icon_dead = "swarmer_unactivated"
- icon_gib = null
- wander = 0
- harm_intent_damage = 5
- minbodytemp = 0
- maxbodytemp = 500
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- unsuitable_atmos_damage = 0
- melee_damage_lower = 15
- melee_damage_upper = 15
- melee_damage_type = STAMINA
- damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- hud_possible = list(ANTAG_HUD, DIAG_STAT_HUD, DIAG_HUD)
- obj_damage = 0
- environment_smash = ENVIRONMENT_SMASH_NONE
- attack_verb_continuous = "shocks"
- attack_verb_simple = "shock"
- attack_sound = 'sound/effects/empulse.ogg'
- friendly_verb_continuous = "pinches"
- friendly_verb_simple = "pinch"
- speed = 0
- faction = list("swarmer")
- AIStatus = AI_OFF
- pass_flags = PASSTABLE
- mob_size = MOB_SIZE_TINY
- ventcrawler = VENTCRAWLER_ALWAYS
- ranged = 1
- projectiletype = /obj/projectile/beam/disabler
- ranged_cooldown_time = 20
- projectilesound = 'sound/weapons/taser2.ogg'
- loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/item/stack/ore/bluespace_crystal)
- del_on_death = 1
- deathmessage = "explodes with a sharp pop!"
- light_color = LIGHT_COLOR_CYAN
- hud_type = /datum/hud/swarmer
- speech_span = SPAN_ROBOT
- var/resources = 0 //Resource points, generated by consuming metal/glass
- var/max_resources = 100
-
-/mob/living/simple_animal/hostile/swarmer/Initialize()
- . = ..()
- verbs -= /mob/living/verb/pulled
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_to_hud(src)
-
-/mob/living/simple_animal/hostile/swarmer/med_hud_set_health()
- var/image/holder = hud_list[DIAG_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- holder.icon_state = "huddiag[RoundDiagBar(health/maxHealth)]"
-
-/mob/living/simple_animal/hostile/swarmer/med_hud_set_status()
- var/image/holder = hud_list[DIAG_STAT_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- holder.icon_state = "hudstat"
-
-/mob/living/simple_animal/hostile/swarmer/Stat()
- ..()
- if(statpanel("Status"))
- stat("Resources:",resources)
-
-/mob/living/simple_animal/hostile/swarmer/emp_act()
- . = ..()
- if(. & EMP_PROTECT_SELF)
- return
- if(health > 1)
- adjustHealth(health-1)
- else
- death()
-
-/mob/living/simple_animal/hostile/swarmer/CanAllowThrough(atom/movable/O)
- . = ..()
- if(istype(O, /obj/projectile/beam/disabler))//Allows for swarmers to fight as a group without wasting their shots hitting each other
- return TRUE
- if(isswarmer(O))
- return TRUE
-
-////CTRL CLICK FOR SWARMERS AND SWARMER_ACT()'S////
-/mob/living/simple_animal/hostile/swarmer/AttackingTarget()
- if(!isliving(target))
- return target.swarmer_act(src)
- else
- return ..()
-
-/mob/living/simple_animal/hostile/swarmer/CtrlClickOn(atom/A)
- face_atom(A)
- if(!isturf(loc))
- return
- if(next_move > world.time)
- return
- if(!A.Adjacent(src))
- return
- A.swarmer_act(src)
-
-/atom/proc/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE //return TRUE/FALSE whether or not an AI swarmer should try this swarmer_act() again, NOT whether it succeeded.
-
-/obj/effect/mob_spawn/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.Integrate(src)
- return FALSE //would logically be TRUE, but we don't want AI swarmers eating player spawn chances.
-
-/obj/effect/mob_spawn/swarmer/IntegrateAmount()
- return 50
-
-/turf/closed/indestructible/swarmer_act()
- return FALSE
-
-/obj/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- if(resistance_flags & INDESTRUCTIBLE)
- return FALSE
- for(var/mob/living/L in contents)
- if(!issilicon(L) && !isbrain(L))
- to_chat(S, "An organism has been detected inside this object. Aborting.")
- return FALSE
- return ..()
-
-/obj/item/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- return S.Integrate(src)
-
-/atom/movable/proc/IntegrateAmount()
- return 0
-
-/obj/item/IntegrateAmount() //returns the amount of resources gained when eating this item
- if(custom_materials)
- if(custom_materials[SSmaterials.GetMaterialRef(/datum/material/iron)] || custom_materials[SSmaterials.GetMaterialRef(/datum/material/glass)])
- return 1
- return ..()
-
-/obj/item/gun/swarmer_act()//Stops you from eating the entire armory
- return FALSE
-
-/turf/open/swarmer_act()//ex_act() on turf calls it on its contents, this is to prevent attacking mobs by DisIntegrate()'ing the floor
- return FALSE
-
-/obj/structure/lattice/catwalk/swarmer_catwalk/swarmer_act()
- return FALSE
-
-/obj/structure/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- if(S.AIStatus == AI_ON)
- return FALSE
- else
- return ..()
-
-/obj/effect/swarmer_act()
- return FALSE
-
-/obj/effect/decal/cleanable/robot_debris/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- qdel(src)
- return TRUE
-
-/obj/structure/flora/swarmer_act()
- return FALSE
-
-/turf/open/lava/swarmer_act()
- if(!is_safe())
- new /obj/structure/lattice/catwalk/swarmer_catwalk(src)
- return FALSE
-
-/obj/machinery/atmospherics/swarmer_act()
- return FALSE
-
-/obj/structure/disposalpipe/swarmer_act()
- return FALSE
-
-/obj/machinery/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DismantleMachine(src)
- return TRUE
-
-/obj/machinery/light/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/door/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- var/isonshuttle = istype(get_area(src), /area/shuttle)
- for(var/turf/T in range(1, src))
- var/area/A = get_area(T)
- if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
- to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.")
- S.LoseTarget()
- return FALSE
- else if(istype(A, /area/ship/engineering/engine))
- to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.")
- S.LoseTarget()
- return FALSE
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/camera/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- if(!QDELETED(S)) //If it got blown up no need to turn it off.
- toggle_cam(S, 0)
- return TRUE
-
-/obj/machinery/particle_accelerator/control_box/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/gravity_generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/vending/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//It's more visually interesting than dismantling the machine
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/turretid/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisIntegrate(src)
- return TRUE
-
-/obj/machinery/chem_dispenser/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "The volatile chemicals in this machine would destroy us. Aborting.")
- return FALSE
-
-/obj/machinery/nuclearbomb/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This device's destruction would result in the extermination of everything in the area. Aborting.")
- return FALSE
-
-/obj/effect/rune/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Searching... sensor malfunction! Target lost. Aborting.")
- return FALSE
-
-/obj/structure/reagent_dispensers/fueltank/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Destroying this object would cause a chain reaction. Aborting.")
- return FALSE
-
-/obj/structure/cable/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.")
- return FALSE
-
-/obj/machinery/portable_atmospherics/canister/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "An inhospitable area may be created as a result of destroying this object. Aborting.")
- return FALSE
-
-/obj/machinery/telecomms/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.")
- return FALSE
-
-/obj/machinery/deepfryer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This kitchen appliance should be preserved, it will make delicious unhealthy snacks for our masters in the future. Aborting.")
- return FALSE
-
-/obj/machinery/power/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.")
- return FALSE
-
-/obj/machinery/gateway/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This bluespace source will be important to us later. Aborting.")
- return FALSE
-
-/turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- var/isonshuttle = istype(loc, /area/shuttle)
- for(var/turf/T in range(1, src))
- var/area/A = get_area(T)
- if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
- to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.")
- S.LoseTarget()
- return TRUE
- else if(istype(A, /area/ship/engineering/engine))
- to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.")
- S.LoseTarget()
- return TRUE
- return ..()
-
-/obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- var/isonshuttle = istype(get_area(src), /area/shuttle)
- for(var/turf/T in range(1, src))
- var/area/A = get_area(T)
- if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
- to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.")
- S.LoseTarget()
- return TRUE
- else if(istype(A, /area/ship/engineering/engine))
- to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.")
- S.LoseTarget()
- return TRUE
- return ..()
-
-/obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource
- to_chat(S, "This object does not contain enough materials to work with.")
- return FALSE
-
-/obj/machinery/porta_turret/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")
- return FALSE
-
-/obj/machinery/porta_turret_cover/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")
- return FALSE
-
-/mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- S.DisperseTarget(src)
- return TRUE
-
-/mob/living/simple_animal/slime/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This biological resource is somehow resisting our bluespace transceiver. Aborting.")
- return FALSE
-
-/obj/machinery/droneDispenser/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This object is receiving unactivated swarmer shells to help us. Aborting.")
- return FALSE
-
-/obj/structure/lattice/catwalk/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- . = ..()
- var/turf/here = get_turf(src)
- for(var/A in here.contents)
- var/obj/structure/cable/C = A
- if(istype(C))
- to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.")
- return FALSE
-
-/obj/item/deactivated_swarmer/IntegrateAmount()
- return 50
-
-/obj/machinery/hydroponics/soil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This object does not contain enough materials to work with.")
- return FALSE
-
-/obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Destroying this object would cause a catastrophic chain reaction. Aborting.")
- return FALSE
-
-/obj/machinery/field/containment/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This object does not contain solid matter. Aborting.")
- return FALSE
-
-/obj/machinery/power/shieldwallgen/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "Destroying this object would have an unpredictable effect on structure integrity. Aborting.")
- return FALSE
-
-/obj/machinery/shieldwall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
- to_chat(S, "This object does not contain solid matter. Aborting.")
- return FALSE
-
-////END CTRL CLICK FOR SWARMERS////
-
-/mob/living/simple_animal/hostile/swarmer/proc/Fabricate(atom/fabrication_object,fabrication_cost = 0)
- if(!isturf(loc))
- to_chat(src, "This is not a suitable location for fabrication. We need more space.")
- if(resources >= fabrication_cost)
- resources -= fabrication_cost
- else
- to_chat(src, "You do not have the necessary resources to fabricate this object.")
- return
- return new fabrication_object(loc)
-
-/mob/living/simple_animal/hostile/swarmer/proc/Integrate(atom/movable/target)
- var/resource_gain = target.IntegrateAmount()
- if(resources + resource_gain > max_resources)
- to_chat(src, "We cannot hold more materials!")
- return TRUE
- if(resource_gain)
- resources += resource_gain
- do_attack_animation(target)
- changeNext_move(CLICK_CD_MELEE)
- var/obj/effect/temp_visual/swarmer/integrate/I = new /obj/effect/temp_visual/swarmer/integrate(get_turf(target))
- I.pixel_x = target.pixel_x
- I.pixel_y = target.pixel_y
- I.pixel_z = target.pixel_z
- if(istype(target, /obj/item/stack))
- var/obj/item/stack/S = target
- S.use(1)
- if(S.amount)
- return TRUE
- qdel(target)
- return TRUE
- else
- to_chat(src, "[target] is incompatible with our internal matter recycler.")
- return FALSE
-
-
-/mob/living/simple_animal/hostile/swarmer/proc/DisIntegrate(atom/movable/target)
- new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target))
- do_attack_animation(target)
- changeNext_move(CLICK_CD_MELEE)
- SSexplosions.lowobj += target
-
-/mob/living/simple_animal/hostile/swarmer/proc/DisperseTarget(mob/living/target)
- if(target == src)
- return
-
- to_chat(src, "Attempting to remove this being from our presence.")
-
- if(!do_after(src, 3 SECONDS, target))
- return
-
- var/turf/open/floor/F
- F = find_safe_turf(zlevels = z, extended_safety_checks = TRUE)
-
- if(!F)
- return
- // If we're getting rid of a human, slap some energy cuffs on
- // them to keep them away from us a little longer
-
- var/mob/living/carbon/human/H = target
- if(ishuman(target) && (!H.handcuffed))
- H.handcuffed = new /obj/item/restraints/handcuffs/energy/used(H)
- H.update_handcuffed()
- log_combat(src, H, "handcuffed")
-
- var/datum/effect_system/spark_spread/S = new
- S.set_up(4,0,get_turf(target))
- S.start()
- playsound(src,'sound/effects/sparks4.ogg',50,TRUE)
- do_teleport(target, F, 0, channel = TELEPORT_CHANNEL_BLUESPACE)
-
-/mob/living/simple_animal/hostile/swarmer/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
- if(!(flags & SHOCK_TESLA))
- return FALSE
- return ..()
-
-/mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(obj/machinery/target)
- do_attack_animation(target)
- to_chat(src, "We begin to dismantle this machine. We will need to be uninterrupted.")
- var/obj/effect/temp_visual/swarmer/dismantle/D = new /obj/effect/temp_visual/swarmer/dismantle(get_turf(target))
- D.pixel_x = target.pixel_x
- D.pixel_y = target.pixel_y
- D.pixel_z = target.pixel_z
- if(do_after(src, 10 SECONDS, target))
- to_chat(src, "Dismantling complete.")
- var/atom/Tsec = target.drop_location()
- new /obj/item/stack/sheet/metal(Tsec, 5)
- for(var/obj/item/I in target.component_parts)
- I.forceMove(Tsec)
- var/obj/effect/temp_visual/swarmer/disintegration/N = new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target))
- N.pixel_x = target.pixel_x
- N.pixel_y = target.pixel_y
- N.pixel_z = target.pixel_z
- target.dropContents()
- if(istype(target, /obj/machinery/computer))
- var/obj/machinery/computer/C = target
- if(C.circuit)
- C.circuit.forceMove(Tsec)
- qdel(target)
-
-
-/obj/effect/temp_visual/swarmer //temporary swarmer visual feedback objects
- icon = 'icons/mob/swarmer.dmi'
- layer = BELOW_MOB_LAYER
-
-/obj/effect/temp_visual/swarmer/disintegration
- icon_state = "disintegrate"
- duration = 10
-
-/obj/effect/temp_visual/swarmer/disintegration/Initialize()
- . = ..()
- playsound(loc, "sparks", 100, TRUE)
-
-/obj/effect/temp_visual/swarmer/dismantle
- icon_state = "dismantle"
- duration = 25
-
-/obj/effect/temp_visual/swarmer/integrate
- icon_state = "integrate"
- duration = 5
-
-/obj/structure/swarmer //Default swarmer effect object visual feedback
- name = "swarmer ui"
- desc = null
- gender = NEUTER
- icon = 'icons/mob/swarmer.dmi'
- icon_state = "ui_light"
- layer = MOB_LAYER
- resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
- light_color = LIGHT_COLOR_CYAN
- max_integrity = 30
- anchored = TRUE
- var/lon_range = 1
-
-/obj/structure/swarmer/Initialize(mapload)
- . = ..()
- set_light(lon_range)
-
-/obj/structure/swarmer/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
- switch(damage_type)
- if(BRUTE)
- playsound(src, 'sound/weapons/egloves.ogg', 80, TRUE)
- if(BURN)
- playsound(src, 'sound/items/welder.ogg', 100, TRUE)
-
-/obj/structure/swarmer/emp_act()
- . = ..()
- if(. & EMP_PROTECT_SELF)
- return
- qdel(src)
-
-/obj/structure/swarmer/trap
- name = "swarmer trap"
- desc = "A quickly assembled trap that electrifies living beings and overwhelms machine sensors. Will not retain its form if damaged enough."
- icon_state = "trap"
- max_integrity = 10
- density = FALSE
-
-/obj/structure/swarmer/trap/Initialize(mapload)
- . = ..()
- var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
- )
- AddElement(/datum/element/connect_loc, loc_connections)
-
-/obj/structure/swarmer/trap/proc/on_entered(datum/source, atom/movable/AM)
- SIGNAL_HANDLER
- if(isliving(AM))
- var/mob/living/L = AM
- if(!istype(L, /mob/living/simple_animal/hostile/swarmer))
- playsound(loc,'sound/effects/snap.ogg',50, TRUE, -1)
- L.electrocute_act(0, src, 1, flags = SHOCK_NOGLOVES|SHOCK_ILLUSION)
- if(iscyborg(L))
- L.Paralyze(100)
- qdel(src)
-
-/mob/living/simple_animal/hostile/swarmer/proc/CreateTrap()
- set name = "Create trap"
- set category = "Swarmer"
- set desc = "Creates a simple trap that will non-lethally electrocute anything that steps on it. Costs 5 resources."
- if(locate(/obj/structure/swarmer/trap) in loc)
- to_chat(src, "There is already a trap here. Aborting.")
- return
- Fabricate(/obj/structure/swarmer/trap, 5)
-
-
-/mob/living/simple_animal/hostile/swarmer/proc/CreateBarricade()
- set name = "Create barricade"
- set category = "Swarmer"
- set desc = "Creates a barricade that will stop anything but swarmers and disabler beams from passing through."
- if(locate(/obj/structure/swarmer/blockade) in loc)
- to_chat(src, "There is already a blockade here. Aborting.")
- return
- if(resources < 5)
- to_chat(src, "We do not have the resources for this!")
- return
- if(do_after(src, 1 SECONDS))
- Fabricate(/obj/structure/swarmer/blockade, 5)
-
-
-/obj/structure/swarmer/blockade
- name = "swarmer blockade"
- desc = "A quickly assembled energy blockade. Will not retain its form if damaged enough, but disabler beams and swarmers pass right through."
- icon_state = "barricade"
- light_range = MINIMUM_USEFUL_LIGHT_RANGE
- max_integrity = 50
-
-/obj/structure/swarmer/blockade/CanAllowThrough(atom/movable/O)
- . = ..()
- if(isswarmer(O))
- return TRUE
- if(istype(O, /obj/projectile/beam/disabler))
- return TRUE
-
-/mob/living/simple_animal/hostile/swarmer/proc/CreateSwarmer()
- set name = "Replicate"
- set category = "Swarmer"
- set desc = "Creates a shell for a new swarmer. Swarmers will self activate."
- to_chat(src, "We are attempting to replicate ourselves. We will need to stand still until the process is complete.")
- if(resources < 50)
- to_chat(src, "We do not have the resources for this!")
- return
- if(!isturf(loc))
- to_chat(src, "This is not a suitable location for replicating ourselves. We need more room.")
- return
- if(do_after(src, 10 SECONDS))
- var/createtype = SwarmerTypeToCreate()
- if(createtype && Fabricate(createtype, 50))
- playsound(loc,'sound/items/poster_being_created.ogg',50, TRUE, -1)
-
-
-/mob/living/simple_animal/hostile/swarmer/proc/SwarmerTypeToCreate()
- return /obj/effect/mob_spawn/swarmer
-
-
-/mob/living/simple_animal/hostile/swarmer/proc/RepairSelf()
- set name = "Self Repair"
- set category = "Swarmer"
- set desc = "Attempts to repair damage to our body. You will have to remain motionless until repairs are complete."
- if(!isturf(loc))
- return
- to_chat(src, "Attempting to repair damage to our body, stand by...")
- if(do_after(src, 10 SECONDS))
- adjustHealth(-100)
- to_chat(src, "We successfully repaired ourselves.")
-
-/mob/living/simple_animal/hostile/swarmer/proc/ToggleLight()
- if(!light_range)
- set_light(3)
- else
- set_light(0)
-
-/mob/living/simple_animal/hostile/swarmer/proc/swarmer_chat(msg)
- var/rendered = "Swarm communication - [src] [say_quote(msg)]"
- for(var/i in GLOB.mob_list)
- var/mob/M = i
- if(isswarmer(M))
- to_chat(M, rendered)
- if(isobserver(M))
- var/link = FOLLOW_LINK(M, src)
- to_chat(M, "[link] [rendered]")
-
-/mob/living/simple_animal/hostile/swarmer/proc/ContactSwarmers()
- var/message = stripped_input(src, "Announce to other swarmers", "Swarmer contact")
- // TODO get swarmers their own colour rather than just boldtext
- if(message)
- swarmer_chat(message)
diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm
deleted file mode 100644
index e086485a49c..00000000000
--- a/code/modules/antagonists/swarmer/swarmer_event.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/datum/round_event_control/spawn_swarmer
- name = "Spawn Swarmer Shell"
- typepath = /datum/round_event/spawn_swarmer
- weight = 7
- max_occurrences = 1 //Only once okay fam
- earliest_start = 30 MINUTES
- min_players = 15
-
-
-/datum/round_event/spawn_swarmer
-
-/datum/round_event/spawn_swarmer/start()
- if(find_swarmer())
- return 0
- if(!GLOB.the_gateway)
- return 0
- new /obj/effect/mob_spawn/swarmer(get_turf(GLOB.the_gateway))
- if(prob(25)) //25% chance to announce it to the crew
- var/swarmer_report = "[command_name()] High-Priority Update"
- swarmer_report += "
Our long-range sensors have detected an odd signal emanating from your station's gateway. We recommend immediate investigation of your gateway, as something may have come through."
- print_command_report(swarmer_report, announce=TRUE)
-
-/datum/round_event/spawn_swarmer/proc/find_swarmer()
- for(var/i in GLOB.mob_living_list)
- var/mob/living/L = i
- if(istype(L, /mob/living/simple_animal/hostile/swarmer) && L.client) //If there is a swarmer with an active client, we've found our swarmer
- return 1
- return 0
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index ff7ddace1d4..4f5e7bc161c 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -741,21 +741,6 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module))
unlock_text = replacetext(unlock_text, "CAMSUPGRADED", "[upgraded_cameras]") //This works, since unlock text is called after upgrade()
-/// AI Turret Upgrade: Increases the health and damage of all turrets.
-/datum/AI_Module/upgrade/upgrade_turrets
- name = "AI Turret Upgrade"
- description = "Improves the power and health of all AI turrets. This effect is permanent. Upgrade is done immediately upon purchase."
- cost = 30
- upgrade = TRUE
- unlock_text = "You establish a power diversion to your turrets, upgrading their health and damage."
- unlock_sound = 'sound/items/rped.ogg'
-
-/datum/AI_Module/upgrade/upgrade_turrets/upgrade(mob/living/silicon/ai/AI)
- for(var/obj/machinery/porta_turret/ai/turret in GLOB.machines)
- turret.obj_integrity += 30
- turret.lethal_projectile = /obj/projectile/beam/laser/heavylaser //Once you see it, you will know what it means to FEAR.
- turret.lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
-
/// Enhanced Surveillance: Enables AI to hear conversations going on near its active vision.
/datum/AI_Module/upgrade/eavesdrop
name = "Enhanced Surveillance"
diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm
index d6bbba35930..f90d0fb7218 100644
--- a/code/modules/antagonists/traitor/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/syndicate_contract.dm
@@ -149,7 +149,7 @@
C = H.get_bankcard()
if(C && C.registered_account)
- C.registered_account.adjust_money(ransom * 0.35, "syndicate_contract")
+ C.registered_account.adjust_money(ransom * 0.35, CREDIT_LOG_SYNDICATE_CONTRACT)
C.registered_account.bank_card_talk("We've processed the ransom, agent. Here's your cut - your balance is now \
[C.registered_account.account_balance] cr.", TRUE)
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index a20b905b590..fc6af55b3b4 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -257,10 +257,9 @@
var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionnaire)
H.equip_to_slot_or_del(new hat(H), ITEM_SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING)
- H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET)
H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
- H.put_in_hands(new /obj/item/claymore(H), TRUE)
- H.equip_to_slot_or_del(new /obj/item/spear(H), ITEM_SLOT_BACK)
+ H.put_in_hands(new /obj/item/melee/sword/claymore(H), TRUE)
+ H.equip_to_slot_or_del(new /obj/item/melee/spear(H), ITEM_SLOT_BACK)
/obj/item/voodoo
@@ -283,7 +282,7 @@
if(target && cooldown < world.time)
if(I.get_temperature())
to_chat(target, "You suddenly feel very hot!")
- target.adjust_bodytemperature(50)
+ target.adjust_bodytemperature(10)
GiveHint(target)
else if(is_pointed(I))
to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!")
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
deleted file mode 100644
index c426b953f72..00000000000
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ /dev/null
@@ -1,354 +0,0 @@
-/obj/item/soulstone
- name = "soulstone shard"
- icon = 'icons/obj/wizard.dmi'
- icon_state = "soulstone"
- item_state = "electronic"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- layer = HIGH_OBJ_LAYER
- desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefact's power."
- w_class = WEIGHT_CLASS_TINY
- slot_flags = ITEM_SLOT_BELT
- var/usability = FALSE
-
- var/old_shard = FALSE
- var/spent = FALSE
- var/purified = FALSE
-
-/obj/item/soulstone/proc/was_used()
- if(old_shard)
- spent = TRUE
- name = "dull [name]"
- desc = "A fragment of the legendary treasure known simply as \
- the 'Soul Stone'. The shard lies still, dull and lifeless; \
- whatever spark it once held long extinguished."
-
-/obj/item/soulstone/anybody
- usability = TRUE
-
-/obj/item/soulstone/anybody/revolver
- old_shard = TRUE
-
-/obj/item/soulstone/anybody/purified
- icon = 'icons/obj/wizard.dmi'
- icon_state = "purified_soulstone"
- purified = TRUE
-
-/obj/item/soulstone/anybody/chaplain
- name = "mysterious old shard"
- old_shard = TRUE
-
-/obj/item/soulstone/pickup(mob/living/user)
- ..()
- if(!iscultist(user) && !iswizard(user) && !usability)
- to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.")
-
-/obj/item/soulstone/examine(mob/user)
- . = ..()
- if(usability || iscultist(user) || iswizard(user) || isobserver(user))
- if (old_shard)
- . += "A soulstone, used to capture a soul, either from dead humans or from freed shades."
- else
- . += "A soulstone, used to capture souls, either from unconscious or sleeping humans or from freed shades."
- . += "The captured soul can be placed into a construct shell to produce a construct, or released from the stone as a shade."
- if(spent)
- . += "This shard is spent; it is now just a creepy rock."
-
-/obj/item/soulstone/Destroy() //Stops the shade from being qdel'd immediately and their ghost being sent back to the arrival shuttle.
- for(var/mob/living/simple_animal/shade/A in src)
- A.death()
- return ..()
-
-/obj/item/soulstone/proc/hot_potato(mob/living/user)
- to_chat(user, "Holy magics residing in \the [src] burn your hand!")
- var/obj/item/bodypart/affecting = user.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm")
- affecting.receive_damage(0, 10) // 10 burn damage
- user.emote("scream")
- user.update_damage_overlays()
- user.dropItemToGround(src)
-
-//////////////////////////////Capturing////////////////////////////////////////////////////////
-
-/obj/item/soulstone/attack(mob/living/carbon/human/M, mob/living/user)
- if(!iscultist(user) && !iswizard(user) && !usability)
- user.Unconscious(100)
- to_chat(user, "Your body is wracked with debilitating pain!")
- return
- if(spent)
- to_chat(user, "There is no power left in the shard.")
- return
- if(!ishuman(M))//If target is not a human.
- return ..()
- if((M.mind && !M.mind.hasSoul) || is_devil(M))
- to_chat(user, "This... thing has no soul! It's filled with evil!")
- return
- if(iscultist(M))
- if(iscultist(user))
- to_chat(user, "\"Come now, do not capture your bretheren's soul.\"")
- return
- if(purified && iscultist(user))
- hot_potato(user)
- return
- log_combat(user, M, "captured [M.name]'s soul", src)
- transfer_soul("VICTIM", M, user)
-
-///////////////////Options for using captured souls///////////////////////////////////////
-
-/obj/item/soulstone/attack_self(mob/living/user)
- if(!in_range(src, user))
- return
- if(!iscultist(user) && !iswizard(user) && !usability)
- user.Unconscious(100)
- to_chat(user, "Your body is wracked with debilitating pain!")
- return
- if(purified && iscultist(user))
- hot_potato(user)
- return
- release_shades(user)
-
-/obj/item/soulstone/proc/release_shades(mob/user)
- for(var/mob/living/simple_animal/shade/A in src)
- A.forceMove(get_turf(user))
- A.cancel_camera()
- if(purified)
- icon_state = "purified_soulstone"
- A.icon_state = "shade_angelic"
- A.name = "Purified [initial(A.name)]"
- else
- icon_state = "soulstone"
- name = initial(name)
- if(iswizard(user) || usability)
- to_chat(A, "You have been released from your prison, but you are still bound to [user.real_name]'s will. Help [user.p_them()] succeed in [user.p_their()] goals at all costs.")
- else if(iscultist(user))
- to_chat(A, "You have been released from your prison, but you are still bound to the cult's will. Help them succeed in their goals at all costs.")
- was_used()
-
-///////////////////////////Transferring to constructs/////////////////////////////////////////////////////
-/obj/structure/constructshell
- name = "empty shell"
- icon = 'icons/obj/wizard.dmi'
- icon_state = "construct_cult"
- desc = "A wicked machine used by those skilled in magical arts. It is inactive."
-
-/obj/structure/constructshell/examine(mob/user)
- . = ..()
- if(iscultist(user) || iswizard(user) || user.stat == DEAD)
- . += {"A construct shell, used to house bound souls from a soulstone.\n
- Placing a soulstone with a soul into this shell allows you to produce your choice of the following:\n
- An Artificer, which can produce more shells and soulstones, as well as fortifications.\n
- A Wraith, which does high damage and can jaunt through walls, though it is quite fragile.\n
- A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow."}
-
-/obj/structure/constructshell/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/soulstone))
- var/obj/item/soulstone/SS = O
- if(!iscultist(user) && !iswizard(user) && !SS.purified)
- to_chat(user, "An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly.")
- user.Dizzy(30)
- return
- if(SS.purified && iscultist(user))
- SS.hot_potato(user)
- return
- SS.transfer_soul("CONSTRUCT",src,user)
- SS.was_used()
- else
- return ..()
-
-////////////////////////////Proc for moving soul in and out off stone//////////////////////////////////////
-
-
-/obj/item/soulstone/proc/transfer_soul(choice as text, target, mob/user)
- switch(choice)
- if("FORCE")
- if(!iscarbon(target)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul
- return FALSE
- if(contents.len)
- return FALSE
- var/mob/living/carbon/T = target
- if(T.client != null)
- for(var/obj/item/W in T)
- T.dropItemToGround(W)
- init_shade(T, user)
- return TRUE
- else
- to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...")
- return getCultGhost(T,user)
-
- if("VICTIM")
- var/mob/living/carbon/human/T = target
- var/datum/antagonist/cult/C = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(C && C.cult_team.is_sacrifice_target(T.mind))
- if(iscultist(user))
- to_chat(user, "\"This soul is mine.SACRIFICE THEM!\"")
- else
- to_chat(user, "The soulstone seems to reject this soul.")
- return FALSE
- if(contents.len)
- to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.")
- else
- if((!old_shard && T.stat != CONSCIOUS) || (old_shard && T.stat == DEAD))
- if(T.client == null)
- to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...")
- getCultGhost(T,user)
- else
- for(var/obj/item/W in T)
- T.dropItemToGround(W)
- init_shade(T, user, message_user = 1)
- qdel(T)
- else
- to_chat(user, "Capture failed!: Kill or maim the victim first!")
-
- if("SHADE")
- var/mob/living/simple_animal/shade/T = target
- if(contents.len)
- to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.")
- else
- T.AddComponent(/datum/component/soulstoned, src)
- if(purified)
- icon_state = "purified_soulstone2"
- if(iscultist(T))
- SSticker.mode.remove_cultist(T.mind, FALSE, FALSE)
- else
- icon_state = "soulstone2"
- name = "soulstone: Shade of [T.real_name]"
- to_chat(T, "Your soul has been captured by the soulstone. Its arcane energies are reknitting your ethereal form.")
- if(user != T)
- to_chat(user, "Capture successful!: [T.real_name]'s soul has been captured and stored within the soulstone.")
-
- if("CONSTRUCT")
- var/obj/structure/constructshell/T = target
- var/mob/living/simple_animal/shade/A = locate() in src
- if(A)
- var/list/constructs = list(
- "Juggernaut" = image(icon = 'icons/mob/cult.dmi', icon_state = "juggernaut"),
- "Wraith" = image(icon = 'icons/mob/cult.dmi', icon_state = "wraith"),
- "Artificer" = image(icon = 'icons/mob/cult.dmi', icon_state = "artificer")
- )
- var/construct_class = show_radial_menu(user, src, constructs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
- if(!T || !T.loc)
- return
- switch(construct_class)
- if("Juggernaut")
- if(iscultist(user) || iswizard(user))
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/juggernaut, A, user, 0, T.loc)
- else
- if(purified)
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/juggernaut/angelic, A, user, 0, T.loc)
- else
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/juggernaut/noncult, A, user, 0, T.loc)
- if("Wraith")
- if(iscultist(user) || iswizard(user))
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/wraith, A, user, 0, T.loc)
- else
- if(purified)
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/wraith/angelic, A, user, 0, T.loc)
- else
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/wraith/noncult, A, user, 0, T.loc)
- if("Artificer")
- if(iscultist(user) || iswizard(user))
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/artificer, A, user, 0, T.loc)
- else
- if(purified)
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/artificer/angelic, A, user, 0, T.loc)
- else
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/artificer/noncult, A, user, 0, T.loc)
- else
- return
- for(var/datum/mind/B in SSticker.mode.cult)
- if(B == A.mind)
- SSticker.mode.remove_cultist(A.mind)
- qdel(T)
- qdel(src)
- else
- to_chat(user, "Creation failed!: The soul stone is empty! Go kill someone!")
-
-/obj/item/soulstone/proc/check_menu(mob/user)
- if(!istype(user))
- return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
- return FALSE
- return TRUE
-
-/proc/makeNewConstruct(mob/living/simple_animal/hostile/construct/ctype, mob/target, mob/stoner = null, cultoverride = 0, loc_override = null)
- if(QDELETED(target))
- return
- var/mob/living/simple_animal/hostile/construct/newstruct = new ctype((loc_override) ? (loc_override) : (get_turf(target)))
- var/makeicon = newstruct.icon_state
- var/holyness = newstruct.holy
- flick("make_[makeicon][holyness]", newstruct)
- playsound(newstruct, 'sound/effects/constructform.ogg', 50)
- if(stoner)
- newstruct.faction |= "[REF(stoner)]"
- newstruct.master = stoner
- var/datum/action/innate/seek_master/SM = new()
- SM.Grant(newstruct)
- newstruct.key = target.key
- var/atom/movable/screen/alert/bloodsense/BS
- if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker && SSticker.mode)
- SSticker.mode.add_cultist(newstruct.mind, 0)
- if(iscultist(stoner) || cultoverride)
- to_chat(newstruct, "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow [stoner ? stoner.p_their() : "their"] orders and help [stoner ? stoner.p_them() : "them"] complete [stoner ? stoner.p_their() : "their"] goals at all costs.")
- else if(stoner)
- to_chat(newstruct, "You are still bound to serve your creator, [stoner], follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
- newstruct.clear_alert("bloodsense")
- BS = newstruct.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense)
- if(BS)
- BS.Cviewer = newstruct
- newstruct.cancel_camera()
-
-
-/obj/item/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/user, message_user = 0 , mob/shade_controller)
- if(!shade_controller)
- shade_controller = T
- new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton
- T.stop_sound_channel(CHANNEL_HEARTBEAT)
- T.invisibility = INVISIBILITY_ABSTRACT
- T.dust_animation()
- var/mob/living/simple_animal/shade/S = new /mob/living/simple_animal/shade(src)
- S.AddComponent(/datum/component/soulstoned, src)
- S.name = "Shade of [T.real_name]"
- S.real_name = "Shade of [T.real_name]"
- S.key = shade_controller.key
- S.copy_languages(T, LANGUAGE_MIND)//Copies the old mobs languages into the new mob holder.
- S.copy_languages(user, LANGUAGE_MASTER)
- S.update_atom_languages()
- grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue
- if(user)
- S.faction |= "[REF(user)]" //Add the master as a faction, allowing inter-mob cooperation
- if(user && iscultist(user))
- SSticker.mode.add_cultist(S.mind, 0)
- S.cancel_camera()
- name = "soulstone: Shade of [T.real_name]"
- if(purified)
- icon_state = "purified_soulstone2"
- else
- icon_state = "soulstone2"
- if(user && (iswizard(user) || usability))
- to_chat(S, "Your soul has been captured! You are now bound to [user.real_name]'s will. Help [user.p_them()] succeed in [user.p_their()] goals at all costs.")
- else if(user && iscultist(user))
- to_chat(S, "Your soul has been captured! You are now bound to the cult's will. Help them succeed in their goals at all costs.")
- if(message_user && user)
- to_chat(user, "Capture successful!: [T.real_name]'s soul has been ripped from [T.p_their()] body and stored within the soul stone.")
-
-
-/obj/item/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/user)
- var/mob/dead/observer/chosen_ghost
-
- chosen_ghost = T.get_ghost(TRUE,TRUE) //Try to grab original owner's ghost first
-
- if(!chosen_ghost || !chosen_ghost.client) //Failing that, we grab a ghosts
- var/list/consenting_candidates = pollGhostCandidates("Would you like to play as a Shade?", "Cultist", null, ROLE_CULTIST, 50, POLL_IGNORE_SHADE)
- if(consenting_candidates.len)
- chosen_ghost = pick(consenting_candidates)
- if(!T)
- return FALSE
- if(!chosen_ghost || !chosen_ghost.client)
- to_chat(user, "There were no spirits willing to become a shade.")
- return FALSE
- if(contents.len) //If they used the soulstone on someone else in the meantime
- return FALSE
- for(var/obj/item/W in T)
- T.dropItemToGround(W)
- init_shade(T, user , shade_controller = chosen_ghost)
- qdel(T)
- return TRUE
diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm
index 69ff4bcfc2f..378aa7dbe14 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook.dm
@@ -281,18 +281,6 @@
item_path = /obj/item/scrying
category = "Defensive"
-/datum/spellbook_entry/item/soulstones
- name = "Six Soul Stone Shards and the spell Artificer"
- desc = "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot."
- item_path = /obj/item/storage/belt/soulstone/full
- category = "Assistance"
-
-/datum/spellbook_entry/item/soulstones/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
- . =..()
- if(.)
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null))
- return .
-
/datum/spellbook_entry/item/necrostone
name = "A Necromantic Stone"
desc = "A Necromantic stone is able to resurrect three dead individuals as skeletal thralls for you to command."
@@ -318,18 +306,6 @@
item_path = /obj/item/antag_spawner/contract
category = "Assistance"
-/datum/spellbook_entry/item/guardian
- name = "Guardian Deck"
- desc = "A deck of guardian tarot cards, capable of binding a personal guardian to your body. There are multiple types of guardian available, but all of them will transfer some amount of damage to you. \
- It would be wise to avoid buying these with anything capable of causing you to swap bodies with others."
- item_path = /obj/item/guardiancreator/choose/wizard
- category = "Assistance"
-
-/datum/spellbook_entry/item/guardian/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
- . = ..()
- if(.)
- new /obj/item/paper/guides/antag/guardian/wizard(get_turf(user))
-
/datum/spellbook_entry/item/bloodbottle
name = "Bottle of Blood"
desc = "A bottle of magically infused blood, the smell of which will attract extradimensional beings when broken. Be careful though, the kinds of creatures summoned by blood magic are indiscriminate in their killing, and you yourself may become a victim."
@@ -351,16 +327,6 @@
limit = 3
category = "Assistance"
-/datum/spellbook_entry/item/mjolnir
- name = "Mjolnir"
- desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power."
- item_path = /obj/item/mjollnir
-
-/datum/spellbook_entry/item/singularity_hammer
- name = "Singularity Hammer"
- desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everything nearby to the point of impact."
- item_path = /obj/item/singularityhammer
-
/datum/spellbook_entry/item/battlemage
name = "Battlemage Armour"
desc = "An ensorceled suit of armour, protected by a powerful shield. The shield can completely negate sixteen attacks before being permanently depleted."
diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm
index 96a41b2ac07..27a3a343a90 100644
--- a/code/modules/antagonists/wizard/wizard.dm
+++ b/code/modules/antagonists/wizard/wizard.dm
@@ -172,7 +172,6 @@
antag_hud_name = "apprentice"
var/datum/mind/master
var/school = APPRENTICE_DESTRUCTION
- outfit_type = /datum/outfit/wizard/apprentice
wiz_age = APPRENTICE_AGE_MIN
/datum/antagonist/wizard/apprentice/greet()
@@ -252,7 +251,6 @@
/datum/antagonist/wizard/academy
name = "Academy Teacher"
- outfit_type = /datum/outfit/wizard/academy
move_to_lair = FALSE
/datum/antagonist/wizard/academy/equip_wizard()
diff --git a/code/modules/assembly/anomalies.dm b/code/modules/assembly/anomalies.dm
new file mode 100644
index 00000000000..9770370624b
--- /dev/null
+++ b/code/modules/assembly/anomalies.dm
@@ -0,0 +1,282 @@
+///Base anomaly signaller
+// Embedded signaller used in anomalies.
+/obj/item/assembly/signaler/anomaly
+ name = "anomaly core"
+ desc = "The stabilized core of an anomaly. It'd probably be valuable for research."
+ icon_state = "anomaly core"
+ item_state = "electronic"
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ resistance_flags = FIRE_PROOF
+ //allows anomaly cores to recieve multiple signals
+ var/code_b = DEFAULT_SIGNALER_CODE
+ var/anomaly_type = /obj/effect/anomaly
+ var/research
+
+/obj/item/assembly/signaler/anomaly/Initialize()
+ . = ..()
+ set_frequency(frequency)
+
+/obj/item/assembly/signaler/anomaly/attack_self()
+ return
+
+/obj/item/assembly/signaler/anomaly/receive_signal(datum/signal/signal)
+ if(!signal)
+ return FALSE
+ if(signal.data["code"] == code)
+ for(var/obj/effect/anomaly/Anomaly in get_turf(src))
+ Anomaly.anomalyNeutralize()
+ return TRUE
+ if(signal.data["code"] == code_b )
+ for(var/obj/effect/anomaly/Anomaly in get_turf(src))
+ Anomaly.detonate()
+ anomaly_core_detonation()
+ return TRUE
+ return FALSE
+
+//extend this on a per anomaly basis.
+/obj/item/assembly/signaler/anomaly/proc/anomaly_core_detonation()
+ new /obj/effect/particle_effect/smoke/bad(loc)
+ qdel(src)
+
+/obj/item/assembly/signaler/anomaly/attackby(obj/item/I, mob/user, params)
+ if(I.tool_behaviour == TOOL_ANALYZER)
+ to_chat(user, "Analyzing... [src]'s stabilized field is fluctuating along frequency [format_frequency(frequency)], code [code]. An unstable frequency is present at code [code_b].")
+ ..()
+
+///Bluespace Anomaly
+/obj/item/assembly/signaler/anomaly/bluespace
+ name = "\improper bluespace anomaly core"
+ desc = "The stabilized core of a bluespace anomaly. It keeps phasing in and out of view."
+ icon_state = "anomaly core"
+ grind_results = list(/datum/reagent/bluespace = 25)
+
+/obj/item/assembly/signaler/anomaly/bluespace/anomaly_core_detonation()
+ //just teleports people
+ visible_message(span_warning("[src] creates a bluespace fracture around itself!"))
+ for(var/mob/living/Mob in range(1,src))
+ do_teleport(Mob, locate(Mob.x, Mob.y, Mob.z), 8, channel = TELEPORT_CHANNEL_BLUESPACE)
+ ..()
+
+//Flux Anomaly
+/obj/item/assembly/signaler/anomaly/flux
+ name = "\improper flux anomaly core"
+ desc = "The stabilized core of a flux anomaly. Touching it makes your skin tingle."
+ icon_state = "flux core"
+ grind_results = list(/datum/reagent/teslium = 15)
+
+/obj/item/assembly/signaler/anomaly/flux/anomaly_core_detonation()
+ //zap
+ visible_message(span_warning("Electrical arcs flash off of [src] as it fizzles out!"))
+ tesla_zap(src, 5, 7000, ZAP_FUSION_FLAGS)
+ ..()
+
+///Gravity Anomaly
+/obj/item/assembly/signaler/anomaly/grav
+ name = "\improper gravitational anomaly core"
+ desc = "The stabilized core of a gravitational anomaly. It feels much heavier than it looks."
+ icon_state = "grav core"
+ grind_results = list(/datum/reagent/gravitum = 20, /datum/reagent/liquid_dark_matter = 10)
+
+/obj/item/assembly/signaler/anomaly/grav/anomaly_core_detonation()
+ //throngles u cutely
+ visible_message(span_warning("[src] implodes into itself, light itself bending for a split second!"))
+ for(var/mob/living/carbon/carbon in range(1,src))
+ if(carbon.run_armor_check(attack_flag = "melee") >= 20)
+ carbon.break_random_bone()
+ else if(carbon.run_armor_check(attack_flag = "melee") >= 40)
+ carbon.break_all_bones() //crunch
+ carbon.apply_damage(20, BRUTE)
+
+///Hallucination Anomaly
+/obj/item/assembly/signaler/anomaly/hallucination
+ name = "\improper hallucination anomaly core"
+ desc = "The stabilized core of a hallucination anomaly. It's never entirely there."
+ icon_state = "hallucination_core"
+ grind_results = list(/datum/reagent/toxin/mindbreaker = 20) //LSD orb
+
+///Heartbeat Anomaly
+/obj/item/assembly/signaler/anomaly/heartbeat
+ name = "\improper heartbeat anomaly core"
+ desc = "The stabilized core of a heartbeat anomaly. Pulses of heat run across its shell."
+ grind_results = list(/datum/reagent/uranium/radium = 30, /datum/reagent/uranium = 20)
+
+/obj/item/assembly/signaler/anomaly/heartbeat/anomaly_core_detonation()
+ visible_message(span_warning("[src] expands and throbs, before shattering into dozens of fragments!"))
+ radiation_pulse(src, 1000, 3)
+ new /obj/effect/decal/cleanable/glass/strange(src)
+ ..()
+
+///Melter Anomaly
+/obj/item/assembly/signaler/anomaly/melter
+ name = "\improper melter anomaly core"
+ desc = "The stabilized core of a melter anomaly. It sizzles and crackles."
+ icon_state = "pyro core"
+ grind_results = list(/datum/reagent/toxin/acid/nitracid = 10, /datum/reagent/toxin/acid/fluacid = 10, /datum/reagent/toxin/acid = 10) //soup
+
+/obj/item/assembly/signaler/anomaly/melter/anomaly_core_detonation()
+ visible_message(span_warning("[src] melts into a glowing residue!"))
+ new /obj/effect/decal/cleanable/greenglow(src.loc)
+ ..()
+
+///Phantom Anomaly
+/obj/item/assembly/signaler/anomaly/phantom
+ name = "\improper phantom anomaly core"
+ desc = "The stabilized core of a phantom anomaly. It quietly screams."
+ grind_results = list(/datum/reagent/blood = 20)
+
+/obj/item/assembly/signaler/anomaly/phantom/anomaly_core_detonation()
+ playsound(src,'sound/hallucinations/far_noise.ogg', 100, 0, 50, TRUE, TRUE)
+ visible_message(span_warning("[src] screams as it fades, trying to lash out!"))
+ for(var/mob/living/carbon/handsy in range(5, src))
+ if(handsy.stat != DEAD)
+ var/grab_dir = turn(handsy.dir, pick(-90, 90, 180, 180))
+ var/turf/spawn_turf = get_ranged_target_turf(handsy, grab_dir, 8)
+ if(!spawn_turf)
+ return
+ new /obj/effect/temp_visual/dir_setting/curse/grasp_portal(spawn_turf, handsy.dir)
+ playsound(spawn_turf, 'sound/effects/curse2.ogg', 80, TRUE, -1)
+ var/obj/projectile/curse_hand/phantom/hand = new (spawn_turf)
+ hand.preparePixelProjectile(handsy, spawn_turf)
+ if(QDELETED(hand))
+ return
+ hand.fire()
+ ..()
+
+///Plasmasoul Anomaly
+/obj/item/assembly/signaler/anomaly/plasmasoul
+ name = "\improper plasmasoul anomaly core"
+ desc = "The stabilized core of a plasmasoul anomaly. The air around it hisses."
+ grind_results = list(/datum/reagent/toxin/plasma = 50)
+
+/obj/item/assembly/signaler/anomaly/plasmasoul/anomaly_core_detonation()
+ visible_message(span_warning("[src] rapidly delaminates into plasma!"))
+ atmos_spawn_air("plasma=500;TEMP=[T20C]")
+ ..()
+
+///Pulsar Anomaly
+/obj/item/assembly/signaler/anomaly/pulsar
+ name = "\improper pulsar anomaly core"
+ desc = "The stabilized core of a pulsar anomaly. Electromagnetic crackles come off it."
+ grind_results = list(/datum/reagent/iron = 25, /datum/reagent/uranium = 25)
+
+/obj/item/assembly/signaler/anomaly/pulsar/anomaly_core_detonation()
+ visible_message(span_warning("[src] gives off one last pulse as it melts!"))
+ empulse(loc, 3, 1)
+ ..()
+
+///Pyroclastic Anomaly
+/obj/item/assembly/signaler/anomaly/pyro
+ name = "\improper plasmaball anomaly core"
+ desc = "The stabilized core of a plasmaball anomaly. It almost burns to touch."
+ icon_state = "pyro core"
+ grind_results = list(/datum/reagent/clf3 = 25, /datum/reagent/toxin/plasma = 15)
+
+//glorified molotov
+/obj/item/assembly/signaler/anomaly/pyro/anomaly_core_detonation()
+ //this is tg's ash heretic ash heretic ascenscion power tuned down a bit.
+ visible_message(span_warning("[src] loses coherence, bursting into brilliant flames!"))
+ for(var/i in 0 to 3)
+ for(var/turf/nearby_turf as anything in spiral_range_turfs(i + 1, src.loc))
+ var/obj/effect/hotspot/flame_tile = locate(nearby_turf) || new(nearby_turf)
+ flame_tile.alpha = 125
+ nearby_turf.hotspot_expose(750, 25, 1)
+ qdel(src)
+
+///Sparkler Anomaly
+/obj/item/assembly/signaler/anomaly/sparkler
+ name = "\improper sparkler anomaly core"
+ desc = "The stabilized core of a sparkler anomaly. Tiny electrical sparks arc off it."
+ grind_results = list(/datum/reagent/teslium = 10)
+
+/obj/item/assembly/signaler/anomaly/sparkler/anomaly_core_detonation()
+ visible_message(span_warning("[src] shoots out one last assortment of sparks!"))
+ tesla_zap(src, 2, 5000, ZAP_FUSION_FLAGS)
+ ..()
+
+///Static Anomaly
+/obj/item/assembly/signaler/anomaly/tvstatic
+ name = "\improper static anomaly core"
+ desc = "The stabilized core of a static anomaly. Your head hurts just staring at it"
+ grind_results = list(/datum/reagent/three_eye = 5)
+
+/obj/item/assembly/signaler/anomaly/tvstatic/anomaly_core_detonation()
+ visible_message(span_warning("[src] withdraws into itself, one last message escaping it!"))
+ say(pick(GLOB.tvstatic_sayings))
+ for(var/mob/living/carbon/human/looking in range(4, src))
+ if (!HAS_TRAIT(looking, TRAIT_MINDSHIELD) && looking.stat != DEAD)
+ looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20, 40)
+ playsound(src, 'sound/effects/stall.ogg', 100)
+ ..()
+
+///Transfusion Anomaly
+/obj/item/assembly/signaler/anomaly/transfusion
+ name = "\improper transfusion anomaly core"
+ desc = "The stabilized core of a tranfusion anomaly. Crimson slowly seeps out of the containment unit."
+ icon_state = "pyro core"
+ grind_results = list(/datum/reagent/toxin/heparin = 15, /datum/reagent/blood = 35)
+ var/blood_stored
+ var/blood_max
+
+/obj/item/assembly/signaler/anomaly/transfusion/Initialize()
+ . = ..()
+ blood_max = rand(400, 1200)
+
+/obj/item/assembly/signaler/anomaly/transfusion/proc/set_blood_stored(int)
+ blood_stored += int
+
+/obj/item/assembly/signaler/anomaly/transfusion/proc/set_blood_max(int)
+ blood_max = int
+
+/obj/item/assembly/signaler/anomaly/transfusion/proc/get_blood_stored()
+ return blood_stored
+
+/obj/item/assembly/signaler/anomaly/transfusion/proc/get_blood_max()
+ return blood_max
+
+/obj/item/assembly/signaler/anomaly/transfusion/anomaly_core_detonation()
+ visible_message(span_warning("Ichor flies out of [src], trying to force itself into everything around!"))
+ while(blood_stored > 0)
+ for(var/mob/living/carbon/victim in range(2, src))
+ var/present_time
+ present_time = rand((blood_stored / 10), (blood_stored / 2))
+ visible_message(span_boldwarning("[victim] finds themselves transfused with the crimson ichor!"))
+ victim.blood_volume += present_time
+ blood_stored += -present_time
+ ..()
+
+///Veins Anomaly
+/obj/item/assembly/signaler/anomaly/veins
+ name = "\improper fountain anomaly core"
+ desc = "The stabilized core of a fountain anomaly. It's slippery, like an intestine."
+ grind_results = list(/datum/reagent/medicine/strange_reagent = 1)
+
+/obj/item/assembly/signaler/anomaly/veins/Initialize()
+ . = ..()
+ grind_results = list(/datum/reagent/medicine/strange_reagent = rand(10,20))
+
+/obj/item/assembly/signaler/anomaly/veins/anomaly_core_detonation()
+ //goreshit
+ var/obj/effect/gibspawner/mess = pick(list(
+ /obj/effect/gibspawner/human,
+ /obj/effect/gibspawner/xeno,
+ /obj/effect/gibspawner/generic/animal
+ ))
+ visible_message(span_warning("[src] erupts into a fountain of gore and viserca!"))
+ for(var/i in 1 to 4)
+ new mess(src.loc)
+ ..()
+
+///Vortex Anomaly
+/obj/item/assembly/signaler/anomaly/vortex
+ name = "\improper vortex anomaly core"
+ desc = "The stabilized core of a vortex anomaly. It won't sit still, as if some invisible force is acting on it."
+ icon_state = "vortex core"
+ grind_results = list(/datum/reagent/liquid_dark_matter = 30)
+
+/obj/item/assembly/signaler/anomaly/vortex/anomaly_core_detonation()
+ //disappears bigly
+ playsound(src,'sound/effects/phasein.ogg', 100, 0, 50, TRUE, TRUE)
+ new /obj/effect/particle_effect/sparks/quantum(loc)
+ visible_message(span_warning("[src] shakes violently and - hey, where'd it go?"))
+ ..()
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index 8fe788f79ca..47605eb63d5 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -7,7 +7,7 @@
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
throwforce = 0
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron = 300, /datum/material/glass = 300)
light_system = MOVABLE_LIGHT //Used as a flash here.
light_range = FLASH_LIGHT_RANGE
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 8dbb1dc98b6..cdb2f899140 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -11,6 +11,7 @@
throw_speed = 2
throw_range = 7
+ ///set both of these or neither.
var/obj/item/assembly/a_left = null
var/obj/item/assembly/a_right = null
@@ -21,6 +22,18 @@
)
AddElement(/datum/element/connect_loc, loc_connections)
+ //if we want to spawn an holder pre-configured.
+ if(a_left && a_right)
+ var/obj/item/assembly/left = new a_left(src)
+ var/obj/item/assembly/right = new a_right(src)
+ //i love byond
+ a_left = null
+ a_right = null
+ assemble(left, right, null)
+ a_left.secured = TRUE
+ a_right.secured = TRUE
+ update_appearance()
+
/obj/item/assembly_holder/ComponentInitialize()
. = ..()
var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS
@@ -29,7 +42,6 @@
/obj/item/assembly_holder/IsAssemblyHolder()
return TRUE
-
/obj/item/assembly_holder/proc/assemble(obj/item/assembly/A, obj/item/assembly/A2, mob/user)
attach(A,user)
attach(A2,user)
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 08b60305856..7368e05f1b4 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -7,7 +7,9 @@
drop_sound = 'sound/items/handling/component_drop.ogg'
pickup_sound = 'sound/items/handling/component_pickup.ogg'
var/scanning = FALSE
+ ///is the assembly arming itself?
var/timing = FALSE
+ ///seconds until the assembly arms itself
var/time = 10
var/sensitivity = 1
var/hearing_range = 3
@@ -16,11 +18,12 @@
/obj/item/assembly/prox_sensor/Initialize()
. = ..()
- proximity_monitor = new(src, 0)
+ proximity_monitor = new(src, 0, FALSE)
START_PROCESSING(SSobj, src)
/obj/item/assembly/prox_sensor/Destroy()
STOP_PROCESSING(SSobj, src)
+ QDEL_NULL(proximity_monitor)
. = ..()
/obj/item/assembly/prox_sensor/examine(mob/user)
@@ -37,6 +40,15 @@
update_appearance()
return TRUE
+/obj/item/assembly/prox_sensor/on_attach()
+ . = ..()
+ // Pick the first valid object in this list:
+ // Wiring datum's owner
+ // assembly holder's attached object
+ // assembly holder itself
+ // us
+ proximity_monitor.set_host(connected?.holder || holder?.master || holder || src, src)
+
/obj/item/assembly/prox_sensor/on_detach()
. = ..()
if(!.)
@@ -59,7 +71,7 @@
return secured
/obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
- if (istype(AM, /obj/effect/beam))
+ if(istype(AM, /obj/effect/beam) || istype(AM, /obj/projectile) || istype(AM, /obj/effect/projectile))
return
sense()
@@ -153,3 +165,11 @@
value = round(time + value)
time = clamp(value, 0, 600)
. = TRUE
+
+/obj/item/assembly/prox_sensor/preset
+ sensitivity = 2
+ hearing_range = 3
+
+/obj/item/assembly/prox_sensor/preset/Initialize()
+ . = ..()
+ toggle_scan(!scanning)
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 0bfac86ee0d..f0898cc53b6 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -82,12 +82,13 @@
update_appearance()
/obj/item/assembly/signaler/attackby(obj/item/W, mob/user, params)
- if(issignaler(W))
+ if(issignaler(W) && secured)
var/obj/item/assembly/signaler/signaler2 = W
- if(secured && signaler2.secured)
+ if(signaler2.secured)
code = signaler2.code
set_frequency(signaler2.frequency)
to_chat(user, "You transfer the frequency and code of \the [signaler2.name] to \the [name]")
+ return TRUE
..()
/obj/item/assembly/signaler/proc/signal()
@@ -144,126 +145,6 @@
return
return ..(signal)
-// Embedded signaller used in anomalies.
-/obj/item/assembly/signaler/anomaly
- name = "anomaly core"
- desc = "The neutralized core of an anomaly. It'd probably be valuable for research."
- icon_state = "anomaly core"
- item_state = "electronic"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- resistance_flags = FIRE_PROOF
- var/anomaly_type = /obj/effect/anomaly
- var/research
-
-/obj/item/assembly/signaler/anomaly/receive_signal(datum/signal/signal)
- if(!signal)
- return FALSE
- if(signal.data["code"] != code)
- return FALSE
- for(var/obj/effect/anomaly/Anomaly in get_turf(src))
- Anomaly.anomalyNeutralize()
- return TRUE
-
-/obj/item/assembly/signaler/anomaly/attackby(obj/item/I, mob/user, params)
- if(I.tool_behaviour == TOOL_ANALYZER)
- to_chat(user, "Analyzing... [src]'s stabilized field is fluctuating along frequency [format_frequency(frequency)], code [code].")
- ..()
-
-/obj/item/assembly/signaler/anomaly/det_signal
- name = "anomaly field"
- research = null
- anomaly_type = null
-
-/obj/item/assembly/signaler/anomaly/det_signal/receive_signal(datum/signal/signal)
- if(!signal)
- return FALSE
- if(signal.data["code"] != code)
- return FALSE
- for(var/obj/effect/anomaly/Anomaly in get_turf(src))
- Anomaly.detonate()
- return TRUE
-
-
-//Anomaly cores
-
-/obj/item/assembly/signaler/anomaly/pyro
- name = "\improper pyroclastic anomaly core"
- desc = "The neutralized core of a pyroclastic anomaly. It feels warm to the touch. It'd probably be valuable for research."
- icon_state = "pyro core"
- anomaly_type = /obj/effect/anomaly/pyro
-
-/obj/item/assembly/signaler/anomaly/grav
- name = "\improper gravitational anomaly core"
- desc = "The neutralized core of a gravitational anomaly. It feels much heavier than it looks. It'd probably be valuable for research."
- icon_state = "grav core"
- anomaly_type = /obj/effect/anomaly/grav
-
-/obj/item/assembly/signaler/anomaly/flux
- name = "\improper flux anomaly core"
- desc = "The neutralized core of a flux anomaly. Touching it makes your skin tingle. It'd probably be valuable for research."
- icon_state = "flux core"
- anomaly_type = /obj/effect/anomaly/flux
-
-/obj/item/assembly/signaler/anomaly/bluespace
- name = "\improper bluespace anomaly core"
- desc = "The neutralized core of a bluespace anomaly. It keeps phasing in and out of view. It'd probably be valuable for research."
- icon_state = "anomaly core"
- anomaly_type = /obj/effect/anomaly/bluespace
-
-/obj/item/assembly/signaler/anomaly/vortex
- name = "\improper vortex anomaly core"
- desc = "The neutralized core of a vortex anomaly. It won't sit still, as if some invisible force is acting on it. It'd probably be valuable for research."
- icon_state = "vortex core"
- anomaly_type = /obj/effect/anomaly/vortex
-
-/obj/item/assembly/signaler/anomaly/hallucination
- name = "\improper hallucination anomaly core"
- desc = "The neutralized core of a hallucination anomaly. It seems to be moving, but it's probably your imagination. It'd probably be valuable for research."
- icon_state = "hallucination_core"
- anomaly_type = /obj/effect/anomaly/hallucination
-
-/obj/item/assembly/signaler/anomaly/sparkler
- name = "\improper sparkler anomaly core"
- desc = "The neutralized core of a sparkler anomaly. Tiny electrical sparks arc off it."
- anomaly_type = /obj/effect/anomaly/sparkler
-
-/obj/item/assembly/signaler/anomaly/veins
- name = "\improper fountain anomaly core"
- desc = "The neutralized core of a fountain anomaly. Blood drips off of it."
- anomaly_type = /obj/effect/anomaly/sparkler
-
-/obj/item/assembly/signaler/anomaly/phantom
- name = "\improper phantom anomaly core"
- desc = "The neutralized core of a phantom anomaly. It quietly screams."
- anomaly_type = /obj/effect/anomaly/phantom
-
-/obj/item/assembly/signaler/anomaly/pulsar
- name = "\improper pulsar anomaly core"
- desc = "The neutralized core of a pulsar anomaly. Electromagnetic crackles come off it."
-
-/obj/item/assembly/signaler/anomaly/plasmasoul
- name = "\improper plasmasoul anomaly core"
- desc = "The neutralized core of a plasmasoul anomaly. The air around it hisses."
-
-/obj/item/assembly/signaler/anomaly/heartbeat
- name = "\improper heartbeat anomaly core"
- desc = "The neutralized core of a heartbeat anomaly. It's concerningly warm to the touch."
-
-/obj/item/assembly/signaler/anomaly/tvstatic
- name = "\improper static anomaly core"
- desc = "The neutralized core of a static anomaly. Your head hurts just staring at it"
-
-/obj/item/assembly/signaler/anomaly/melter
- name = "\improper melter anomaly core"
- desc = "The neutralized core of a melter anomaly. It sizzles and crackles. It'd probably be valuable for research."
- icon_state = "pyro core"
-
-
-
-/obj/item/assembly/signaler/anomaly/attack_self()
- return
-
/obj/item/assembly/signaler/cyborg
/obj/item/assembly/signaler/cyborg/attackby(obj/item/W, mob/user, params)
diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm
index 84f1a504001..dfa77c24aeb 100644
--- a/code/modules/assembly/voice.dm
+++ b/code/modules/assembly/voice.dm
@@ -103,6 +103,10 @@
. = ..()
listening = FALSE
+/obj/item/assembly/voice/preset
+ mode = 1
+ recorded = "example phrase"
+
#undef INCLUSIVE_MODE
#undef EXCLUSIVE_MODE
#undef RECOGNIZER_MODE
diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm
index 221febbe14d..84170c1b78e 100644
--- a/code/modules/asset_cache/asset_list.dm
+++ b/code/modules/asset_cache/asset_list.dm
@@ -124,8 +124,6 @@ GLOBAL_LIST_EMPTY(asset_datums)
for(var/size_id in sizes)
.["[name]_[size_id].png"] = SSassets.transport.get_asset_url("[name]_[size_id].png")
-
-
/datum/asset/spritesheet/proc/ensure_stripped(sizes_to_strip = sizes)
for(var/size_id in sizes_to_strip)
var/size = sizes[size_id]
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 83abc98ed99..9acdab838e8 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -110,18 +110,38 @@
"stamp-law" = 'icons/stamp_icons/large_stamp-law.png',
"stamp-chap" = 'icons/stamp_icons/large_stamp-chap.png',
"stamp-mime" = 'icons/stamp_icons/large_stamp-mime.png',
- "stamp-centcom" = 'icons/stamp_icons/large_stamp-centcom.png',
"stamp-syndicate" = 'icons/stamp_icons/large_stamp-syndicate.png',
"stamp-solgov" = 'icons/stamp_icons/large_stamp-solgov.png',
"stamp-inteq" = 'icons/stamp_icons/large_stamp-inteq.png',
- "stamp-vanguard" = 'icons/stamp_icons/large_stamp-vanguard.png',
- "stamp-maa" = 'icons/stamp_icons/large_stamp-maa.png',
- "stamp-artificer" = 'icons/stamp_icons/large_stamp-artificer.png',
+ "stamp-inteq_vanguard" = 'icons/stamp_icons/large_stamp-inteq_vanguard.png',
+ "stamp-inteq_maa" = 'icons/stamp_icons/large_stamp-inteq_maa.png',
+ "stamp-inteq_artificer" = 'icons/stamp_icons/large_stamp-inteq_artificer.png',
+ "stamp-inteq_corpsman" = 'icons/stamp_icons/large_stamp-inteq_corpsman.png',
"stamp-clip" = 'icons/stamp_icons/large_stamp-clip.png',
"stamp-bard" = 'icons/stamp_icons/large_stamp-bard.png',
"stamp-gold" = 'icons/stamp_icons/large_stamp-gold.png',
"stamp-cybersun" = 'icons/stamp_icons/large_stamp-cybersun.png',
- "stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png'
+ "stamp-biodynamics" = 'icons/stamp_icons/large_stamp-biodynamics.png',
+ "stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png',
+ "stamp-ngr" = 'icons/stamp_icons/large_stamp-ngr.png',
+ "stamp-ngr_cap" = 'icons/stamp_icons/large_stamp-ngr_captain.png',
+ "stamp-ngr_fore" = 'icons/stamp_icons/large_stamp-ngr_foreman.png',
+ "stamp-ngr_lieu" = 'icons/stamp_icons/large_stamp-ngr_lieutenant.png',
+ "stamp-ngr_ensign" = 'icons/stamp_icons/large_stamp-ngr_ensign.png',
+ "stamp-nt" = 'icons/stamp_icons/large_stamp-nt_generic.png',
+ "stamp-nt_cap" = 'icons/stamp_icons/large_stamp-nt_captain.png',
+ "stamp-nt_fo" = 'icons/stamp_icons/large_stamp-nt_officer.png',
+ "stamp-nt_engdir" = 'icons/stamp_icons/large_stamp-nt_eng_dir.png',
+ "stamp-nt_meddir" = 'icons/stamp_icons/large_stamp-nt_med_dir.png',
+ "stamp-nt_scidir" = 'icons/stamp_icons/large_stamp-nt_sci_dir.png',
+ "stamp-ns" = 'icons/stamp_icons/large_stamp-ns_generic.png',
+ "stamp-ns_cap" = 'icons/stamp_icons/large_stamp-ns_captain.png',
+ "stamp-ns_supdir" = 'icons/stamp_icons/large_stamp-ns_sup_dir.png',
+ "stamp-vi" = 'icons/stamp_icons/large_stamp-vi_generic.png',
+ "stamp-vi_cap" = 'icons/stamp_icons/large_stamp-vi_captain.png',
+ "stamp-vi_secdir" = 'icons/stamp_icons/large_stamp-vi_sec_dir.png',
+ "stamp-vi_lp" = 'icons/stamp_icons/large_stamp-vi_loss_prevention.png',
+ "stamp-nt_central" = 'icons/stamp_icons/large_stamp-nt_central.png'
)
/datum/asset/simple/fuckywucky
@@ -147,13 +167,11 @@
)
/datum/asset/simple/namespaced/fontawesome
- legacy = TRUE
assets = list(
- "fa-regular-400.eot" = 'html/font-awesome/webfonts/fa-regular-400.eot',
- "fa-regular-400.woff" = 'html/font-awesome/webfonts/fa-regular-400.woff',
- "fa-solid-900.eot" = 'html/font-awesome/webfonts/fa-solid-900.eot',
- "fa-solid-900.woff" = 'html/font-awesome/webfonts/fa-solid-900.woff',
- "v4shim.css" = 'html/font-awesome/css/v4-shims.min.css'
+ "fa-regular-400.ttf" = 'html/font-awesome/webfonts/fa-regular-400.ttf',
+ "fa-solid-900.ttf" = 'html/font-awesome/webfonts/fa-solid-900.ttf',
+ "fa-v4compatibility.ttf" = 'html/font-awesome/webfonts/fa-v4compatibility.ttf',
+ "v4shim.css" = 'html/font-awesome/css/v4-shims.min.css',
)
parents = list("font-awesome.css" = 'html/font-awesome/css/all.min.css')
@@ -162,17 +180,11 @@
"sga.ttf" = 'html/sga.ttf'
)
-/// Override this in order to start the creation of the spritehseet.
-/// This is where all your Insert, InsertAll, etc calls should be inside.
-/datum/asset/spritesheet/proc/create_spritesheets()
- SHOULD_CALL_PARENT(FALSE)
- CRASH("create_spritesheets() not implemented for [type]!")
-
/datum/asset/spritesheet/chat
name = "chat"
/datum/asset/spritesheet/chat/register()
- InsertAll("emoji", 'icons/emoji.dmi')
+ InsertAll("emoji", EMOJI_SET)
// pre-loading all lanugage icons also helps to avoid meta
InsertAll("language", 'icons/misc/language.dmi')
// catch languages which are pulling icons from another file
@@ -182,7 +194,7 @@
if (icon != 'icons/misc/language.dmi')
var/icon_state = initial(L.icon_state)
Insert("language-[icon_state]", icon, icon_state=icon_state)
- ..()
+ ..()
/datum/asset/simple/lobby
assets = list(
@@ -235,7 +247,6 @@
"hierophant" = 'icons/UI_Icons/Achievements/Boss/hierophant.png',
"legion" = 'icons/UI_Icons/Achievements/Boss/legion.png',
"miner" = 'icons/UI_Icons/Achievements/Boss/miner.png',
- "swarmer" = 'icons/UI_Icons/Achievements/Boss/swarmer.png',
"tendril" = 'icons/UI_Icons/Achievements/Boss/tendril.png',
"featofstrength" = 'icons/UI_Icons/Achievements/Misc/featofstrength.png',
"helbital" = 'icons/UI_Icons/Achievements/Misc/helbital.png',
@@ -431,8 +442,8 @@
/datum/asset/spritesheet/fish
name = "fish"
-/datum/asset/spritesheet/fish/create_spritesheets()
- for (var/path in subtypesof(/obj/item/fish))
+/datum/asset/spritesheet/fish/register()
+ for(var/path in subtypesof(/obj/item/fish))
var/obj/item/fish/fish_type = path
var/fish_icon = initial(fish_type.icon)
var/fish_icon_state = initial(fish_type.icon_state)
diff --git a/code/modules/atmospherics/auxgm/breathing_classes.dm b/code/modules/atmospherics/auxgm/breathing_classes.dm
index cfc82adbffa..10f76d19d52 100644
--- a/code/modules/atmospherics/auxgm/breathing_classes.dm
+++ b/code/modules/atmospherics/auxgm/breathing_classes.dm
@@ -23,8 +23,9 @@
/datum/breathing_class/oxygen
gases = list(
GAS_O2 = 1,
- GAS_PLUOXIUM = 8,
+ GAS_O3 = -0.7,
GAS_CO2 = -0.7, // CO2 isn't actually toxic, just an asphyxiant
+ GAS_ARGON = -1,
)
products = list(
GAS_CO2 = 1,
diff --git a/code/modules/atmospherics/auxgm/gas_types.dm b/code/modules/atmospherics/auxgm/gas_types.dm
index fb0d7026a6d..c42c3981214 100644
--- a/code/modules/atmospherics/auxgm/gas_types.dm
+++ b/code/modules/atmospherics/auxgm/gas_types.dm
@@ -1,6 +1,6 @@
/datum/gas/oxygen
id = GAS_O2
- specific_heat = 20
+ specific_heat = 30
name = "Oxygen"
oxidation_temperature = T0C - 100 // it checks max of this and fire temperature, so rarely will things spontaneously combust
breath_alert_info = list(
@@ -16,7 +16,7 @@
/datum/gas/nitrogen
id = GAS_N2
- specific_heat = 20
+ specific_heat = 30
name = "Nitrogen"
breath_alert_info = list(
not_enough_alert = list(
@@ -29,6 +29,14 @@
)
)
+/datum/gas/carbon_monoxide
+ id = GAS_CO
+ specific_heat = 30
+ name = "Carbon Monoxide"
+ breath_results = GAS_CO
+
+ flags = GAS_FLAG_DANGEROUS
+
/datum/gas/carbon_dioxide //what the fuck is this?
id = GAS_CO2
specific_heat = 30
@@ -64,29 +72,26 @@
alert_type = /atom/movable/screen/alert/too_much_tox
)
)
- fire_burn_rate = OXYGEN_BURN_RATE_BASE // named when plasma fires were the only fires, surely
+ fire_burn_rate = PLASMA_BURN_RATE_BASE // named when plasma fires were the only fires, surely
fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST
fire_products = FIRE_PRODUCT_PLASMA
enthalpy = FIRE_PLASMA_ENERGY_RELEASED // 3000000, 3 megajoules, 3000 kj
+ odor = GAS_ODOR_SMOG
+ odor_emotes = TRUE
+ odor_power = 10 //extremely toxic
+
/datum/gas/water_vapor
id = GAS_H2O
- specific_heat = 40
+ specific_heat = 75
name = "Water Vapor"
gas_overlay = "water_vapor"
moles_visible = MOLES_GAS_VISIBLE
flags = GAS_FLAG_DANGEROUS
fusion_power = 8
- enthalpy = -241800 // FIRE_HYDROGEN_ENERGY_RELEASED is actually what this was supposed to be
+ enthalpy = -285800 // FIRE_HYDROGEN_ENERGY_RELEASED is actually what this was supposed to be
breath_reagent = /datum/reagent/water
-/datum/gas/hypernoblium
- id = GAS_HYPERNOB
- specific_heat = 2000
- name = "Hyper-noblium"
- gas_overlay = "freon"
- moles_visible = MOLES_GAS_VISIBLE
-
/datum/gas/nitrous_oxide
id = GAS_NITROUS
specific_heat = 40
@@ -99,18 +104,6 @@
oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 100
enthalpy = 81600
-/datum/gas/nitryl
- id = GAS_NITRYL
- specific_heat = 20
- name = "Nitryl"
- color = "#963"
- moles_visible = MOLES_GAS_VISIBLE
- flags = GAS_FLAG_DANGEROUS
- fusion_power = 15
- fire_products = list(GAS_N2 = 0.5)
- enthalpy = 33200
- oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50
-
/datum/gas/tritium
id = GAS_TRITIUM
specific_heat = 10
@@ -125,7 +118,7 @@
fire_radiation_released = 50 // arbitrary number, basically 60 moles of trit burning will just barely start to harm you
fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50
-/datum/gas/bz
+/datum/gas/bz //remove from atmospheres // https://en.wikipedia.org/wiki/3-Quinuclidinyl_benzilate not sure why we have this
id = GAS_BZ
specific_heat = 20
name = "BZ"
@@ -133,20 +126,29 @@
fusion_power = 8
enthalpy = FIRE_CARBON_ENERGY_RELEASED // it is a mystery
-/datum/gas/stimulum
- id = GAS_STIMULUM
- specific_heat = 5
- name = "Stimulum"
- fusion_power = 7
-
-/datum/gas/pluoxium
- id = GAS_PLUOXIUM
- specific_heat = 80
- name = "Pluoxium"
- fusion_power = 10
- oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST * 1000 // it is VERY stable
- oxidation_rate = 8 // when it can oxidize, it can oxidize a LOT
- enthalpy = -50000 // but it reduces the heat output a bit
+/datum/gas/ozone
+ id = GAS_O3
+ specific_heat = 30
+ name = "Ozone"
+ gas_overlay = "water_vapor"
+ moles_visible = MOLES_GAS_VISIBLE
+ color = "#a1a1e6"
+ oxidation_temperature = T0C - 100 // it checks max of this and fire temperature, so rarely will things spontaneously combust
+ oxidation_rate = 3
+ enthalpy = 142000
+
+ odor = GAS_ODOR_CHEMICAL
+ odor_emotes = TRUE
+ odor_power = 1
+
+
+/datum/gas/argon
+ id = GAS_ARGON
+ specific_heat = 20
+ name = "Argon"
+ gas_overlay = "water_vapor"
+ oxidation_rate = -1
+ //moles_visible = MOLES_GAS_VISIBLE
/datum/gas/freon
id = GAS_FREON
@@ -161,9 +163,81 @@
specific_heat = 10
name = "Hydrogen"
flags = GAS_FLAG_DANGEROUS
- moles_visible = MOLES_GAS_VISIBLE
+ //moles_visible = MOLES_GAS_VISIBLE
color = "#ffe"
fusion_power = 0
fire_products = list(GAS_H2O = 1)
+ enthalpy = FIRE_HYDROGEN_ENERGY_RELEASED
fire_burn_rate = 2
fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50
+
+/datum/gas/chlorine
+ id = GAS_CHLORINE
+ specific_heat = 30
+ name = "Chlorine"
+ flags = GAS_FLAG_DANGEROUS
+ moles_visible = MOLES_GAS_VISIBLE * 5
+ oxidation_temperature = T0C - 100
+ oxidation_rate = 0.5
+ gas_overlay = "nitrous_oxide"
+ color = "#FFFB89"
+ fusion_power = 0
+
+/datum/gas/hydrogen_chloride
+ id = GAS_HYDROGEN_CHLORIDE
+ specific_heat = 40
+ name = "Hydrogen Chloride"
+ flags = GAS_FLAG_DANGEROUS
+ moles_visible = MOLES_GAS_VISIBLE * 2
+ gas_overlay = "nitrous_oxide"
+ color = "#5bfd45"
+ fusion_power = 0
+ fire_products = list(GAS_CHLORINE = 1, GAS_H2O = 0.5)
+ enthalpy = 63000
+ fire_burn_rate = 1
+ fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST
+
+/datum/gas/sulfur_dioxide
+ id = GAS_SO2
+ specific_heat = 22
+ name = "Sulfur Dioxide"
+ flags = GAS_FLAG_DANGEROUS
+ moles_visible = MOLES_GAS_VISIBLE * 40
+ gas_overlay = "generic"
+ color = "#d4cb28"
+ enthalpy = -296800
+
+ odor = GAS_ODOR_SULFUR
+ odor_emotes = TRUE
+ odor_power = 1
+
+/datum/gas/methane
+ id = GAS_METHANE
+ specific_heat = 35
+ name = "Methane"
+ flags = GAS_FLAG_DANGEROUS
+ //moles_visible = MOLES_GAS_VISIBLE
+ color = "#ffe"
+ fusion_power = 0
+ fire_products = list(GAS_H2O = 0.5, GAS_HYDROGEN = 1)
+ enthalpy = -74600
+ fire_burn_rate = 2
+ fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50
+
+/datum/gas/ammonia
+ id = GAS_AMMONIA
+
+ specific_heat = 100 //used as a coolant
+ name = "Ammonia"
+ flags = GAS_FLAG_DANGEROUS
+ moles_visible = MOLES_GAS_VISIBLE
+ color = "#ffe"
+ gas_overlay = "nitrous_oxide"
+ fusion_power = 0
+ fire_products = list(GAS_N2 = 0.2, GAS_H2O = 0.8)
+ enthalpy = -46000
+ fire_burn_rate = 0.2
+
+ odor = GAS_ODOR_CHEMICAL
+ odor_emotes = TRUE
+ odor_power = 3
diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm
index 7c324a3f517..c2d7fbf1db8 100644
--- a/code/modules/atmospherics/environmental/LINDA_system.dm
+++ b/code/modules/atmospherics/environmental/LINDA_system.dm
@@ -31,62 +31,85 @@
. = FALSE
/turf/proc/block_all_conductivity()
- conductivity_blocked_directions |= NORTH | SOUTH | EAST | WEST | UP | DOWN
+ conductivity_blocked_directions |= ALL
/atom/movable/proc/BlockThermalConductivity() // Objects that don't let heat through.
return FALSE
/turf/proc/ImmediateCalculateAdjacentTurfs()
+ conductivity_blocked_directions = 0
+
+ if(blocks_air)
+ for(var/turf/adj_turf as anything in get_atmos_cardinal_adjacent_turfs())
+ LAZYREMOVE(adj_turf.atmos_adjacent_turfs, src)
+ adj_turf.conductivity_blocked_directions |= REVERSE_DIR(get_dir(src, adj_turf))
+ adj_turf.__update_auxtools_turf_adjacency_info()
+
+ //Clear all adjacent turfs
+ LAZYNULL(atmos_adjacent_turfs)
+ conductivity_blocked_directions = ALL
+
+ __update_auxtools_turf_adjacency_info()
+ return
+
var/canpass = CANATMOSPASS(src, src)
var/canvpass = CANVERTICALATMOSPASS(src, src)
- conductivity_blocked_directions = 0
-
- var/src_contains_firelock = 1
+ var/src_has_firelock = 0
if(locate(/obj/machinery/door/firedoor) in src)
- src_contains_firelock |= 2
+ src_has_firelock = 2
- var/list/atmos_adjacent_turfs = list()
+ var/blocks_thermal = FALSE
+ if(!thermal_conductivity || !heat_capacity)
+ blocks_thermal = TRUE
+ else
+ for(var/atom/movable/content as anything in contents)
+ if(content.BlockThermalConductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments
+ blocks_thermal = TRUE
+ break
- for(var/direction in GLOB.cardinals_multiz)
- var/turf/current_turf = get_step_multiz(src, direction)
- if(!isopenturf(current_turf))
- conductivity_blocked_directions |= direction
+ //LAZYINITLIST(atmos_adjacent_turfs) with Cut()
+ if(atmos_adjacent_turfs)
+ atmos_adjacent_turfs.Cut()
+ else
+ atmos_adjacent_turfs = list()
- if(current_turf)
- atmos_adjacent_turfs -= current_turf
- LAZYREMOVE(current_turf.atmos_adjacent_turfs, src)
+ var/datum/virtual_level/zone = get_virtual_level()
+ //Turfs above/below can only exist in zones
+ for(var/direction in (zone ? GLOB.cardinals_multiz : GLOB.cardinals))
+ var/turf/current_turf = zone?.get_zone_step(src, direction) || get_step(src, direction)
+ if(!current_turf || current_turf.blocks_air)
+ conductivity_blocked_directions |= direction
continue
- var/other_contains_firelock = 1
- if(locate(/obj/machinery/door/firedoor) in current_turf)
- other_contains_firelock |= 2
-
//Conductivity Update
var/opp = REVERSE_DIR(direction)
- //all these must be above zero for auxmos to even consider them
- if(!thermal_conductivity || !heat_capacity || !current_turf.thermal_conductivity || !current_turf.heat_capacity)
+ //these must be above zero for auxmos to even consider them
+ if(blocks_thermal || !current_turf.thermal_conductivity || !current_turf.heat_capacity)
conductivity_blocked_directions |= direction
current_turf.conductivity_blocked_directions |= opp
else
- for(var/obj/O in contents + current_turf.contents)
- if(O.BlockThermalConductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments
+ for(var/atom/movable/content as anything in current_turf.contents)
+ if(content.BlockThermalConductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments
conductivity_blocked_directions |= direction
current_turf.conductivity_blocked_directions |= opp
break
//End Conductivity Update
- if(!(blocks_air || current_turf.blocks_air) && ((direction & (UP|DOWN))? (canvpass && CANVERTICALATMOSPASS(current_turf, src)) : (canpass && CANATMOSPASS(current_turf, src))))
- atmos_adjacent_turfs[current_turf] = other_contains_firelock | src_contains_firelock
- LAZYSET(current_turf.atmos_adjacent_turfs, src, src_contains_firelock)
+ if(((direction & (UP|DOWN)) ? (canvpass && CANVERTICALATMOSPASS(current_turf, src)) : (canpass && CANATMOSPASS(current_turf, src))))
+ var/has_firelock = src_has_firelock
+ if(!src_has_firelock && locate(/obj/machinery/door/firedoor) in current_turf)
+ has_firelock = 2
+
+ atmos_adjacent_turfs[current_turf] = has_firelock
+ LAZYSET(current_turf.atmos_adjacent_turfs, src, has_firelock)
else
atmos_adjacent_turfs -= current_turf
LAZYREMOVE(current_turf.atmos_adjacent_turfs, src)
current_turf.__update_auxtools_turf_adjacency_info()
UNSETEMPTY(atmos_adjacent_turfs)
- src.atmos_adjacent_turfs = atmos_adjacent_turfs
__update_auxtools_turf_adjacency_info()
/turf/proc/clear_adjacencies()
@@ -98,40 +121,48 @@
LAZYNULL(atmos_adjacent_turfs)
__update_auxtools_turf_adjacency_info()
-/**
- * Returns a list of adjacent turfs that can share air with this one.
- * alldir includes adjacent diagonal tiles that can share
- * air with both of the related adjacent cardinal tiles
- */
-/turf/proc/GetAtmosAdjacentTurfs(alldir = FALSE)
- var/adjacent_turfs
- if (atmos_adjacent_turfs)
- adjacent_turfs = atmos_adjacent_turfs.Copy()
- else
- adjacent_turfs = list()
-
- if (!alldir)
- return adjacent_turfs
+/turf/proc/get_atmos_adjacent_turfs()
+ return LAZYCOPY(atmos_adjacent_turfs)
- var/turf/curloc = src
+/turf/proc/get_atmos_all_adjacent_turfs()
+ var/list/adjacent_turfs = LAZYCOPY(atmos_adjacent_turfs)
- for (var/direction in GLOB.diagonals_multiz)
- var/matchingDirections = 0
- var/turf/S = get_step_multiz(curloc, direction)
+ for(var/dir in GLOB.diagonals)
+ var/turf/S = get_step(src, dir)
if(!S)
continue
+ adjacent_turfs += S
- for (var/checkDirection in GLOB.cardinals_multiz)
- var/turf/checkTurf = get_step(S, checkDirection)
- if(!S.atmos_adjacent_turfs || !S.atmos_adjacent_turfs[checkTurf])
- continue
+ var/datum/virtual_level/zone = get_virtual_level()
+ if(!zone)
+ return adjacent_turfs
- if (adjacent_turfs[checkTurf])
- matchingDirections++
+ var/turf/above = zone.get_above_turf(src)
+ var/turf/below = zone.get_below_turf(src)
- if (matchingDirections >= 2)
- adjacent_turfs += S
- break
+ if(above)
+ adjacent_turfs += above
+ adjacent_turfs += above.atmos_adjacent_turfs
+ if(below)
+ adjacent_turfs += below
+ adjacent_turfs += below.atmos_adjacent_turfs
+
+ return adjacent_turfs
+
+/turf/proc/get_atmos_cardinal_adjacent_turfs()
+ var/list/adjacent_turfs = LAZYCOPY(atmos_adjacent_turfs)
+
+ var/datum/virtual_level/zone = get_virtual_level()
+ if(!zone)
+ return adjacent_turfs
+
+ var/turf/above = zone.get_above_turf(src)
+ var/turf/below = zone.get_below_turf(src)
+
+ if(above)
+ adjacent_turfs += above
+ if(below)
+ adjacent_turfs += below
return adjacent_turfs
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 18b7b99a731..d5c0a9fead1 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -20,7 +20,7 @@
var/pressure_direction = 0
var/turf/pressure_specific_target
- var/datum/gas_mixture/turf/air
+ var/datum/gas_mixture/air
var/obj/effect/hotspot/active_hotspot
var/planetary_atmos = FALSE //air will revert to initial_gas_mix over time
@@ -184,14 +184,14 @@
/turf/proc/handle_decompression_floor_rip()
/turf/open/floor/handle_decompression_floor_rip(sum)
- if(sum > 20 && prob(clamp(sum / 10, 0, 30)) && !blocks_air)
+ if(!blocks_air && sum > 20 && prob(clamp(sum / 10, 0, 30)))
remove_tile()
/turf/open/process_cell(fire_count)
//////////////////////////SPACEWIND/////////////////////////////
-/turf/proc/consider_pressure_difference()
+/turf/proc/consider_pressure_difference(turf/T, difference)
return
/turf/open/consider_pressure_difference(turf/T, difference)
diff --git a/code/modules/atmospherics/gasmixtures/auxgm.dm b/code/modules/atmospherics/gasmixtures/auxgm.dm
index b3a81dbb0e9..e2f873c9dfd 100644
--- a/code/modules/atmospherics/gasmixtures/auxgm.dm
+++ b/code/modules/atmospherics/gasmixtures/auxgm.dm
@@ -1,5 +1,5 @@
GLOBAL_LIST_INIT(hardcoded_gases, list(GAS_O2, GAS_N2, GAS_CO2, GAS_PLASMA)) //the main four gases, which were at one time hardcoded
-GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(GAS_O2, GAS_N2, GAS_CO2, GAS_PLUOXIUM, GAS_STIMULUM, GAS_NITRYL))) //unable to react amongst themselves
+GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(GAS_O2, GAS_N2, GAS_CO2, GAS_CHLORINE, GAS_HYDROGEN_CHLORIDE))) //unable to react amongst themselves
// Auxgm
// It's a send-up of XGM, like what baystation got.
@@ -38,25 +38,48 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(GAS_O2, GAS_N2, GAS_CO2, GA
/datum/gas
var/id = ""
+ /// heat capacity? thats the only explanation on what this var is
var/specific_heat = 0
var/name = ""
- var/gas_overlay = "generic" //icon_state in icons/effects/atmospherics.dmi
- var/color = "#ffff" // Tints the overlay by this color. Use instead of gas_overlay, usually (but not necessarily).
+ ///icon_state in icons/effects/atmospherics.dmi
+ var/gas_overlay = "generic"
+ /// Tints the overlay by this color. Use instead of gas_overlay, usually (but not necessarily).
+ var/color = "#ffff"
var/moles_visible = null
- var/flags = NONE //currently used by canisters
- var/group = null // groups for scrubber/filter listing
- var/fusion_power = 0 // How much the gas destabilizes a fusion reaction
- var/breath_results = GAS_CO2 // what breathing this breathes out
- var/datum/reagent/breath_reagent = null // what breathing this adds to your reagents
- var/datum/reagent/breath_reagent_dangerous = null // what breathing this adds to your reagents IF it's above a danger threshold
- var/list/breath_alert_info = null // list for alerts that pop up when you have too much/not enough of something
- var/oxidation_temperature = null // temperature above which this gas is an oxidizer; null for none
- var/oxidation_rate = 1 // how many moles of this can oxidize how many moles of material
- var/fire_temperature = null // temperature above which gas may catch fire; null for none
- var/list/fire_products = null // what results when this gas is burned (oxidizer or fuel); null for none
- var/enthalpy = 0 // Standard enthalpy of formation in joules, used for fires
- var/fire_burn_rate = 1 // how many moles are burned per product released
- var/fire_radiation_released = 0 // How much radiation is released when this gas burns
+ ///currently used by canisters
+ var/flags = NONE
+ /// groups for scrubber/filter listing
+ var/group = null
+ /// How much the gas destabilizes a fusion reaction
+ var/fusion_power = 0
+ /// what breathing this breathes out
+ var/breath_results = GAS_CO2
+ /// what breathing this adds to your reagents
+ var/datum/reagent/breath_reagent = null
+ /// what breathing this adds to your reagents IF it's above a danger threshold
+ var/datum/reagent/breath_reagent_dangerous = null
+ /// list for alerts that pop up when you have too much/not enough of something
+ var/list/breath_alert_info = null
+ /// temperature above which this gas is an oxidizer; null for none
+ var/oxidation_temperature = null
+ /// how much a single mole of this gas can oxidize another mole(s) of gas
+ var/oxidation_rate = 1
+ /// temperature above which gas may catch fire; null for none
+ var/fire_temperature = null
+ /// what results when this gas is burned (oxidizer or fuel); null for none
+ var/list/fire_products = null
+ /// Standard enthalpy of formation in joules, used for fires
+ var/enthalpy = 0
+ /// how many moles are burned per product released
+ var/fire_burn_rate = 1
+ /// How much radiation is released when this gas burns
+ var/fire_radiation_released = 0
+ ///a list of odor texts this gas gives, if null or odor_power is 0 this gas is smellless
+ var/list/odor
+ ///if the odor gives negative signs such as coughing on a high concentratation. if your gas doesn't have a noticeable scent, set this to false
+ var/odor_emotes = TRUE
+ ///the multiplier per of this gas's odor, if higher its easily detected in lower conentrations and much more unbearable at lower conentrations as well
+ var/odor_power = 0
/datum/gas/proc/breath(partial_pressure, light_threshold, heavy_threshold, moles, mob/living/carbon/C, obj/item/organ/lungs/lungs)
// This is only called on gases with the GAS_FLAG_BREATH_PROC flag. When possible, do NOT use this--
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index fa3ba14457d..1aff4ddadb7 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -210,8 +210,6 @@ get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles()
10 = 2.5/5*20
*/
-/datum/gas_mixture/turf
-
/// Releases gas from src to output air. This means that it can not transfer air to gas mixture with higher pressure.
/datum/gas_mixture/proc/release_gas_to(datum/gas_mixture/output_air, target_pressure)
var/output_starting_pressure = output_air.return_pressure()
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index 00ca2d22f76..10c4e9e417d 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -45,15 +45,15 @@
/datum/gas_reaction/proc/test()
return list("success" = TRUE)
-/datum/gas_reaction/nobliumsupression
+/datum/gas_reaction/argon
priority = INFINITY
- name = "Hyper-Noblium Reaction Suppression"
+ name = "Noble Gas Reaction Suppression"
id = "nobstop"
-/datum/gas_reaction/nobliumsupression/init_reqs()
- min_requirements = list(GAS_HYPERNOB = REACTION_OPPRESSION_THRESHOLD)
+/datum/gas_reaction/argon/init_reqs()
+ min_requirements = list(GAS_ARGON = REACTION_OPPRESSION_THRESHOLD)
-/datum/gas_reaction/nobliumsupression/react()
+/datum/gas_reaction/argon/react()
return STOP_REACTIONS
//water vapor: puts out fires?
@@ -223,7 +223,7 @@
else
temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE)
if(temperature_scale > 0)
- oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale
+ oxygen_burn_rate = PLASMA_BURN_RATE_BASE - temperature_scale
if(air.get_moles(GAS_O2) / air.get_moles(GAS_PLASMA) > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium.
super_saturation = TRUE
if(air.get_moles(GAS_O2) > air.get_moles(GAS_PLASMA)*PLASMA_OXYGEN_FULLBURN)
@@ -312,7 +312,7 @@
else
temperature_scale = (FREON_MAXIMUM_BURN_TEMPERATURE - temperature)/(FREON_MAXIMUM_BURN_TEMPERATURE - FREON_LOWER_TEMPERATURE) //calculate the scale based on the temperature
if(temperature_scale >= 0)
- oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale
+ oxygen_burn_rate = PLASMA_BURN_RATE_BASE - temperature_scale
if(air.get_moles(GAS_O2) > air.get_moles(GAS_FREON)*FREON_OXYGEN_FULLBURN)
freon_burn_rate = (air.get_moles(GAS_FREON)*temperature_scale)/FREON_BURN_RATE_DELTA
else
@@ -521,33 +521,7 @@
air.set_temperature(clamp(thermal_energy/new_heat_capacity, TCMB, INFINITY)) //THIS SHOULD STAY OR FUSION WILL EAT YOUR FACE
return REACTING
-/datum/gas_reaction/fusion/test()
- var/datum/gas_mixture/G = new
- G.set_moles(GAS_CO2,300)
- G.set_moles(GAS_PLASMA,1000)
- G.set_moles(GAS_TRITIUM,100.61)
- G.set_moles(GAS_NITRYL,1)
- G.set_temperature(15000)
- G.set_volume(1000)
-
- var/result = G.react()
- if(result != REACTING)
- return list("success" = FALSE, "message" = "Reaction didn't go at all!")
-
- var/instability = G.analyzer_results["fusion"]
- var/plas = G.get_moles(GAS_PLASMA)
- var/co2 = G.get_moles(GAS_CO2)
- var/temp = G.return_temperature()
-
- if(abs(instability - 2.66) > 0.01)
- return list("success" = FALSE, "message" = "Fusion is not calculating analyzer results correctly, should be 2.66, is instead [instability]")
- if(abs(plas - 458.241) > 0.5)
- return list("success" = FALSE, "message" = "Fusion is not calculating plasma correctly, should be 458.241, is instead [plas]")
- if(abs(co2 - 505.369) > 0.5)
- return list("success" = FALSE, "message" = "Fusion is not calculating co2 correctly, should be 505.369, is instead [co2]")
- if(abs(temp - 112291) > 200) // I'm not calculating this at all just putting in the values I get when I do it now
- return list("success" = FALSE, "message" = "Fusion is not calculating temperature correctly, should be around 112291, is instead [temp]")
- return ..()
+//has fusion ever worked?
/datum/gas_reaction/nitrousformation //formationn of n2o, esothermic, requires bz as catalyst
priority = 3
@@ -581,51 +555,6 @@
air.set_temperature(max(((temperature * old_heat_capacity + energy_used) / new_heat_capacity),TCMB)) //the air heats up when reacting
return REACTING
-/datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst.
- priority = 4
- name = "Nitryl formation"
- id = "nitrylformation"
-
-/datum/gas_reaction/nitrylformation/init_reqs()
- min_requirements = list(
- GAS_O2 = 20,
- GAS_N2 = 20,
- GAS_NITROUS = 5,
- "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*25
- )
-
-/datum/gas_reaction/nitrylformation/react(datum/gas_mixture/air)
- var/temperature = air.return_temperature()
-
- var/old_heat_capacity = air.heat_capacity()
- var/heat_efficency = min(temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*100),air.get_moles(GAS_O2),air.get_moles(GAS_N2))
- var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY
- if ((air.get_moles(GAS_O2) - heat_efficency < 0)|| (air.get_moles(GAS_N2) - heat_efficency < 0)) //Shouldn't produce gas from nothing.
- return NO_REACTION
- air.adjust_moles(GAS_O2, -heat_efficency)
- air.adjust_moles(GAS_N2, -heat_efficency)
- air.adjust_moles(GAS_NITRYL, heat_efficency*2)
-
- if(energy_used > 0)
- var/new_heat_capacity = air.heat_capacity()
- if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
- air.set_temperature(max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB))
- return REACTING
-
-/datum/gas_reaction/nitrylformation/test()
- var/datum/gas_mixture/G = new
- G.set_moles(GAS_O2,30)
- G.set_moles(GAS_N2,30)
- G.set_moles(GAS_NITROUS,10)
- G.set_volume(1000)
- G.set_temperature(150000)
- var/result = G.react()
- if(result != REACTING)
- return list("success" = FALSE, "message" = "Reaction didn't go at all!")
- if(G.get_moles(GAS_NITRYL) < 0.8)
- return list("success" = FALSE, "message" = "Nitryl isn't being generated correctly! Only [G.get_moles(GAS_BZ)] mols were produced, when there should be 0.8!")
- return ..()
-
/datum/gas_reaction/bzformation //Formation of BZ by combining plasma and tritium at low pressures. Exothermic.
priority = 5
name = "BZ Gas formation"
@@ -702,126 +631,31 @@
air.set_temperature(max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB))
return REACTING
-/datum/gas_reaction/stimformation //Stimulum formation follows a strange pattern of how effective it will be at a given temperature, having some multiple peaks and some large dropoffs. Exo and endo thermic.
- priority = 7
- name = "Stimulum formation"
- id = "stimformation"
-
-/datum/gas_reaction/stimformation/init_reqs()
- min_requirements = list(
- GAS_TRITIUM = 30,
- GAS_PLASMA = 10,
- GAS_BZ = 20,
- GAS_NITRYL = 30,
- "TEMP" = STIMULUM_HEAT_SCALE/2)
-
-/datum/gas_reaction/stimformation/react(datum/gas_mixture/air)
- var/old_heat_capacity = air.heat_capacity()
- var/heat_scale = min(air.return_temperature()/STIMULUM_HEAT_SCALE,air.get_moles(GAS_TRITIUM),air.get_moles(GAS_PLASMA),air.get_moles(GAS_NITRYL))
- var/stim_energy_change = heat_scale + STIMULUM_FIRST_RISE*(heat_scale**2) - STIMULUM_FIRST_DROP*(heat_scale**3) + STIMULUM_SECOND_RISE*(heat_scale**4) - STIMULUM_ABSOLUTE_DROP*(heat_scale**5)
-
- if ((air.get_moles(GAS_TRITIUM) - heat_scale < 0)|| (air.get_moles(GAS_PLASMA) - heat_scale < 0) || (air.get_moles(GAS_NITRYL) - heat_scale < 0)) //Shouldn't produce gas from nothing.
- return NO_REACTION
- air.adjust_moles(GAS_STIMULUM, heat_scale/10)
- air.adjust_moles(GAS_TRITIUM, -heat_scale)
- air.adjust_moles(GAS_PLASMA, -heat_scale)
- air.adjust_moles(GAS_NITRYL, -heat_scale)
-
- if(stim_energy_change)
- var/new_heat_capacity = air.heat_capacity()
- if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
- air.set_temperature(max(((air.return_temperature()*old_heat_capacity + stim_energy_change)/new_heat_capacity),TCMB))
- return REACTING
-
-/datum/gas_reaction/stimformation/test()
- //above mentioned "strange pattern" is a basic quintic polynomial, it's fine, can calculate it manually
- var/datum/gas_mixture/G = new
- G.set_moles(GAS_BZ,30)
- G.set_moles(GAS_PLASMA,1000)
- G.set_moles(GAS_TRITIUM,1000)
- G.set_moles(GAS_NITRYL,1000)
- G.set_volume(1000)
- G.set_temperature(12998000) // yeah, really
-
- var/result = G.react()
- if(result != REACTING)
- return list("success" = FALSE, "message" = "Reaction didn't go at all!")
- if(!G.get_moles(GAS_STIMULUM))
- return list("success" = FALSE, "message" = "Stimulum isn't being generated!")
- return ..()
-
-/datum/gas_reaction/nobliumformation //Hyper-Noblium formation is extrememly endothermic, but requires high temperatures to start. Due to its high mass, hyper-nobelium uses large amounts of nitrogen and tritium. BZ can be used as a catalyst to make it less endothermic.
- priority = 8
- name = "Hyper-Noblium condensation"
- id = "nobformation"
+/datum/gas_reaction/hydrogen_chloride_formation
+ priority = 11
+ name = "Hydrogen Chloride formation"
+ id = "hydrogenchlorideformation"
-/datum/gas_reaction/nobliumformation/init_reqs()
+/datum/gas_reaction/hydrogen_chloride_formation/init_reqs()
min_requirements = list(
- GAS_N2 = 10,
- GAS_TRITIUM = 5,
- "ENER" = NOBLIUM_FORMATION_ENERGY)
-
-/datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air)
- . = REACTING
- var/old_heat_capacity = air.heat_capacity()
- var/nob_formed = min((air.get_moles(GAS_N2)+air.get_moles(GAS_TRITIUM))/100,air.get_moles(GAS_TRITIUM)/10,air.get_moles(GAS_N2)/20)
- var/energy_taken = nob_formed*(NOBLIUM_FORMATION_ENERGY/(max(air.get_moles(GAS_BZ),1)))
- if ((air.get_moles(GAS_TRITIUM) - 10*nob_formed < 0) || (air.get_moles(GAS_N2) - 20*nob_formed < 0))
- return NO_REACTION
- air.adjust_moles(GAS_TRITIUM, -10*nob_formed)
- air.adjust_moles(GAS_N2, -20*nob_formed)
- air.adjust_moles(GAS_HYPERNOB,nob_formed)
-
- if (nob_formed)
- var/new_heat_capacity = air.heat_capacity()
- if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
- air.set_temperature(max(((air.return_temperature()*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB))
-
-/datum/gas_reaction/nobliumformation/test()
- var/datum/gas_mixture/G = new
- G.set_moles(GAS_N2,100)
- G.set_moles(GAS_TRITIUM,500)
- G.set_volume(1000)
- G.set_temperature(5000000) // yeah, really
- var/result = G.react()
- if(result != REACTING)
- return list("success" = FALSE, "message" = "Reaction didn't go at all!")
- return ..()
-
-/datum/gas_reaction/stim_ball
- priority = 9
- name ="Stimulum Energy Ball"
- id = "stimball"
-
-/datum/gas_reaction/stim_ball/init_reqs()
- min_requirements = list(
- GAS_PLUOXIUM = STIM_BALL_GAS_AMOUNT,
- GAS_STIMULUM = STIM_BALL_GAS_AMOUNT,
- GAS_NITRYL = MINIMUM_MOLE_COUNT,
- GAS_PLASMA = MINIMUM_MOLE_COUNT,
+ GAS_CHLORINE = 5,
+ GAS_HYDROGEN = 5,
"TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST
)
-/datum/gas_reaction/stim_ball/react(datum/gas_mixture/air, datum/holder)
- var/turf/open/location
+/datum/gas_reaction/hydrogen_chloride_formation/react(datum/gas_mixture/air)
+ var/temperature = air.return_temperature()
var/old_heat_capacity = air.heat_capacity()
- if(istype(holder,/datum/pipeline)) //Find the tile the reaction is occuring on, or a random part of the network if it's a pipenet.
- var/datum/pipeline/pipenet = holder
- location = get_turf(pick(pipenet.members))
- else
- location = get_turf(holder)
- var/ball_shot_angle = 180*cos(air.get_moles(GAS_H2O)/air.get_moles(GAS_NITRYL))+180
- var/stim_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(GAS_PLASMA),air.get_moles(GAS_STIMULUM))
- var/pluox_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(GAS_PLASMA),air.get_moles(GAS_PLUOXIUM))
- var/energy_released = stim_used*STIMULUM_HEAT_SCALE//Stimulum has a lot of stored energy, and breaking it up releases some of it
- location.fire_nuclear_particle(ball_shot_angle)
- air.adjust_moles(GAS_CO2, 4*pluox_used)
- air.adjust_moles(GAS_N2, 8*stim_used)
- air.adjust_moles(GAS_PLUOXIUM, -pluox_used)
- air.adjust_moles(GAS_STIMULUM, -stim_used)
- air.adjust_moles(GAS_PLASMA, max(-air.get_moles(GAS_PLASMA)/2,-30))
- if(energy_released)
+ var/reaction_efficency = min((temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*10)),air.get_moles(GAS_CHLORINE),air.get_moles(GAS_HYDROGEN))
+ var/energy_released = reaction_efficency*185000
+ if ((air.get_moles(GAS_CHLORINE) - reaction_efficency < 0)|| (air.get_moles(GAS_HYDROGEN) - (reaction_efficency) < 0) || energy_released <= 0) //Shouldn't produce gas from nothing.
+ return NO_REACTION
+ air.adjust_moles(GAS_HYDROGEN_CHLORIDE, reaction_efficency)
+ air.adjust_moles(GAS_HYDROGEN, -reaction_efficency)
+ air.adjust_moles(GAS_CHLORINE, -reaction_efficency)
+
+ if(energy_released > 0)
var/new_heat_capacity = air.heat_capacity()
if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
- air.set_temperature(clamp((air.return_temperature()*old_heat_capacity + energy_released)/new_heat_capacity,TCMB,INFINITY))
+ air.set_temperature(max(((temperature*old_heat_capacity + energy_released)/new_heat_capacity),TCMB))
return REACTING
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index e5a1be0294d..bfd869247f8 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -106,6 +106,11 @@
var/alarm_frequency = FREQ_ATMOS_ALARMS
var/datum/radio_frequency/radio_connection
+ //anything outright hazardous (flammable, toxic, generally Weird)
+ var/list/filter_basic = list(GAS_CO2, GAS_PLASMA, GAS_NITROUS, GAS_BZ, GAS_TRITIUM, GAS_FREON, GAS_HYDROGEN, GAS_CHLORINE, GAS_HYDROGEN_CHLORIDE, GAS_CO, GAS_AMMONIA, GAS_METHANE, GAS_SO2, GAS_O3)
+ //anything that isn't o2 or n2.
+ var/list/filter_extra = list(GAS_CO2, GAS_PLASMA, GAS_NITROUS, GAS_BZ, GAS_TRITIUM, GAS_FREON, GAS_HYDROGEN, GAS_CHLORINE, GAS_HYDROGEN_CHLORIDE, GAS_H2O, GAS_CO, GAS_ARGON, GAS_AMMONIA, GAS_METHANE, GAS_SO2, GAS_O3)
+
var/list/TLV = list( // Breathable air.
"pressure" = new/datum/tlv(HAZARD_LOW_PRESSURE, WARNING_LOW_PRESSURE, WARNING_HIGH_PRESSURE, HAZARD_HIGH_PRESSURE), // kPa. Values are min2, min1, max1, max2
"temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66),
@@ -115,14 +120,18 @@
GAS_PLASMA = new/datum/tlv/dangerous,
GAS_NITROUS = new/datum/tlv/dangerous,
GAS_BZ = new/datum/tlv/dangerous,
- GAS_HYPERNOB = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic
GAS_H2O = new/datum/tlv/dangerous,
GAS_TRITIUM = new/datum/tlv/dangerous,
- GAS_STIMULUM = new/datum/tlv/dangerous,
- GAS_NITRYL = new/datum/tlv/dangerous,
- GAS_PLUOXIUM = new/datum/tlv(-1, -1, 5, 6), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires
GAS_FREON = new/datum/tlv/dangerous,
- GAS_HYDROGEN = new/datum/tlv/dangerous
+ GAS_HYDROGEN = new/datum/tlv/dangerous,
+ GAS_CHLORINE = new/datum/tlv/dangerous,
+ GAS_HYDROGEN_CHLORIDE = new/datum/tlv/dangerous,
+ GAS_CO = new/datum/tlv/dangerous,
+ GAS_ARGON = new/datum/tlv(-1, -1, 1000, 1000), //inert and nontoxic
+ GAS_AMMONIA = new/datum/tlv/dangerous,
+ GAS_METHANE = new/datum/tlv/dangerous,
+ GAS_SO2 = new/datum/tlv/dangerous,
+ GAS_O3 = new/datum/tlv/dangerous,
)
/obj/machinery/airalarm/server // No checks here.
@@ -135,14 +144,18 @@
GAS_PLASMA = new/datum/tlv/no_checks,
GAS_NITROUS = new/datum/tlv/no_checks,
GAS_BZ = new/datum/tlv/no_checks,
- GAS_HYPERNOB = new/datum/tlv/no_checks,
GAS_H2O = new/datum/tlv/no_checks,
GAS_TRITIUM = new/datum/tlv/no_checks,
- GAS_STIMULUM = new/datum/tlv/no_checks,
- GAS_NITRYL = new/datum/tlv/no_checks,
- GAS_PLUOXIUM = new/datum/tlv/no_checks,
GAS_FREON = new/datum/tlv/no_checks,
- GAS_HYDROGEN = new/datum/tlv/no_checks
+ GAS_HYDROGEN = new/datum/tlv/no_checks,
+ GAS_CHLORINE = new/datum/tlv/dangerous,
+ GAS_HYDROGEN_CHLORIDE = new/datum/tlv/dangerous,
+ GAS_CO = new/datum/tlv/dangerous,
+ GAS_ARGON = new/datum/tlv/no_checks,
+ GAS_AMMONIA = new/datum/tlv/no_checks,
+ GAS_METHANE = new/datum/tlv/no_checks,
+ GAS_SO2 = new/datum/tlv/no_checks,
+ GAS_O3 = new/datum/tlv/no_checks,
)
heating_manage = FALSE
@@ -156,14 +169,18 @@
GAS_PLASMA = new/datum/tlv/dangerous,
GAS_NITROUS = new/datum/tlv/dangerous,
GAS_BZ = new/datum/tlv/dangerous,
- GAS_HYPERNOB = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic
GAS_H2O = new/datum/tlv/dangerous,
GAS_TRITIUM = new/datum/tlv/dangerous,
- GAS_STIMULUM = new/datum/tlv/dangerous,
- GAS_NITRYL = new/datum/tlv/dangerous,
- GAS_PLUOXIUM = new/datum/tlv(-1, -1, 1000, 1000), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires
GAS_FREON = new/datum/tlv/dangerous,
- GAS_HYDROGEN = new/datum/tlv/dangerous
+ GAS_HYDROGEN = new/datum/tlv/dangerous,
+ GAS_CHLORINE = new/datum/tlv/dangerous,
+ GAS_HYDROGEN_CHLORIDE = new/datum/tlv/dangerous,
+ GAS_CO = new/datum/tlv/dangerous,
+ GAS_ARGON = new/datum/tlv(-1, -1, 1000, 1000), //inert and nontoxic
+ GAS_AMMONIA = new/datum/tlv/dangerous,
+ GAS_METHANE = new/datum/tlv/dangerous,
+ GAS_SO2 = new/datum/tlv/dangerous,
+ GAS_O3 = new/datum/tlv/dangerous,
)
heating_manage = FALSE
@@ -228,8 +245,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
/obj/machinery/airalarm/Destroy()
SSradio.remove_object(src, frequency)
- qdel(wires)
- wires = null
+ QDEL_NULL(wires)
var/area/ourarea = get_area(src)
ourarea.atmosalert(FALSE, src)
return ..()
@@ -262,6 +278,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
ui = new(user, src, "AirAlarm", name)
ui.open()
+/obj/machinery/airalarm/examine_more(mob/user)
+ ui_interact(user)
+ return ..()
+
/obj/machinery/airalarm/ui_data(mob/user)
var/data = list(
"locked" = locked,
@@ -542,7 +562,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
for(var/device_id in A.air_scrub_names)
send_signal(device_id, list(
"power" = 1,
- "set_filters" = list(GAS_CO2, GAS_BZ),
+ "set_filters" = filter_basic,
"scrubbing" = 1,
"widenet" = 0
), signal_source)
@@ -556,20 +576,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
for(var/device_id in A.air_scrub_names)
send_signal(device_id, list(
"power" = 1,
- "set_filters" = list(
- GAS_CO2,
- GAS_PLASMA,
- GAS_H2O,
- GAS_HYPERNOB,
- GAS_NITROUS,
- GAS_NITRYL,
- GAS_TRITIUM,
- GAS_BZ,
- GAS_STIMULUM,
- GAS_PLUOXIUM,
- GAS_FREON,
- GAS_HYDROGEN
- ),
+ "set_filters" = filter_extra,
"scrubbing" = 1,
"widenet" = 1
), signal_source)
@@ -596,7 +603,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
for(var/device_id in A.air_scrub_names)
send_signal(device_id, list(
"power" = 1,
- "set_filters" = list(GAS_CO2, GAS_BZ),
+ "set_filters" = filter_basic,
"scrubbing" = 1,
"widenet" = 0
), signal_source)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 5ff6b2e396b..6bd2308d929 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -28,7 +28,7 @@
var/obj/item/radio/radio
var/radio_key = /obj/item/encryptionkey/headset_com
- var/radio_channel = RADIO_CHANNEL_COMMAND
+ var/radio_channel = RADIO_CHANNEL_EMERGENCY
var/running_anim = FALSE
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 7a2559724ad..2caef9b39d5 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -110,9 +110,9 @@
if(pump_direction & RELEASING) // internal -> external
var/pressure_delta = 10000
- if(pressure_checks&EXT_BOUND)
+ if(pressure_checks & EXT_BOUND)
pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
- if(pressure_checks&INT_BOUND)
+ if(pressure_checks & INT_BOUND)
pressure_delta = min(pressure_delta, (air_contents.return_pressure() - internal_pressure_bound))
if(pressure_delta > 0)
@@ -126,9 +126,9 @@
if(environment.return_pressure() > 0)
var/our_multiplier = air_contents.return_volume() / (environment.return_temperature() * R_IDEAL_GAS_EQUATION)
var/moles_delta = 10000 * our_multiplier
- if(pressure_checks&EXT_BOUND)
+ if(pressure_checks & EXT_BOUND)
moles_delta = min(moles_delta, (environment_pressure - external_pressure_bound) * environment.return_volume() / (environment.return_temperature() * R_IDEAL_GAS_EQUATION))
- if(pressure_checks&INT_BOUND)
+ if(pressure_checks & INT_BOUND)
moles_delta = min(moles_delta, (internal_pressure_bound - air_contents.return_pressure()) * our_multiplier)
if(moles_delta > 0)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index dc8b278959f..7706a7e3c42 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -20,7 +20,7 @@
var/id_tag = null
var/scrubbing = SCRUBBING //0 = siphoning, 1 = scrubbing
- var/filter_types = list(GAS_CO2, GAS_BZ)
+ var/filter_types = list(GAS_CO2, GAS_BZ, GAS_CO)
var/volume_rate = 200
var/widenet = 0 //is this scrubber acting on the 3x3 area around it.
var/list/turf/adjacent_turfs = list()
@@ -126,12 +126,11 @@
return TRUE
/obj/machinery/atmospherics/components/unary/vent_scrubber/atmosinit()
- radio_filter_in = frequency==initial(frequency)?(RADIO_FROM_AIRALARM):null
- radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null
+ radio_filter_in = frequency == initial(frequency) ? (RADIO_FROM_AIRALARM) : null
+ radio_filter_out = frequency == initial(frequency) ? (RADIO_TO_AIRALARM) : null
if(frequency)
set_frequency(frequency)
broadcast_status()
- check_turfs()
..()
/obj/machinery/atmospherics/components/unary/vent_scrubber/process_atmos()
@@ -141,55 +140,35 @@
if(use_static_power != NO_POWER_USE)
set_no_power()
return FALSE
- if(!nodes[1])
+
+ if(!nodes[1] || !islist(filter_types))
return FALSE
- scrub(loc)
+
+ var/datum/gas_mixture/air_contents = airs[1]
+ if(!air_contents.return_pressure() >= 50 * ONE_ATMOSPHERE)
+ return FALSE
+
+ var/turf/location = loc
+ scrub(location)
if(widenet)
- if(use_static_power != ACTIVE_POWER_USE)
- set_active_power()
- for(var/turf/tile in adjacent_turfs)
+ for(var/turf/tile as anything in location.atmos_adjacent_turfs)
scrub(tile)
- else
- if(use_static_power != IDLE_POWER_USE)
- set_idle_power()
return TRUE
/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(turf/tile)
- if(!istype(tile))
- return FALSE
var/datum/gas_mixture/environment = tile.return_air()
- var/datum/gas_mixture/air_contents = airs[1]
-
- if(air_contents.return_pressure() >= 50 * ONE_ATMOSPHERE || !islist(filter_types))
- return FALSE
if(scrubbing & SCRUBBING)
- environment.scrub_into(air_contents, volume_rate/environment.return_volume(), filter_types)
- tile.air_update_turf()
+ environment.scrub_into(airs[1], volume_rate / environment.return_volume(), filter_types)
else //Just siphoning all air
- environment.transfer_ratio_to(air_contents, volume_rate/environment.return_volume())
- tile.air_update_turf()
+ environment.transfer_ratio_to(airs[1], volume_rate / environment.return_volume())
+ tile.air_update_turf()
update_parents()
return TRUE
-//There is no easy way for an object to be notified of changes to atmos can pass flags
-// So we check every machinery process (2 seconds)
-/obj/machinery/atmospherics/components/unary/vent_scrubber/process()
- if(widenet)
- check_turfs()
-
-//we populate a list of turfs with nonatmos-blocked cardinal turfs AND
-// diagonal turfs that can share atmos with *both* of the cardinal turfs
-
-/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/check_turfs()
- adjacent_turfs.Cut()
- var/turf/T = get_turf(src)
- if(istype(T))
- adjacent_turfs = T.GetAtmosAdjacentTurfs(alldir = 1)
-
/obj/machinery/atmospherics/components/unary/vent_scrubber/receive_signal(datum/signal/signal)
if(!is_operational || !signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
return 0
@@ -206,6 +185,11 @@
if("toggle_widenet" in signal.data)
widenet = !widenet
+ if(widenet)
+ set_active_power()
+ else
+ set_idle_power()
+
var/old_scrubbing = scrubbing
if("scrubbing" in signal.data)
scrubbing = text2num(signal.data["scrubbing"])
@@ -310,10 +294,10 @@
icon_state = "scrub_map_on-4"
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/lavaland
- filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ)
+ filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ, GAS_CO)
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3/lavaland
- filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ)
+ filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ, GAS_CO)
#undef SIPHONING
#undef SCRUBBING
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index f2e563c07b5..b8f02318521 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -43,18 +43,16 @@
"co2" = /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
"plasma" = /obj/machinery/portable_atmospherics/canister/toxins,
"n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
- "no2" = /obj/machinery/portable_atmospherics/canister/nitryl,
"bz" = /obj/machinery/portable_atmospherics/canister/bz,
"air" = /obj/machinery/portable_atmospherics/canister/air,
"water vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor,
"tritium" = /obj/machinery/portable_atmospherics/canister/tritium,
- "hyper-noblium" = /obj/machinery/portable_atmospherics/canister/nob,
- "stimulum" = /obj/machinery/portable_atmospherics/canister/stimulum,
- "pluoxium" = /obj/machinery/portable_atmospherics/canister/pluoxium,
"caution" = /obj/machinery/portable_atmospherics/canister,
"freon" = /obj/machinery/portable_atmospherics/canister/freon,
"hydrogen" = /obj/machinery/portable_atmospherics/canister/hydrogen,
- "fuel mix" = /obj/machinery/portable_atmospherics/canister/fuel
+ "fuel mix" = /obj/machinery/portable_atmospherics/canister/fuel,
+ "cl2" = /obj/machinery/portable_atmospherics/canister/chlorine,
+ "hcl" =/obj/machinery/portable_atmospherics/canister/hydrogen_chloride,
)
/obj/machinery/portable_atmospherics/canister/interact(mob/user)
@@ -76,12 +74,24 @@
icon_state = "blue"
gas_type = GAS_O2
+/obj/machinery/portable_atmospherics/canister/ozone
+ name = "ozone canister"
+ desc = "Ozone. Sometimes called as 'pure air', this is far from the truth; ozone is not good for your lungs nor heart."
+ icon_state = "darkblue"
+ gas_type = GAS_O3
+
/obj/machinery/portable_atmospherics/canister/carbon_dioxide
name = "co2 canister"
desc = "Carbon dioxide. What the fuck is carbon dioxide?"
icon_state = "black"
gas_type = GAS_CO2
+/obj/machinery/portable_atmospherics/canister/carbon_monoxide
+ name = "co canister"
+ desc = "Carbon Monoxide. Highly dangerous and invisible to the naked eye."
+ icon_state = "black"
+ gas_type = GAS_CO
+
/obj/machinery/portable_atmospherics/canister/toxins
name = "plasma canister"
desc = "Plasma gas. The reason YOU are here. Highly toxic."
@@ -111,29 +121,11 @@
icon_state = "green"
gas_type = GAS_TRITIUM
-/obj/machinery/portable_atmospherics/canister/nob
- name = "hyper-noblium canister"
- desc = "Hyper-Noblium. More noble than all other gases."
- icon_state = "nob"
- gas_type = GAS_HYPERNOB
-
-/obj/machinery/portable_atmospherics/canister/nitryl
- name = "nitryl canister"
- desc = "Nitryl gas. Feels great 'til the acid eats your lungs."
- icon_state = "brown"
- gas_type = GAS_NITRYL
-
-/obj/machinery/portable_atmospherics/canister/stimulum
- name = "stimulum canister"
- desc = "Stimulum. High energy gas, high energy people."
- icon_state = "darkpurple"
- gas_type = GAS_STIMULUM
-
-/obj/machinery/portable_atmospherics/canister/pluoxium
- name = "pluoxium canister"
- desc = "Pluoxium. Like oxygen, but more bang for your buck."
- icon_state = "darkblue"
- gas_type = GAS_PLUOXIUM
+/obj/machinery/portable_atmospherics/canister/argon
+ name = "argon canister"
+ desc = "Argon. A noble gas that prevents other gases from reacting."
+ icon_state = "purple"
+ gas_type = GAS_ARGON
/obj/machinery/portable_atmospherics/canister/water_vapor
name = "water vapor canister"
@@ -155,6 +147,24 @@
icon_state = "orangews"
gas_type = GAS_HYDROGEN
+/obj/machinery/portable_atmospherics/canister/methane
+ name = "methane canister"
+ desc = "Methane. Used in thruster fuel along with kitchen stoves."
+ icon_state = "methane"
+ gas_type = GAS_METHANE
+
+/obj/machinery/portable_atmospherics/canister/ammonia
+ name = "ammonia canister"
+ desc = "Ammonia. Used in industrial processes."
+ icon_state = "brown"
+ gas_type = GAS_AMMONIA
+
+/obj/machinery/portable_atmospherics/canister/sulfur_dioxide
+ name = "sulfur dioxide canister"
+ desc = "Sulfur Dioxide. Produced naturally by volcanos."
+ icon_state = "sulfurdioxide"
+ gas_type = GAS_SO2
+
/obj/machinery/portable_atmospherics/canister/fuel
name = "fuel canister"
desc = "A highly volatile mix of hydrogen and oxygen."
@@ -170,6 +180,20 @@
air_contents.set_moles(GAS_HYDROGEN, 1000)
air_contents.set_temperature(T20C)
+/obj/machinery/portable_atmospherics/canister/chlorine
+ name = "chlorine canister"
+ desc = "chlorine"
+ icon_state = "greenys"
+ gas_type = GAS_CHLORINE
+ filled = 1
+
+/obj/machinery/portable_atmospherics/canister/hydrogen_chloride
+ name = "hydrogen chloride canister"
+ desc = "awful"
+ icon_state = "greenyshaz"
+ gas_type = GAS_HYDROGEN_CHLORIDE
+ filled = 1
+
/obj/machinery/portable_atmospherics/canister/fusion_test
name = "fusion test canister"
desc = "Don't be a badmin."
@@ -178,7 +202,6 @@
air_contents.set_moles(GAS_CO2,300)
air_contents.set_moles(GAS_PLASMA,1000)
air_contents.set_moles(GAS_TRITIUM,100.61)
- air_contents.set_moles(GAS_NITRYL,1)
air_contents.set_temperature(15000)
/obj/machinery/portable_atmospherics/canister/proc/get_time_left()
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 7505d2b8789..7ccf807ea25 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -8,7 +8,7 @@
var/volume_rate = 1000
var/overpressure_m = 80
var/use_overlays = TRUE
- var/list/scrubbing = list(GAS_PLASMA, GAS_CO2, GAS_NITROUS, GAS_BZ, GAS_NITRYL, GAS_TRITIUM, GAS_HYPERNOB, GAS_H2O, GAS_FREON, GAS_HYDROGEN)
+ var/list/scrubbing = list(GAS_PLASMA, GAS_CO2, GAS_NITROUS, GAS_BZ, GAS_TRITIUM, GAS_H2O, GAS_FREON, GAS_HYDROGEN, GAS_CO)
/obj/machinery/portable_atmospherics/scrubber/Destroy()
var/turf/T = get_turf(src)
@@ -146,7 +146,7 @@
..()
if(!holding)
var/turf/T = get_turf(src)
- for(var/turf/AT in T.GetAtmosAdjacentTurfs(alldir = TRUE))
+ for(var/turf/AT as anything in T.get_atmos_all_adjacent_turfs())
scrub(AT.return_air())
/obj/machinery/portable_atmospherics/scrubber/huge/attackby(obj/item/W, mob/user)
diff --git a/code/modules/autowiki/pages/techweb.dm b/code/modules/autowiki/pages/techweb.dm
index 0f4b87f9e2a..42e58dd1cc6 100644
--- a/code/modules/autowiki/pages/techweb.dm
+++ b/code/modules/autowiki/pages/techweb.dm
@@ -9,9 +9,6 @@
if (!node.show_on_wiki)
continue
- if (!valid_node(node))
- continue
-
output += "\n\n" + include_template("Autowiki/TechwebEntry", list(
"name" = escape_value(node.display_name),
"description" = escape_value(node.description),
@@ -21,9 +18,6 @@
return output
-/datum/autowiki/techweb/proc/valid_node(datum/techweb_node/node)
- return !node.experimental
-
/datum/autowiki/techweb/proc/generate_designs(list/design_ids)
var/output = ""
@@ -50,9 +44,6 @@
/datum/autowiki/techweb/experimental
page = "Template:Autowiki/Content/Techweb/Experimental"
-/datum/autowiki/techweb/experimental/valid_node(datum/techweb_node/node)
- return node.experimental
-
/proc/sort_research_nodes(node_id_a, node_id_b)
var/datum/techweb_node/node_a = SSresearch.techweb_nodes[node_id_a]
var/datum/techweb_node/node_b = SSresearch.techweb_nodes[node_id_b]
diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm
index a29d4865744..3b51ebb583d 100644
--- a/code/modules/awaymissions/away_props.dm
+++ b/code/modules/awaymissions/away_props.dm
@@ -1,7 +1,7 @@
/obj/effect/oneway
name = "one way effect"
desc = "Only lets things in from it's dir."
- icon = 'icons/effects/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping/mapping_helpers.dmi'
icon_state = "field_dir"
invisibility = INVISIBILITY_MAXIMUM
anchored = TRUE
@@ -14,7 +14,7 @@
/obj/effect/wind
name = "wind effect"
desc = "Creates pressure effect in it's direction. Use sparingly."
- icon = 'icons/effects/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping/mapping_helpers.dmi'
icon_state = "field_dir"
invisibility = INVISIBILITY_MAXIMUM
var/strength = 30
@@ -32,7 +32,7 @@
/obj/effect/path_blocker
name = "magic barrier"
desc = "You shall not pass."
- icon = 'icons/effects/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping/mapping_helpers.dmi'
icon_state = "blocker" //todo make this actually look fine when visible
anchored = TRUE
var/list/blocked_types = list()
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 2f87eea6d2a..037ae0add3e 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -171,6 +171,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "syndbeacon"
resistance_flags = INDESTRUCTIBLE
+ processing_flags = START_PROCESSING_MANUALLY
var/team = WHITE_TEAM
var/team_span = ""
//Capture the Flag scoring
@@ -194,10 +195,10 @@
/obj/machinery/capture_the_flag/Initialize()
. = ..()
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
/obj/machinery/capture_the_flag/Destroy()
- GLOB.poi_list.Remove(src)
+ SSpoints_of_interest.remove_point_of_interest(src)
return ..()
/obj/machinery/capture_the_flag/process()
@@ -347,6 +348,7 @@
/obj/machinery/capture_the_flag/proc/start_ctf()
ctf_enabled = TRUE
+ START_PROCESSING(SSmachines, src)
for(var/d in dead_barricades)
var/obj/effect/ctf/dead_barricade/D = d
D.respawn()
@@ -378,6 +380,7 @@
/obj/machinery/capture_the_flag/proc/stop_ctf()
ctf_enabled = FALSE
+ STOP_PROCESSING(SSmachines, src)
arena_reset = FALSE
var/area/A = get_area(src)
for(var/i in GLOB.mob_list)
@@ -403,7 +406,10 @@
/obj/item/gun/ballistic/automatic/pistol/deagle/ctf
desc = "This looks like it could really hurt in melee."
force = 75
- mag_type = /obj/item/ammo_box/magazine/m50/ctf
+ default_ammo_type = /obj/item/ammo_box/magazine/m50/ctf
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m50/ctf,
+ )
/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/dropped()
. = ..()
@@ -429,7 +435,10 @@
. = ..()
/obj/item/gun/ballistic/automatic/laser/ctf
- mag_type = /obj/item/ammo_box/magazine/recharge/ctf
+ default_ammo_type = /obj/item/ammo_box/magazine/recharge/ctf
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/recharge/ctf,
+ )
desc = "This looks like it could really hurt in melee."
force = 50
@@ -477,7 +486,10 @@
// RED TEAM GUNS
/obj/item/gun/ballistic/automatic/laser/ctf/red
- mag_type = /obj/item/ammo_box/magazine/recharge/ctf/red
+ default_ammo_type = /obj/item/ammo_box/magazine/recharge/ctf/red
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/recharge/ctf/red,
+ )
/obj/item/ammo_box/magazine/recharge/ctf/red
ammo_type = /obj/item/ammo_casing/caseless/laser/ctf/red
@@ -492,7 +504,10 @@
// BLUE TEAM GUNS
/obj/item/gun/ballistic/automatic/laser/ctf/blue
- mag_type = /obj/item/ammo_box/magazine/recharge/ctf/blue
+ default_ammo_type = /obj/item/ammo_box/magazine/recharge/ctf/blue
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/recharge/ctf/blue,
+ )
/obj/item/ammo_box/magazine/recharge/ctf/blue
ammo_type = /obj/item/ammo_casing/caseless/laser/ctf/blue
@@ -575,7 +590,6 @@
/datum/outfit/ctf/red/post_equip(mob/living/carbon/human/H)
..()
var/obj/item/radio/R = H.ears
- R.set_frequency(FREQ_CTF_RED)
R.freqlock = TRUE
R.independent = TRUE
H.dna.species.stunmod = 0
@@ -583,7 +597,6 @@
/datum/outfit/ctf/blue/post_equip(mob/living/carbon/human/H)
..()
var/obj/item/radio/R = H.ears
- R.set_frequency(FREQ_CTF_BLUE)
R.freqlock = TRUE
R.independent = TRUE
H.dna.species.stunmod = 0
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 0bf0b74c715..4fb7ceac452 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -6,7 +6,7 @@
name = "Mob Spawner"
density = TRUE
anchored = TRUE
- icon = 'icons/effects/mapping_helpers.dmi' // These aren't *really* mapping helpers but it fits the most with it's common usage (to help place corpses in maps)
+ icon = 'icons/effects/mapping/mapping_helpers.dmi' // These aren't *really* mapping helpers but it fits the most with it's common usage (to help place corpses in maps)
icon_state = "mobspawner" // So it shows up in the map editor
var/mob_type = null
var/mob_name = ""
@@ -61,11 +61,11 @@
if(instant || (roundstart && (mapload || (SSticker && SSticker.current_state > GAME_STATE_SETTING_UP))))
INVOKE_ASYNC(src, PROC_REF(create))
else if(ghost_usable)
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
LAZYADD(GLOB.mob_spawners[name], src)
/obj/effect/mob_spawn/Destroy()
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
var/list/spawners = GLOB.mob_spawners[name]
LAZYREMOVE(spawners, src)
if(!LAZYLEN(spawners))
@@ -138,6 +138,7 @@
// Base version - place these on maps/templates.
/obj/effect/mob_spawn/human
mob_type = /mob/living/carbon/human
+ icon_state = "corpsehuman"
//Human specific stuff.
var/mob_species = null //Set to make them a mutant race such as lizard or skeleton. Uses the datum typepath instead of the ID.
var/datum/outfit/outfit = /datum/outfit //If this is a path, it will be instanced in Initialize()
@@ -326,12 +327,10 @@
/obj/effect/mob_spawn/human/corpse/cargo_tech
name = "Cargo Tech"
outfit = /datum/outfit/job/cargo_tech
- icon_state = "corpsecargotech"
/obj/effect/mob_spawn/human/cook
name = "Cook"
outfit = /datum/outfit/job/cook
- icon_state = "corpsecook"
/obj/effect/mob_spawn/human/cook/husked
husk = TRUE
@@ -339,8 +338,6 @@
/obj/effect/mob_spawn/human/doctor
name = "Doctor"
outfit = /datum/outfit/job/doctor
- icon_state = "corpsedoctor"
-
/obj/effect/mob_spawn/human/doctor/alive
death = FALSE
@@ -363,22 +360,18 @@
/obj/effect/mob_spawn/human/engineer
name = "Engineer"
outfit = /datum/outfit/job/engineer
- icon_state = "corpseengineer"
/obj/effect/mob_spawn/human/clown
name = "Clown"
outfit = /datum/outfit/job/clown
- icon_state = "corpseclown"
/obj/effect/mob_spawn/human/scientist
name = "Scientist"
outfit = /datum/outfit/job/scientist
- icon_state = "corpsescientist"
/obj/effect/mob_spawn/human/miner
name = "Shaft Miner"
outfit = /datum/outfit/job/miner
- icon_state = "corpseminer"
/obj/effect/mob_spawn/human/plasmaman
mob_species = /datum/species/plasmaman
@@ -405,7 +398,6 @@
/obj/effect/mob_spawn/human/bartender
name = "Space Bartender"
- icon_state = "corpsebartender"
id_job = "Bartender"
id_access_list = list(ACCESS_BAR)
outfit = /datum/outfit/spacebartender
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index 6f28cc724b5..bddf8561f58 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -1,66 +1,3 @@
-
-//Academy Areas
-
-/area/awaymission/academy
- name = "Academy Asteroids"
- icon_state = "away"
-
-/area/awaymission/academy/headmaster
- name = "Academy Fore Block"
- icon_state = "away1"
-
-/area/awaymission/academy/classrooms
- name = "Academy Classroom Block"
- icon_state = "away2"
-
-/area/awaymission/academy/academyaft
- name = "Academy Ship Aft Block"
- icon_state = "away3"
-
-/area/awaymission/academy/academygate
- name = "Academy Gateway"
- icon_state = "away4"
-
-/area/awaymission/academy/academycellar
- name = "Academy Cellar"
- icon_state = "away4"
-
-/area/awaymission/academy/academyengine
- name = "Academy Engine"
- icon_state = "away4"
-
-//Academy Items
-
-/obj/item/paper/fluff/awaymissions/academy/console_maint
- name = "Console Maintenance"
- default_raw_text = "We're upgrading to the latest mainframes for our consoles, the shipment should be in before spring break is over!"
-
-/obj/item/paper/fluff/awaymissions/academy/class/automotive
- name = "Automotive Repair 101"
-
-/obj/item/paper/fluff/awaymissions/academy/class/pyromancy
- name = "Pyromancy 250"
-
-/obj/item/paper/fluff/awaymissions/academy/class/biology
- name = "Biology Lab"
-
-/obj/item/paper/fluff/awaymissions/academy/grade/aplus
- name = "Summoning Midterm Exam"
- default_raw_text = "Grade: A+ Educator's Notes: Excellent form."
-
-/obj/item/paper/fluff/awaymissions/academy/grade/bminus
- name = "Summoning Midterm Exam"
- default_raw_text = "Grade: B- Educator's Notes: Keep applying yourself, you're showing improvement."
-
-/obj/item/paper/fluff/awaymissions/academy/grade/dminus
- name = "Summoning Midterm Exam"
- default_raw_text = "Grade: D- Educator's Notes: SEE ME AFTER CLASS."
-
-/obj/item/paper/fluff/awaymissions/academy/grade/failure
- name = "Pyromancy Evaluation"
- default_raw_text = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons. Suggest additional tutelage."
-
-
/obj/singularity/academy
dissipate = 0
move_self = 0
@@ -74,12 +11,6 @@
if(prob(1))
mezzer()
-
-/obj/item/clothing/glasses/meson/truesight
- name = "The Lens of Truesight"
- desc = "I can see forever!"
- icon_state = "monocle"
-
/obj/structure/academy_wizard_spawner
name = "Academy Defensive System"
desc = "Made by Abjuration, Inc."
@@ -152,14 +83,6 @@
icon_state = "forge_off"
STOP_PROCESSING(SSobj, src)
-/datum/outfit/wizard/academy
- name = "Academy Wizard"
- r_pocket = null
- r_hand = null
- suit = /obj/item/clothing/suit/wizrobe/red
- head = /obj/item/clothing/head/wizard/red
- backpack_contents = list(/obj/item/storage/box/survival = 1)
-
/obj/item/dice/d20/fate
name = "\improper Die of Fate"
desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky."
@@ -348,8 +271,6 @@
new /obj/item/clothing/suit/wizrobe(drop_location())
new /obj/item/clothing/head/wizard(drop_location())
new /obj/item/clothing/gloves/combat/wizard(drop_location())
- new /obj/item/clothing/suit/wizrobe/magusblue(drop_location())
- new /obj/item/clothing/head/wizard/magus(drop_location())
new /obj/item/staff(drop_location())
new /obj/structure/mirror/magic(drop_location())
@@ -357,8 +278,6 @@
name = "Butler"
uniform = /obj/item/clothing/under/suit/black_really
shoes = /obj/item/clothing/shoes/laceup
- head = /obj/item/clothing/head/bowler
- glasses = /obj/item/clothing/glasses/monocle
gloves = /obj/item/clothing/gloves/color/white
/obj/effect/proc_holder/spell/targeted/summonmob
diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm
index bfbb8bbf52e..2e289579be1 100644
--- a/code/modules/awaymissions/mission_code/Cabin.dm
+++ b/code/modules/awaymissions/mission_code/Cabin.dm
@@ -1,40 +1,3 @@
-
-/*Cabin areas*/
-/area/awaymission/cabin
- name = "Cabin"
- icon_state = "away2"
- requires_power = TRUE
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
-/area/awaymission/cabin/snowforest
- name = "Snow Forest"
- icon_state = "away"
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-
-/area/awaymission/cabin/snowforest/sovietsurface
- name = "Snow Forest"
- icon_state = "awaycontent29"
- requires_power = FALSE
-
-/area/awaymission/cabin/lumbermill
- name = "Lumbermill"
- icon_state = "away3"
- requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-
-/area/awaymission/cabin/caves/sovietcave
- name = "Soviet Bunker"
- icon_state = "awaycontent4"
-
-/area/awaymission/cabin/caves
- name = "North Snowdin Caves"
- icon_state = "awaycontent15"
- dynamic_lighting = DYNAMIC_LIGHTING_FORCED
-
-/area/awaymission/cabin/caves/mountain
- name = "North Snowdin Mountains"
- icon_state = "awaycontent24"
-
/obj/structure/firepit
name = "firepit"
desc = "Warm and toasty."
diff --git a/code/modules/awaymissions/mission_code/caves.dm b/code/modules/awaymissions/mission_code/caves.dm
deleted file mode 100644
index b7ab7c454d9..00000000000
--- a/code/modules/awaymissions/mission_code/caves.dm
+++ /dev/null
@@ -1,61 +0,0 @@
-//Areas
-
-/area/awaymission/caves/BMP_asteroid
- name = "\improper BMP Asteroid Level 1"
- icon_state = "awaycontent1"
-
-/area/awaymission/caves/BMP_asteroid/level_two
- name = "\improper BMP Asteroid Level 2"
- icon_state = "awaycontent2"
-
-/area/awaymission/caves/BMP_asteroid/level_three
- name = "\improper BMP Asteroid Level 3"
- icon_state = "awaycontent3"
-
-/area/awaymission/caves/BMP_asteroid/level_four
- name = "\improper BMP Asteroid Level 4"
- icon_state = "awaycontent4"
-
-/area/awaymission/caves/research
- name = "Research Outpost"
- icon_state = "awaycontent5"
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
-/area/awaymission/caves/northblock //engineering, bridge (not really north but it doesnt really need its own APC)
-
-/area/awaymission/caves/listeningpost
- name = "Listening Post"
- icon_state = "awaycontent6"
- requires_power = FALSE
-
-//caves papers
-
-/obj/item/paper/crumpled/awaymissions/caves/unsafe_area
- default_raw_text = "
WARNING
Majority of this area is considered 'unsafe' past this point. Theres an outpost directly south of here where you can get your bearing and travel further down if needed. Traveling in groups is HIGHLY advised, the shit out there can be extremely deadly if you're alone.
Subject appears unresponsive to most interactions, refusing to move away from the corners or face any scientists. Subject appears to move between the two back corners every observation. A strange humming can be heard from inside the cell, appears to be originating from the subject itself, further testing is necessary to confirm or deny this.
Mining is hell down here, you can feel the heat of the magma no matter how thick the suit is. Conditions are barely manageable as is, restless nights and horrid work conditions. The ore maybe rich down here, but we've already lost a few men to the faults shifting, god knows how much longer till it all just collapses down and consumes everyone with it.
The caves are an unforgiving place, the only thing you'll have to traverse is the supplies in your locker and your own wit. Travel in packs when mining and try to shut down the monster dens before they overwhelm you. The job is dangerous but the haul is good, so remember this information and hopefully we'll all go home alive.
We were supposed to get a shipment of these special laser rifles and a couple 'nades to help combat the wildlife down here, but it's been weeks since we last heard from the caravan carrying the shit down here. At this point we can only assume they fell victim to one of the monster nests or the dumbasses managed to trip into the lava. So much for that shipment, I guess.
Some of the miners have gone to laying some mine traps among the lower levels of the mine to keep the monsters at bay. This probably isn't the smartest idea in a cavern like this but the boys seem to get a chuckle out of every distant blast they hear go off, so I guess it works
Although you may seem indestructible in a mech, remember, THIS SHIT ISN'T LAVA PROOF!! The boys have already had to deal with loosing the last two to salvage because the dumbass thought he could just wade through the lower lakes like it was nothing. The fact he even managed to get back without being fused with what was left of the mech is a miracle in itself. They're built to be resistant against extreme heat, not heat PROOF!
Robotics Team"
diff --git a/code/modules/awaymissions/mission_code/centcomAway.dm b/code/modules/awaymissions/mission_code/centcomAway.dm
index 60741701b4d..8c55a870263 100644
--- a/code/modules/awaymissions/mission_code/centcomAway.dm
+++ b/code/modules/awaymissions/mission_code/centcomAway.dm
@@ -1,39 +1,3 @@
-//centcomAway areas
-
-/area/awaymission/centcomAway
- name = "XCC-P5831"
- icon_state = "away"
- requires_power = FALSE
-
-/area/awaymission/centcomAway/general
- name = "XCC-P5831"
- ambientsounds = list('sound/ambience/ambigen3.ogg')
-
-/area/awaymission/centcomAway/maint
- name = "XCC-P5831 Maintenance"
- icon_state = "away1"
- ambientsounds = list('sound/ambience/ambisin1.ogg')
-
-/area/awaymission/centcomAway/thunderdome
- name = "XCC-P5831 Thunderdome"
- icon_state = "away2"
- ambientsounds = list('sound/ambience/ambisin2.ogg')
-
-/area/awaymission/centcomAway/cafe
- name = "XCC-P5831 Kitchen Arena"
- icon_state = "away3"
- ambientsounds = list('sound/ambience/ambisin3.ogg')
-
-/area/awaymission/centcomAway/courtroom
- name = "XCC-P5831 Courtroom"
- icon_state = "away4"
- ambientsounds = list('sound/ambience/ambisin4.ogg')
-
-/area/awaymission/centcomAway/hangar
- name = "XCC-P5831 Hangars"
- icon_state = "away4"
- ambientsounds = list('sound/ambience/ambigen5.ogg')
-
//centcomAway items
/obj/item/paper/pamphlet/centcom/visitor_info
@@ -47,17 +11,3 @@
serving as a supply and repair depot, as well as being host to its most important legal proceedings\
and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE. \
We hope you enjoy your stay!"
-
-/obj/item/paper/fluff/awaymissions/centcom/gateway_memo
- name = "Memo to XCC-P5831 QM"
- default_raw_text = "From: XCC-P5831 Management Office \
- To: Rolf Ingram, XCC-P5831 Quartermaster \
- Hey, Rolf, once you pack that gateway into the ferry hangar, make absolutely sure \
- to deactivate it! As you may know, SS13 has recently got its network up and running, \
- which means that until we get this gate shipped off to the next colonization staging \
- area, they'll be able to hop straight in here if its hooked up on our end. \
- Obviously, that's something I'd very much rather avoid. Our forensics and medical \
- teams never did figure out what happened that last time... and I can't wrap my head \
- around it myself. Why would a shuttle full of evacuees all snap and beat each other \
- to death the moment they reached safety? \
- - D. Cereza"
diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm
index 05d07922015..9e8abe6356b 100644
--- a/code/modules/awaymissions/mission_code/challenge.dm
+++ b/code/modules/awaymissions/mission_code/challenge.dm
@@ -1,20 +1,3 @@
-//Challenge Areas
-
-/area/awaymission/challenge/start
- name = "Where Am I?"
- icon_state = "away"
-
-/area/awaymission/challenge/main
- name = "Danger Room"
- icon_state = "away1"
- requires_power = FALSE
-
-/area/awaymission/challenge/end
- name = "Administration"
- icon_state = "away2"
- requires_power = FALSE
-
-
/obj/machinery/power/emitter/energycannon
name = "Energy Cannon"
desc = "A heavy duty industrial laser."
@@ -35,3 +18,13 @@
/obj/machinery/power/emitter/energycannon/RefreshParts()
return
+
+/obj/machinery/power/emitter/energycannon/ctf
+ processing_flags = START_PROCESSING_MANUALLY
+
+/obj/machinery/power/emitter/energycannon/ctf/proc/toggle_ctf(ctf_enabled)
+ src.active = ctf_enabled
+ if(ctf_enabled)
+ START_PROCESSING(SSmachines, src)
+ else
+ STOP_PROCESSING(SSmachines, src)
diff --git a/code/modules/awaymissions/mission_code/moonoutpost19.dm b/code/modules/awaymissions/mission_code/moonoutpost19.dm
deleted file mode 100644
index 4f13e27001e..00000000000
--- a/code/modules/awaymissions/mission_code/moonoutpost19.dm
+++ /dev/null
@@ -1,121 +0,0 @@
-// moonoutpost19
-
-//Areas
-/area/awaymission/moonoutpost19
- name = "space"
- icon_state = "awaycontent1"
-
-/area/awaymission/moonoutpost19/arrivals
- name = "MO19 Arrivals"
- icon_state = "awaycontent2"
-
-/area/awaymission/moonoutpost19/research
- name = "MO19 Research"
- icon_state = "awaycontent3"
-
-/area/awaymission/moonoutpost19/syndicate
- name = "Syndicate Outpost"
- icon_state = "awaycontent4"
-
-/area/awaymission/moonoutpost19/main
- name = "Khonsu 19"
- always_unpowered = TRUE
- power_environ = FALSE
- power_equip = FALSE
- power_light = FALSE
- poweralm = FALSE
- ambientsounds = list('sound/ambience/ambimine.ogg')
- icon_state = "awaycontent5"
-
-/area/awaymission/moonoutpost19/hive
- name = "The Hive"
- always_unpowered = TRUE
- power_environ = FALSE
- power_equip = FALSE
- power_light = FALSE
- poweralm = FALSE
- icon_state = "awaycontent6"
-
-//Papers
-
-/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note
- name = "Hastily Written Note"
- default_raw_text = "19 06 2554
I fucking knew it. There was a major breach, that idiotic force field failed and the xenomorphs rushed out and took out the scientists. I've managed to make it to my office and closed the blast doors. I can hear them trying to pry open the doors. Probably don't have long. I have no clue what has happened to the rest of the crew, for all I know they've been killed to produce more of the fucks."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_social
- name = "Larva Xenomorph Social Interactions & Capturing Procedure"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 04/06/2554
Report: As expected, all that is left of the monkeys we sent in earlier is a group of xenomorph larvae. It is quite clear that the facehuggers are not selective in their hosts, and so far the gestation process has been shown to have a 100% success rate.
The larvae themselves have been behaving very differently from the lone larva we first observed, and despite shying away from humans they are clearly comfortable with others of their kind. Our previous suspicions on larvae have been confirmed with their demonstration of playfulness: they are not nearly as aggressive or violent when young, before molting to adulthood.
The majority of the play we observed involved a sort of hide-and-seek, and occasionally wrestling by tangling themselves and struggling out of it. While normally we would write these off as instinctual play for honing their skills when they molt, their growth period is so incredibly fast and they are still such adept killers that it would serve no practical purpose. The only explanation for this is perhaps to create bonds and friendships with each other, if that is even possible for such an incredibly hostile race. It may be that they are much more reasonable with each other than other life forms.
It had become clear that now was the best time to extract a xenomorph for dissecting, as these were all still larvae and the queen was still attached to its ovipositor and would be immobile. With the approval of the research director, we sent in our medical robot that had been dubbed 'Head Surgeon' into the containment pen, dropping the shields for only a fraction of a second to allow it entry. The larvae were cautious, but the curiosity of one had him within grabbing range of our robot. It was brought out and quickly euthanized through lethal injection, courtesy of our mechanical doctor."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_queen
- name = "Queen Xenomorph Physiology & Behavior Observation"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 04/06/2554
Report: I have studied many interesting and diverse life-forms as a xenobiologist ranging from creatures as large as cows, to specimens too small see with the naked eye. This is by far the largest alien I have ever seen. The alien we were previously studying has molted and has become an absolutely enormous creature. Standing at over 15 feet tall and weighing in at likely two tons or more, the xenomorph queen is an absolutely breathtakingly large and cruel monster. Its behavior has changed drastically from when it was a drone, having become far more comfortable with sitting and staring at us, rather than smashing at the windows.
The queen, physiologically speaking, is fairly similar to the other xenomorphs, with a few key differences. Its enormous size demands large legs, while the back seems to be always hunched forward. The dorsal tubes on the back have changed to several large spikes, and we observed the alien now sports a second pair of smaller arms on its chest. The purpose of these secondary arms is still unknown. Finally, the queen's crown has become incredibly large, with what seems to be a retractable slot to hide its head in. The dome appears to be extremely thick near the front, and will likely be able to resist a lot of trauma. Despite the enormous size it has grown to, it is not that much slower than it used to be.
After two hours of doing relatively nothing but staring, the queen began to produce an unusually large amount of resin and weeds, quickly shaping up a large nest that it then hid behind. It then proceeded to smash out all the lights, leaving us with very little to see with our cameras. When we looked through the back cameras, we had discovered that it had grown a large ovipositor, and was releasing large eggs onto the ground. This had us all in agreement that this stage of the life cycle was the queen.
Over the next few hours, the eggs grew to their full sizes, and we provided the subject with new monkey hosts. When they approached the eggs, they opened to release more facehuggers. It seems that we have observed the full cycle of reproduction for this species. We can expect more larvae in the next few hours."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_adult
- name = "Adult Xenomorph Physiology & Behavior Observation"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 03/06/2554
Report: The other scientists and I can hardly believe our eyes. The snake-like larva has molted into a 7 foot tall insectoid nightmare in just a few hours. It's obvious now as to why such heavy duty containment was needed. It immediately tried to escape however by flinging itself at the window in a flurry of swipes and stabs. It seems its behavior has returned to a state that is very similar to the facehugger, though I doubt with the same intent! Thankfully, our glass and shields have shown to be more than sturdy enough for such a violent creature, and so far, any attempts at the creature escaping have been in vain.
As for its physiology, the creature has an elongated head with what appears to be have an exoskeleton resembling an external rib-cage on the torso. The alien is also fairly skinny with a lean body. The little amount of meat on the alien appears to be entirely muscle. We assume this makes it deceptively strong, while remaining agile at the same time. One of the most interesting things we have seen is its pharyngeal jaw. It has some what of an inner mouth capable of being fired externally at extremely high speeds. It has already caused many dents in the walls and a few small cracks in the window with it. The alien also has a couple of dorsal tubes on its back, their purpose unknown. Finally, this monster sports a long ridged tail, complete with a large and extremely sharp blade at the tip.
Normally I would be absolutely terrified of something like this, but I'm putting my trust in Nanotrasen with the containment. After all, they wouldn't build a cell that could fail to contain its subject, would they?"
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_psych
- name = "Larva Xenomorph Physiology & Behavior Observation"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 03/06/2554
Report: When the larva first emerged from the chest of the monkey, it seemed very curious. It would wander around aimlessly for awhile and then sit still. We are unable to determine the gender of the larva, or even determine if it has a gender. After some time had passed, it seemed to lose interest in its surroundings and sat mostly still while occasionally wagging its tail. We decided to throw in a live mouse to see if it would consume it. The larva quickly attacked and ate the mouse and seemed to get larger very suddenly, this suggests that the larvae are capable of metabolizing and directing all the energy towards growth at previously thought impossible speeds. It is a shame that we cannot observe the process more closely, as we do not currently know how dangerous or violent this creature is or will become as it matures fully.
It is tempting to imagine the possibilities of utilizing such a mechanism. The capability of skipping years of growth time for children, repairing bodily damage in a matter of moments, even its usage in existing cloning technology."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/facehugger
- name = "'Facehugger' Xenomorph Physiology & Behavior Observation"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 03/06/2554
Report: The test subject we were provided with truly is alien. It is a small spider-like creature with bony legs leading to a smooth body. It has a long tail connected to it, and it has shown extremely aggressive behavior by flinging its entire body at the glass and shields to no avail. While doing so, we noticed there was a small pink hole in the middle of the body.
When we sent in a monkey through the crude but effective disposal tube, the alien immediately jumped at its face and latched on. The monkey was quickly suffocated by its constricting tail, unable to pry off the fingers. The monkey at first seemed to be dead, but was observed to be breathing. The recently named alien 'facehugger' fell off dead and curled its legs up like a spider moments after it had finished with the monkey's body.
While the monkey appeared to be unharmed, we kept it in the cell for a couple more hours until we were horrified to discover it screaming out in pain as a snake-like creature erupted from the monkey's chest! It appears that the 'facehugger' is only the start of this life cycle. The impregnation cycle involving the creatures growing inside the chests of their hosts seems to only be the beginning."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind
- name = "The Hivemind Hypothesis"
- default_raw_text = "Researcher: Dr. Mark Douglas Date: 17/06/2554
Report: Earlier today we have observed a new phenomenon with our subjects. While feeding them our last monkey subject and throwing out the box, the aliens merely looked at us instead of infecting the monkey right away. They looked to be collectively distressed as they would no longer be given hosts, where instead we would move to the next phase of the experiment. When I glanced at the gas tanks and piping leading to their cell, I looked back to see all of them were up against the glass, even the queen! It was as if they all understood what was going to happen, even though we knew only the queen had the cognitive capability to do so.
The only explanation for this is a form of communication between the aliens, but we have seen no such action take place anywhere in the cell until now. We also know that regular drone and hunter xenomorphs have no personality or instinct to survive by themselves. Perhaps the queen has a direct link to them? A form of a commander or overseer that controls their every move? A hivemind?"
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior
- name = "\improper A Preliminary Study of Alien Behavior"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 08/06/2554
Report: The xenomorphs we have come to study here are a remarkable species. They are almost universally aggressive across all castes, showing no remorse or guilt or pause before or after acts of violence. They appear to be a species entirely designed to kill. Oddly enough, even their method of reproduction is a brutal two-for-one method of birthing a new xenomorph and killing its host.
The lone xenomorph we studied only five days ago showed little sign of intelligence. Only a simple drone that flung itself at the safety glass and shields repeatedly and thankfully without success. Once the drone molted into a queen, it became much more calm and calculating, merely looking at us and waiting while building its nest. As the hive grew in size and in numbers, so too did the intelligence of the common hunter and drone. We are still researching how they can communicate with one another and the relationship between the different castes and the queen. We will continue to update our research as we learn more about the species."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes
- name = "The Xenomorph 'Castes'"
- default_raw_text = "Researcher: Dr. Mark Douglas Date: 06/06/2554
Report: While observing the growing number of aliens in the containment cell, we began to notice subtle differences that were consistently repeating. Like ants, these creatures clearly have different specialized variations that determine their roles in the hive. We have dubbed the three currently observed castes as Hunters, Drones, and Sentinels.
Hunters have been observed to be by far the most aggressive and agile of the three, constantly running on every surface and frequently swiping at the windows. They are also remarkably good at camouflaging themselves in darkness and on their resin structures, appearing almost invisible to the unwary observer. They are always the first to reach the monkeys we send in leading us to believe that this caste is primarily used for finding and retrieving hosts.
Drones on the other hand are much more docile and seem more shy by comparison, though not any less aggressive than the other castes. They have been observed to have a much wider head and lack dorsal tubes. They have shown to be less agile and visibly more fragile than any other caste. The drone however has never been observed to interact with the monkeys directly and instead preferring maintenance of the hive by building walls of resin and moving eggs around the nest. As far as we know, we have only ever observed a drone become a queen, and we have no way of knowing if the other castes have that capability.
Lastly, we have the Sentinels, which appear at first glance to be the guards of the hive. They have so far been only observed to remain near the queen and the eggs, frequently curled up against the walls. We have only observed one instance where they have interacted with a monkey who strayed too closely to the queen, and was pounced and held down immediately until it was applied with a facehugger. Their lack of movement makes it difficult to determine their exact purpose as guards, sentries, or other role."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy
- name = "Larva Xenomorph Autopsy Report"
- default_raw_text = "Researcher: Dr. Mark Douglas Date: 04/06/2554
Report: After an extremely dangerous, time consuming and costly dissection, we have managed to record and identify several of the organs inside of the first stage of the xenomorph cycle: the larva. This procedure took an extensive amount of time because these creatures have incredibly, almost-comically acidic blood that can melt through almost anything in a few moments. We had to use over a dozen scalpels and retractors to complete the autopsy.
The larva seems to possess far fewer and quite different organs than that of a human. There is a stomach, with no digestive tract, a heart, which seems to lack any blood-oxygen circulation purpose, and an elongated brain, even though its as dumb as any large cat. It also lacks any liver, kidneys, or other basic organs.
We can't determine the exact nature of how these creatures grow, nor if they gain organs as they become adults. The larger breeds of xenomorph are too dangerous to kill and capture to give us an accurate answer to these questions. All that we can conclude is that being able to function with so little and yet be so deadly means that these creatures are highly evolved and likely to be extremely durable to various hazards that would otherwise be lethal to humans."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/evacuation
- name = "Evacuation Procedure"
- default_raw_text = "
In The Event of Xenobiology Breach: Evacuate staff, Lock down Xenobiology, Notify on-site superiors and/or Central Command immediately.
Current Xenobiology Containment Level:Secure RUN
"
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal
- name = "Personal Log"
- default_raw_text = "Log 1: We got our promised supply drop today. We were only meant to get it, what, a week ago? This bloody gateway keeps desyncing itself, and that means subsisting off recycled water and carb packs. No clue where the damn thing connects to on its off days, and HQ say we are 'not to touch it if it isn't linking to command.' We dumped off the assload of crates Jim filled, got our boxes of oxygen, food and drink, and closed the portal.
Log 2: Damn thing is acting up again. Three days no contact this time. I thought I heard clanking noises from it yesterday. Jim is going on about the NT base or some shit. We've been over this before - They don't know we're here, that engineer was too drunk to recognize his suit, especially since I had it painted orange. He's starting to get annoying. We're safe.
Log 3: Gateway synced itself up automatically today. I opened it for an instant to spy through it, got a glimpse of the inside of a transport container. Either HQ's redecorating or something, or there's more than two of these things."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal_2
- name = "Personal Log"
- default_raw_text = "Log 1: While mining today I noticed the NT station was finished with its renovations. They placed some huge reinforced tumor on the station, looks so ugly. I wouldn't be surprised if those pigs decided to turn that little astronomy outpost into a prison with that thing, it'd be pretty typical of them.
Log 2: Really dumb of me but I just waved at an engineer in the outpost, and he waved back. I hope to god he was too dumb or drunk to recognize the suit, because if he isn't then we might have to pull out before they come looking for us.
Log 3: That huge reinforced tumor in their science section has been making a lot of noise lately. I've been hearing some banging and scratching from the other side and I'm kind of glad now that they reinforced this thing so much. I'll be sleeping with my gun under my pillow from now on."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/engineering
- name = "Engineering Instructions"
- default_raw_text = "Alright, listen up. If you're reading this, I'm either taking a shit or I've been recalled back to Command. Either way, you'll need to know how to restore power. We've stolen this stuff from Nanotrasen, so all the equipment is jury-rigged. We have generators that work on both plasma and uranium, about 50 sheets should power the outpost for quite a while. If the generators aren't working, which is very likely, take the power cell on the desk and put it into the APC in the hallway. That should get the place running, at least for a little while."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/kenneth
- name = "Personal Log - Kenneth Cunningham"
- default_raw_text = "Entry One - 27/05/2554: I just arrived, and already I hate my job. I'm stuck on this shithole of an outpost, trying to avoid these damn eggheads running all over the place preparing for god knows what. There's no crimes to stop, no syndies to kill, and I'm not even allowed to beat the fuckin' assistant senseless! They said I was transferred from Space Station 13 for 'good behavior', but this feels more like a punishment than a reward. All I know is that if I don't get some action soon, I'm going to go insane.
Entry Two - 03/06/2554: Okay, so get this: we got a fuckin' deathsquad coming in today! I thought the day I saw one of them would be the day my employment was 'terminated', if you get my drift. They're escorting some sort of weird alien creature for the eggheads to study. I heard one of the docs telling the chef that this thing killed a whole security force before it was captured. I sure as hell hope that I don't have to fight it.
Entry Three - 08/06/2554: My first real bit of 'action' today, if you could call it that. Crazy Ivan got in a fight with Kuester today about his Booze-O-Mat. Apparently one of the crewmembers had stolen a couple bottles of booze from the machine after Ivan disabled the ID lock. Tell you the truth, I don't blame the thief. Everyone is going a little stir-crazy in here, and the bartender is being damn stingy with the alcohol. Either way, once they started to pick a fight, I had to take them down. It's a damn shame that we don't have a brig, though. I had to lock Ivan in a fuckin' freezer, for god's sake. Let's hope that we can keep our sanity together, at least for a while.
Entry Four - 10/06/2554: Jesus fucking Christ riding on a motorbike. These things the scientists are studying are terrifying! Fucking great huge purple bug things as tall as the ceiling, with blades for arms and drooling at the mouth. I don't think my taser will do jack shit against these damn things, but the eggheads say that they're safely contained. If they do, I have a feeling that it's only a matter of time before we're all screwed. These bastards look like walking death.
Entry Five - 18/06/2554: Finally caught who stole the booze from Kuester. It was that fuckin' loser assistant Steve! He was in the dorms, chugging his worries away. I took one of the bottles back to the barkeep, but no one has to know about this second one. I think I'm gonna enjoy this while watching tomorrow's Thunderdome match.
Entry Six - 19/06/2554: Oh, great. The chef is still sleeping, so we get Ivan's gruel for breakfast today. I overheard Sano and Douglas saying something about the aliens being restless, so we might get some action today. As long as it happens after the big game, I'm fine with it. I still got one beer to drink before I'm ready to die."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/ivan
- name = "Personal Log - Ivan Volodin"
- default_raw_text = "Ivan Volodin Stories:
Entry Won - 28/05/2554: Hello. I am Crazy Ivan. Boss say I must write. I do good job fixing outpost. Is very good job. Much better than mines. Many nice people. I cause no trouble.
Entry Too - 05/06/2554: I am finding problem with Booze-O-Mat. Is not problem. I solve very easy. Use yellow tool to make purple light go off. I am good engineer! Bartender will be very happy.
Entry Tree - 08/06/2554: Bartender is not happy. Security man is not happy. Cannot feel legs, is very cold in freezer. Is not good. Table is jammed into door, have no tools. Is very not good. But, on bright side, found meat! Shall chew to keep spirits up.
Entry Fore - 12/06/2554: Big nasty purple bug looked at me today. Make nervous. Blue wall wire can be broken, then bad thing happens. Very very bad thing. Man in orange spacesuit wave at me today too. He seem nice. Wonder who was?
Entry Fiv - 15/06/2554: I eat cornflakes today. Is good day. Sun shine for a while. Was nice. I also take ride on disposals chute. Was fun, but tiny. Get clog out of pipes, was vodka bottle. Is empty. This make many sads.
Entry Sex: 19/06/2554: Purple bugs jumpy today. When waved, get hiss. Maybe very bad. Maybe just ill. Do not know. Is science problem, is not engineer problem. I eat sandwich. Is glorious job. Wish to never end."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/gerald
- name = "Personal Log - Gerald Rosswell"
- default_raw_text = "Personal Log for Research Director Gerald Rosswell
Entry One - 17/05/2554: You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.
Entry Two - 25/05/2554: Well, we all expected it at the outpost, CentCom has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on an xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.
Entry Three - 27/05/2554: The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.
Entry Four - 06/06/2554: My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.
Entry Five - 10/06/2554: Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.
Entry Six - 17/06/2554: The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/food_specials
- name = "Specials This Week"
- default_raw_text = "
I Can't Believe It's Not Pasta: Half off on Wednesdays
Burger night every Friday 6PM-10PM, free drinks with purchase of meal!
Premiering Tonight: The comedy stylings of Shoe Snatching Willy! 11AM-7PM
Welcome to Moon Outpost 19! Property of Nanotrasen Inc.
Staff Roster: -Dr. Gerald Rosswell: Research Director & Acting Captain -Dr. Sakuma Sano: Xenobiologist -Dr. Mark Douglas: Xenobiologist -Kenneth Cunningham: Security Officer-Ivan Volodin: Engineer -Mathias Kuester: Bartender -Sven Edling: Chef -Steve: Assistant
Please enjoy your stay, and report any abnormalities to an officer."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/goodbye_note
- name = "Note"
- default_raw_text = "Bugs break out. I run to here and lock door. I hear door next to me break open and screams. All nice people here dead now. I no want to be eaten, and bottle always said to be coward way out, but person who say that is stupid. Mira, there is no escape for me, tell Alexis and Elena that father will never come home, and that I love you all."
-
-
diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm
index 914a1f2828c..10bb96c12ba 100644
--- a/code/modules/awaymissions/mission_code/murderdome.dm
+++ b/code/modules/awaymissions/mission_code/murderdome.dm
@@ -1,8 +1,3 @@
-/area/awaymission/vr/murderdome
- name = "Murderdome"
- icon_state = "awaycontent8"
- pacifist = FALSE
-
/obj/structure/window/reinforced/fulltile/indestructable
name = "robust window"
flags_1 = PREVENT_CLICK_UNDER_1 | NODECONSTRUCT_1
diff --git a/code/modules/awaymissions/mission_code/research.dm b/code/modules/awaymissions/mission_code/research.dm
deleted file mode 100644
index b3e4ff8b863..00000000000
--- a/code/modules/awaymissions/mission_code/research.dm
+++ /dev/null
@@ -1,69 +0,0 @@
-//Research Base Areas//--
-
-/area/awaymission/research
- name = "Research Outpost"
- icon_state = "away"
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
-/area/awaymission/research/interior
- name = "Research Inside"
- requires_power = TRUE
- icon_state = "away2"
-
-/area/awaymission/research/interior/cryo
- name = "Research Cryostasis Room"
- icon_state = "medbay"
-
-/area/awaymission/research/interior/clonestorage
- name = "Research Clone Storage"
- icon_state = "cloning"
-
-/area/awaymission/research/interior/genetics
- name = "Research Genetics Research"
- icon_state = "genetics"
-
-/area/awaymission/research/interior/engineering
- name = "Research Engineering"
- icon_state = "engine"
-
-/area/awaymission/research/interior/security
- name = "Research Security"
- icon_state = "security"
-
-/area/awaymission/research/interior/secure
- name = "Research Secure Vault"
-
-/area/awaymission/research/interior/maint
- name = "Research Maintenance"
- icon_state = "maintcentral"
-
-/area/awaymission/research/interior/dorm
- name = "Research Dorms"
- icon_state = "Sleep"
-
-/area/awaymission/research/interior/escapepods
- name = "Research Escape Wing"
- icon_state = "exit"
-
-/area/awaymission/research/interior/gateway
- name = "Research Gateway"
- icon_state = "start"
-
-/area/awaymission/research/interior/bathroom
- name = "Research Bathrooms"
- icon_state = "restrooms"
-
-/area/awaymission/research/interior/medbay
- name = "Research Medbay"
- icon_state = "medbay"
-
-/area/awaymission/research/exterior
- name = "Research Exterior"
- icon_state = "unknown"
-
-
-//research papers
-
-/obj/item/paper/crumpled/awaymissions/research/sensitive_info
- default_raw_text = "Theres a lot of sensitive info on these disks, try and keep them secure! If these backup copies get into the wrong hands, god knows what they could do with the genetic research on these disk.."
-
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index f2dbb91f3f0..c205746b16f 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -1,140 +1,3 @@
-//Snow Valley Areas//--
-
-/area/awaymission/snowdin
- name = "Snowdin"
- icon_state = "awaycontent1"
- requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-
-/area/awaymission/snowdin/outside
- name = "Snowdin Tundra Plains"
- icon_state = "awaycontent25"
-
-/area/awaymission/snowdin/post
- name = "Snowdin Outpost"
- icon_state = "awaycontent2"
- requires_power = TRUE
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
-/area/awaymission/snowdin/post/medbay
- name = "Snowdin Outpost - Medbay"
- icon_state = "awaycontent3"
-
-/area/awaymission/snowdin/post/secpost
- name = "Snowdin Outpost - Security Checkpoint"
- icon_state = "awaycontent4"
-
-/area/awaymission/snowdin/post/hydro
- name = "Snowdin Outpost - Hydroponics"
- icon_state = "awaycontent5"
-
-/area/awaymission/snowdin/post/messhall
- name = "Snowdin Outpost - Mess Hall"
- icon_state = "awaycontent6"
-
-/area/awaymission/snowdin/post/gateway
- name = "Snowdin Outpost - Gateway"
- icon_state = "awaycontent7"
-
-/area/awaymission/snowdin/post/dorm
- name = "Snowdin Outpost - Dorms"
- icon_state = "awaycontent8"
-
-/area/awaymission/snowdin/post/kitchen
- name = "Snowdin Outpost - Kitchen"
- icon_state = "awaycontent9"
-
-/area/awaymission/snowdin/post/engineering
- name = "Snowdin Outpost - Engineering"
- icon_state = "awaycontent10"
-
-/area/awaymission/snowdin/post/custodials
- name = "Snowdin Outpost - Custodials"
- icon_state = "awaycontent11"
-
-/area/awaymission/snowdin/post/research
- name = "Snowdin Outpost - Research Area"
- icon_state = "awaycontent12"
-
-/area/awaymission/snowdin/post/garage
- name = "Snowdin Outpost - Garage"
- icon_state = "awaycontent13"
-
-/area/awaymission/snowdin/post/minipost
- name = "Snowdin Outpost - Recon Post"
- icon_state = "awaycontent19"
-
-/area/awaymission/snowdin/post/mining_main
- name = "Snowdin Outpost - Mining Post"
- icon_state = "awaycontent21"
-
-/area/awaymission/snowdin/post/mining_main/mechbay
- name = "Snowdin Outpost - Mining Post Mechbay"
- icon_state = "awaycontent25"
-
-/area/awaymission/snowdin/post/mining_main/robotics
- name = "Snowdin Outpost - Mining Post Robotics"
- icon_state = "awaycontent26"
-
-/area/awaymission/snowdin/post/cavern1
- name = "Snowdin Outpost - Cavern Outpost 1"
- icon_state = "awaycontent27"
-
-/area/awaymission/snowdin/post/cavern2
- name = "Snowdin Outpost - Cavern Outpost 2"
- icon_state = "awaycontent28"
-
-/area/awaymission/snowdin/post/mining_dock
- name = "Snowdin Outpost - Underground Mine Post"
- icon_state = "awaycontent22"
-
-/area/awaymission/snowdin/post/broken_shuttle
- name = "Snowdin Outpost - Broken Transit Shuttle"
- icon_state = "awaycontent20"
- requires_power = FALSE
-
-/area/awaymission/snowdin/igloo
- name = "Snowdin Igloos"
- icon_state = "awaycontent14"
- dynamic_lighting = DYNAMIC_LIGHTING_FORCED
-
-/area/awaymission/snowdin/cave
- name = "Snowdin Caves"
- icon_state = "awaycontent15"
- dynamic_lighting = DYNAMIC_LIGHTING_FORCED
-
-/area/awaymission/snowdin/cave/cavern
- name = "Snowdin Depths"
- icon_state = "awaycontent23"
-
-/area/awaymission/snowdin/cave/mountain
- name = "Snowdin Mountains"
- icon_state = "awaycontent24"
-
-
-/area/awaymission/snowdin/base
- name = "Snowdin Main Base"
- icon_state = "awaycontent16"
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
- requires_power = TRUE
-
-/area/awaymission/snowdin/dungeon1
- name = "Snowdin Depths"
- icon_state = "awaycontent17"
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
-/area/awaymission/snowdin/sekret
- name = "Snowdin Operations"
- icon_state = "awaycontent18"
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
- requires_power = TRUE
-
-/area/shuttle/snowdin/elevator1
- name = "Excavation Elevator"
-
-/area/shuttle/snowdin/elevator2
- name = "Mining Elevator"
-
//liquid plasma!!!!!!//
/turf/open/floor/plasteel/dark/snowdin
@@ -203,7 +66,7 @@
L.adjustFireLoss(2)
if(L)
L.adjust_fire_stacks(20) //dipping into a stream of plasma would probably make you more flammable than usual
- L.adjust_bodytemperature(-rand(50,65)) //its cold, man
+ L.adjust_bodytemperature(-rand(10,20)) //its cold, man
if(ishuman(L))//are they a carbon?
var/list/plasma_parts = list()//a list of the organic parts to be turned into plasma limbs
var/list/robo_parts = list()//keep a reference of robotic parts so we know if we can turn them into a plasmaman
@@ -224,14 +87,19 @@
PP.adjustFireLoss(25)
if(plasma_parts.len)
var/obj/item/bodypart/NB = pick(plasma_parts) //using the above-mentioned list to get a choice of limbs for dismember() to use
- PP.emote("scream")
NB.limb_id = "plasmaman" //change the species_id of the limb to that of a plasmaman
NB.static_icon = 'icons/mob/species/plasmaman/bodyparts.dmi'
NB.no_update = TRUE
NB.change_bodypart_status()
- PP.visible_message(
- "[L] screams in pain as [L.p_their()] [NB] melts down to the bone!",
- "You scream out in pain as your [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!")
+ PP.force_scream()
+ if(!HAS_TRAIT(PP, TRAIT_ANALGESIA))
+ PP.visible_message(
+ "[L] screams in pain as [L.p_their()] [NB] melts down to the bone!",
+ "You scream out in pain as your [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!")
+ else
+ PP.visible_message(
+ "[L] lets out panicked gasps as [L.p_their()] [NB] melts down to the bone!",
+ "You gasp in shock as your [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!")
if(!plasma_parts.len && !robo_parts.len) //a person with no potential organic limbs left AND no robotic limbs, time to turn them into a plasmaman
PP.IgniteMob()
PP.set_species(/datum/species/plasmaman)
@@ -266,61 +134,6 @@
keeping the rest of us on lockdown and I swear to god I keep hearing strange noises outside the walls at night. The gateway link has gone dead and without a supply of resources from Central, we're left
for dead here. We haven't heard anything back from the mining squad either, so I can only assume whatever the fuck they unearthed got them first before coming for us. I don't want to die here..."}
-/obj/item/paper/fluff/awaymissions/snowdin/saw_usage
- name = "SAW Usage"
- default_raw_text = "YOU SEEN IVAN, WHEN YOU HOLD SAAW LIKE PEESTOL, YOU STRONGER THAN RECOIL FOR FEAR OF HITTING FACE!"
-
-/obj/item/paper/fluff/awaymissions/snowdin/research_feed
- name = "Research Feed"
- default_raw_text = {"A page full of graphs and other detailed information on the seismic activity of the surrounding area."}
-
-//profile of each of the old crewmembers for the outpost
-
-/obj/item/paper/fluff/awaymissions/snowdin/profile/overseer
- name = "Personnel Record AOP#01"
- default_raw_text = {"
Caleb Reed lead several expeditions
- among uncharted planets in search of plasma for Nanotrasen, scouring from hot savanas to freezing arctics. Track record is fairly clean with only incidient including the loss of two researchers during the
- expedition of _______, where mis-used of explosive ordinance for tunneling causes a cave-in."}
-
-/obj/item/paper/fluff/awaymissions/snowdin/profile/sec1
- name = "Personnel Record AOP#02"
- default_raw_text = {"
James Reed has been a part
- of Nanotrasen's security force for over 20 years, first joining in 22XX. A clean record and unwavering loyalty to the corperation through numerous deployments to various sites makes him a valuable asset to Natotrasen
- when it comes to keeping the peace while prioritizing Nanotrasen privacy matters. "}
-
-/obj/item/paper/fluff/awaymissions/snowdin/profile/hydro1
- name = "Personnel Record AOP#03"
- default_raw_text = {"
Katherine Esterdeen is a recent
- graduate with a major in Botany and a PH.D in Ecology. Having a clean record and eager to work, Esterdeen seems to be the right fit for maintaining plants in the middle of nowhere."}
-
-/obj/item/paper/fluff/awaymissions/snowdin/profile/engi1
- name = "Personnel Record AOP#04"
- default_raw_text = {"
Recently certified to be a full-time Journeyman, Rachel has
- been assigned various construction projects in the past 5 years. Competent and has no past infractions, should be of little concern."}
-
-/obj/item/paper/fluff/awaymissions/snowdin/profile/research1
- name = "Personnel Record AOP#05"
- default_raw_text = {"
"}
-
-/obj/item/paper/fluff/awaymissions/snowdin/secnotice
- name = "Security Notice"
- default_raw_text = {"YOu have been assigned to this Arctic Post with intention of protecting Nanotrasen assets and ensuring vital information is kept secure while the stationed crew obeys protocol. The picked
- staff for this post have been pre-screened with no prior incidients on record, but incase of an issue you have been given a single holding cell and instructions to contact Central to terminate the
- offending crewmember."}
-
-/obj/item/paper/fluff/awaymissions/snowdin/mining
- name = "Assignment Notice"
- default_raw_text = {"This cold-ass planet is the new-age equivalent of striking gold. Huge deposits of plasma and literal streams of plasma run through the caverns under all this ice and we're here to mine it all.\
- Nanotrasen pays by the pound, so get minin' boys!"}
-
/obj/item/paper/crumpled/ruins/snowdin/lootstructures
name = "scribbled note"
default_raw_text = {"There's some ruins scattered along the cavern, their walls seem to be made of some sort of super-condensed mixture of ice and snow. We've already barricaded up the ones we've found so far,
@@ -454,85 +267,6 @@
SAY AAAAAAAAAAAAAAAA FUCK THAT
DELAY 15;"}
-//lootspawners//--
-
-/obj/effect/spawner/lootdrop/snowdin
- name = "why are you using this dummy"
- lootdoubles = 0
- lootcount = 1
- loot = list(/obj/item/bikehorn = 100)
-
-/obj/effect/spawner/lootdrop/snowdin/dungeonlite
- name = "dungeon lite"
- loot = list(/obj/item/melee/classic_baton = 11,
- /obj/item/melee/classic_baton/telescopic = 12,
- /obj/item/book/granter/spell/smoke = 10,
- /obj/item/book/granter/spell/blind = 10,
- /obj/item/storage/firstaid/regular = 45,
- /obj/item/storage/firstaid/toxin = 35,
- /obj/item/storage/firstaid/brute = 27,
- /obj/item/storage/firstaid/fire = 27,
- /obj/item/storage/toolbox/syndicate = 12,
- /obj/item/grenade/c4 = 7,
- /obj/item/grenade/clusterbuster/smoke = 15,
- /obj/item/clothing/under/chameleon = 13,
- /obj/item/clothing/shoes/chameleon/noslip = 10,
- /obj/item/borg/upgrade/ddrill = 3,
- /obj/item/borg/upgrade/soh = 3)
-
-/obj/effect/spawner/lootdrop/snowdin/dungeonmid
- name = "dungeon mid"
- loot = list(/obj/item/defibrillator/compact = 6,
- /obj/item/storage/firstaid/tactical = 35,
- /obj/item/shield/energy = 6,
- /obj/item/shield/riot/tele = 12,
- /obj/item/dnainjector/lasereyesmut = 7,
- /obj/item/pneumatic_cannon = 15,
- /obj/item/melee/transforming/energy/sword = 7,
- /obj/item/book/granter/spell/knock = 15,
- /obj/item/book/granter/spell/summonitem = 20,
- /obj/item/book/granter/spell/forcewall = 17,
- /obj/item/storage/backpack/holding = 12,
- /obj/item/grenade/spawnergrenade/manhacks = 6,
- /obj/item/grenade/spawnergrenade/spesscarp = 7,
- /obj/item/grenade/clusterbuster/inferno = 3,
- /obj/item/stack/sheet/mineral/diamond{amount = 15} = 10,
- /obj/item/stack/sheet/mineral/uranium{amount = 15} = 10,
- /obj/item/stack/sheet/mineral/plasma{amount = 15} = 10,
- /obj/item/stack/sheet/mineral/gold{amount = 15} = 10,
- /obj/item/book/granter/spell/barnyard = 4,
- /obj/item/pickaxe/drill/diamonddrill = 6,
- /obj/item/borg/upgrade/disablercooler = 7)
-
-
-/obj/effect/spawner/lootdrop/snowdin/dungeonheavy
- name = "dungeon heavy"
- loot = list(/obj/item/singularityhammer = 25,
- /obj/item/mjollnir = 10,
- /obj/item/fireaxe = 25,
- /obj/item/organ/brain/alien = 17,
- /obj/item/dualsaber = 15,
- /obj/item/organ/heart/demon = 7,
- /obj/item/gun/ballistic/automatic/smg/c20r = 16,
- /obj/item/uplink/old = 2,
- /obj/item/book/granter/spell/charge = 12,
- /obj/item/grenade/clusterbuster/spawner_manhacks = 15,
- /obj/item/book/granter/spell/fireball = 10,
- /obj/item/pickaxe/drill/jackhammer = 30,
- /obj/item/borg/upgrade/syndicate = 13,
- /obj/item/borg/upgrade/selfrepair = 17)
-
-/obj/effect/spawner/lootdrop/snowdin/dungeonmisc
- name = "dungeon misc"
- lootdoubles = 2
- lootcount = 1
-
- loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10,
- /obj/item/toy/snowball = 15,
- /obj/item/shovel = 10,
- /obj/item/spear = 8,
- )
-
//special items//--
/obj/structure/barricade/wooden/snowed
@@ -579,7 +313,7 @@
uniform = /obj/item/clothing/under/syndicate/coldres
shoes = /obj/item/clothing/shoes/combat/coldres
ears = /obj/item/radio/headset/syndicate/alt
- r_pocket = /obj/item/gun/ballistic/automatic/pistol/syndicate
+ r_pocket = /obj/item/gun/ballistic/automatic/pistol/ringneck
id = /obj/item/card/id/syndicate
implants = list(/obj/item/implant/exile)
diff --git a/code/modules/awaymissions/mission_code/spacebattle.dm b/code/modules/awaymissions/mission_code/spacebattle.dm
index efe429b86b7..9a63a6fdbfa 100644
--- a/code/modules/awaymissions/mission_code/spacebattle.dm
+++ b/code/modules/awaymissions/mission_code/spacebattle.dm
@@ -1,49 +1,6 @@
-//Spacebattle Areas
-
-/area/awaymission/spacebattle
- name = "Space Battle"
- icon_state = "awaycontent1"
- requires_power = FALSE
-
-/area/awaymission/spacebattle/cruiser
- name = "\improper Nanotrasen Cruiser"
- icon_state = "awaycontent2"
-
-/area/awaymission/spacebattle/syndicate1
- name = "Syndicate Assault Ship 1"
- icon_state = "awaycontent3"
-
-/area/awaymission/spacebattle/syndicate2
- name = "Syndicate Assault Ship 2"
- icon_state = "awaycontent4"
-
-/area/awaymission/spacebattle/syndicate3
- name = "Syndicate Assault Ship 3"
- icon_state = "awaycontent5"
-
-/area/awaymission/spacebattle/syndicate4
- name = "Syndicate War Sphere 1"
- icon_state = "awaycontent6"
-
-/area/awaymission/spacebattle/syndicate5
- name = "Syndicate War Sphere 2"
- icon_state = "awaycontent7"
-
-/area/awaymission/spacebattle/syndicate6
- name = "Syndicate War Sphere 3"
- icon_state = "awaycontent8"
-
-/area/awaymission/spacebattle/syndicate7
- name = "Syndicate Fighter"
- icon_state = "awaycontent9"
-
-/area/awaymission/spacebattle/secret
- name = "Hidden Chamber"
- icon_state = "awaycontent10"
-
/mob/living/simple_animal/hostile/human/syndicate/ranged/spacebattle
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
- /obj/item/gun/ballistic/automatic/smg/c20r,
+ /obj/item/gun/ballistic/automatic/smg/cobra,
/obj/item/shield/energy)
/mob/living/simple_animal/hostile/human/syndicate/melee/spacebattle
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
deleted file mode 100644
index 063966c86d6..00000000000
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Station-Collision(sc) away mission map specific stuff
- *
- * Notes:
- * Feel free to use parts of this map, or even all of it for your own project. Just include me in the credits :)
- *
- * Some of this code unnecessary, but the intent is to add a little bit of everything to serve as examples
- * for anyone who wants to make their own stuff.
- *
- * Contains:
- * Landmarks
- * Guns
- * Safe code hints
- * Captain's safe
- * Modified Nar'Sie
- */
-
-
-
-/*
- * Landmarks - Instead of spawning a new object type, I'll spawn the bible using a landmark!
- */
-/obj/effect/landmark/sc_bible_spawner
- name = "Safecode hint spawner"
-
-/obj/effect/landmark/sc_bible_spawner/Initialize()
- ..()
- var/obj/item/storage/book/bible/B = new /obj/item/storage/book/bible/booze(loc)
- B.name = "The Holy book of the Geometer"
- B.deity_name = "Narsie"
- B.icon_state = "melted"
- B.item_state = "melted"
- B.lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
- B.righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
- new /obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible(B)
- new /obj/item/pen(B)
- return INITIALIZE_HINT_QDEL
-
-/*
- * Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map.
- */
-//Captain's retro laser - Fires practice laser shots instead.
-/obj/item/gun/energy/laser/retro/sc_retro
- name ="retro laser"
- icon_state = "retro"
- desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces."
-// projectile_type = "/obj/projectile/practice"
-
-//Syndicate sub-machine guns.
-/obj/item/gun/ballistic/automatic/smg/c20r/sc_c20r
-
-/obj/item/gun/ballistic/automatic/smg/c20r/sc_c20r/Initialize()
- . = ..()
- for(var/ammo in magazine.stored_ammo)
- if(prob(95)) //95% chance
- magazine.stored_ammo -= ammo
-
-//Barman's shotgun
-/obj/item/gun/ballistic/shotgun/sc_pump
-
-/obj/item/gun/ballistic/shotgun/sc_pump/Initialize()
- . = ..()
- for(var/ammo in magazine.stored_ammo)
- if(prob(95)) //95% chance
- magazine.stored_ammo -= ammo
-
-//Lasers
-/obj/item/gun/energy/laser/practice/sc_laser
- name = "Old laser"
- desc = "A once potent weapon, years of dust have collected in the chamber and lens of this weapon, weakening the beam significantly."
-
-/*
- * Safe code hints
- */
-
-//These vars hold the code itself, they'll be generated at round-start
-GLOBAL_VAR_INIT(sc_safecode1, "[rand(0,9)]")
-GLOBAL_VAR_INIT(sc_safecode2, "[rand(0,9)]")
-GLOBAL_VAR_INIT(sc_safecode3, "[rand(0,9)]")
-GLOBAL_VAR_INIT(sc_safecode4, "[rand(0,9)]")
-GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
-
-//Pieces of paper actually containing the hints
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison
- name = "smudged paper"
-
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison/Initialize()
- . = ..()
- default_raw_text = "The ink is smudged, you can only make out a couple numbers: '[GLOB.sc_safecode1]**[GLOB.sc_safecode4]*'"
-
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro
- name = "shredded paper"
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro/Initialize()
- . = ..()
- default_raw_text = "Although the paper is shredded, you can clearly see the number: '[GLOB.sc_safecode2]'"
-
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_caf
- name = "blood-soaked paper"
- //This does not have to be in New() because it is a constant. There are no variables in it i.e. [sc_safcode]
- default_raw_text = "This paper is soaked in blood, it is impossible to read any text."
-
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible
- name = "hidden paper"
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible/Initialize()
- . = ..()
- default_raw_text = {"It would appear that the pen hidden with the paper had leaked ink over the paper.
- However you can make out the last three digits:'[GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]'
- "}
-
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_shuttle
- default_raw_text = {"Target: Research-station Epsilon
- Objective: Prototype weaponry. The captain likely keeps them locked in her safe.
-
- Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunatly he has been captured by security
- Your objective is to split up, locate any of the papers containing the captain's safe code, open the safe and
- secure anything found inside. If possible, recover the imprisioned syndicate operative and receive the code from him.
-
- As always, eliminate anyone who gets in the way.
-
- Your assigned ship is designed specifically for penetrating the hull of another station or ship with minimal damage to operatives.
- It is completely fly-by-wire meaning you have just have to enjoy the ride and when the red light comes on... find something to hold onto!
- "}
-/*
- * Captain's safe
- */
-/obj/item/storage/secure/safe/sc_ssafe
- name = "Captain's secure safe"
-
-/obj/item/storage/secure/safe/sc_ssafe/Initialize()
- . = ..()
- l_code = "[GLOB.sc_safecode1][GLOB.sc_safecode2][GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]"
- l_set = 1
- new /obj/item/gun/energy/mindflayer(src)
- new /obj/item/soulstone(src)
- new /obj/item/clothing/suit/space/hardsuit/cult(src)
- //new /obj/item/teleportation_scroll(src)
- new /obj/item/stack/ore/diamond(src)
-
-/*
- * Modified Nar'Sie
- */
-/obj/singularity/narsie/mini
- desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
- move_self = 0 //Contianed narsie does not move!
- grav_pull = 0 //Contained narsie does not pull stuff in!
-//Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
-/obj/singularity/narsie/mini/admin_investigate_setup()
- return
-
-/obj/singularity/narsie/mini/process()
- eat()
- if(prob(25))
- mezzer()
-
-/obj/singularity/narsie/mini/ex_act()
- return
diff --git a/code/modules/awaymissions/mission_code/undergroundoutpost45.dm b/code/modules/awaymissions/mission_code/undergroundoutpost45.dm
deleted file mode 100644
index 41530320243..00000000000
--- a/code/modules/awaymissions/mission_code/undergroundoutpost45.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-// undergroundoutpost45
-
-//Areas
-/area/awaymission/undergroundoutpost45
- name = "space"
- icon_state = "awaycontent1"
-
-/area/awaymission/undergroundoutpost45/central
- name = "UO45 Central Hall"
- icon_state = "awaycontent2"
-
-/area/awaymission/undergroundoutpost45/crew_quarters
- name = "UO45 Crew Quarters"
- icon_state = "awaycontent3"
-
-/area/awaymission/undergroundoutpost45/engineering
- name = "UO45 Engineering"
- icon_state = "awaycontent4"
-
-/area/awaymission/undergroundoutpost45/mining
- name = "UO45 Mining"
- icon_state = "awaycontent5"
-
-/area/awaymission/undergroundoutpost45/research
- name = "UO45 Research"
- icon_state = "awaycontent6"
-
-/area/awaymission/undergroundoutpost45/gateway
- name = "UO45 Gateway"
- icon_state = "awaycontent7"
-
-/area/awaymission/undergroundoutpost45/caves
- name = "UO45 Caves"
- icon_state = "awaycontent8"
- always_unpowered = TRUE
- power_environ = FALSE
- power_equip = FALSE
- power_light = FALSE
- poweralm = FALSE
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
deleted file mode 100644
index 26c6b4823dc..00000000000
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Code for the Wild West map by Brotemis
- * Contains:
- * Wish Granter
- * Meat Grinder
- */
-
-///////////////Meatgrinder//////////////
-
-
-/obj/effect/meatgrinder
- name = "Meat Grinder"
- desc = "What is that thing?"
- density = TRUE
- anchored = TRUE
- icon = 'icons/mob/blob.dmi'
- icon_state = "blobpod"
- var/triggered = 0
-
-/obj/effect/meatgrinder/Initialize()
- . = ..()
- var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
- )
- AddElement(/datum/element/connect_loc, loc_connections)
-
-/obj/effect/meatgrinder/proc/on_entered(datum/source, atom/movable/AM)
- SIGNAL_HANDLER
- Bumped(AM)
-
-/obj/effect/meatgrinder/Bumped(atom/movable/AM)
-
- if(triggered)
- return
- if(!ishuman(AM))
- return
-
- var/mob/living/carbon/human/M = AM
-
- if(M.stat != DEAD && M.ckey)
- visible_message("[M] triggered [src]!")
- triggered = 1
-
- var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
- s.set_up(3, 1, src)
- s.start()
- explosion(M, 1, 0, 0, 0)
- qdel(src)
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index dae36500093..0a127891b1b 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -23,8 +23,6 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "[global.con
if(!current)
current = new
current.id = id
- if(delay)
- current.wait = CONFIG_GET(number/gateway_delay)
GLOB.gateway_destinations += current
current.target_turfs += get_turf(src)
diff --git a/code/modules/buildmode/submodes/lightmaker.dm b/code/modules/buildmode/submodes/lightmaker.dm
new file mode 100644
index 00000000000..2b50343c641
--- /dev/null
+++ b/code/modules/buildmode/submodes/lightmaker.dm
@@ -0,0 +1,31 @@
+/datum/buildmode_mode/lightmaker
+ key = "lightmaker"
+
+ var/light_range = 3
+ var/light_power = 1
+ var/light_color = COLOR_WHITE
+
+/datum/buildmode_mode/lightmaker/show_help(client/target_client)
+ to_chat(target_client, span_purple(examine_block(
+ "[span_bold("Left Click")] -> Create light\n\
+ [span_bold("Right Click")] -> Delete light\n\
+ [span_bold("Right Click on Build Mode Button")] -> Change light properties"))
+ )
+
+/datum/buildmode_mode/lightmaker/change_settings(client/target_client)
+ var/choice = alert("Change the new light range, power or color?", "Light Maker", "Range", "Power", "Color", "Cancel")
+ switch(choice)
+ if("Range")
+ light_range = input(target_client, "Range of light", text("Input")) as num|null
+ if("Power")
+ light_power = input(target_client, "Power of light", text("Input")) as num|null
+ if("Color")
+ light_color = input(target_client, "Light color", text("Input")) as color|null
+
+/datum/buildmode_mode/lightmaker/handle_click(client/target_client, params, obj/object)
+ var/list/modifiers = params2list(params)
+
+ if(LAZYACCESS(modifiers, LEFT_CLICK))
+ object.set_light(light_range, light_power, light_color)
+ if(LAZYACCESS(modifiers, RIGHT_CLICK))
+ object.set_light(0,0,COLOR_WHITE)
diff --git a/code/modules/cargo/blackmarket/blackmarket_item.dm b/code/modules/cargo/blackmarket/blackmarket_item.dm
index cbadddcf122..00ed7e3bee3 100644
--- a/code/modules/cargo/blackmarket/blackmarket_item.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_item.dm
@@ -24,23 +24,56 @@
var/stock_min = 1
/// Maximum amount that there should be of this item in the market if generated randomly.
var/stock_max = 0
+ /// Whether the item is visible and purchasable on the market
+ var/available = TRUE
/// Probability for this item to be available. Used by SSblackmarket on init.
var/availability_prob = 0
+ /// If this item should be more or less likely to spawn than usual. Positive is more likely, negative is less
+ var/weight = 0
+ /// If this item is affected by avalibility weight. For items that shouldnt appear on their own (paired items), should always appear, or items paticularly rare or powerful that we dont want showing up too often
+ var/spawn_weighting
// Should there be an unlimited stock of an item
var/unlimited = FALSE
/// Should another item spawn alongside this one in the catalogue?
- var/datum/blackmarket_item/pair_item
+ var/list/pair_item = null
+
/datum/blackmarket_item/New()
if(isnull(price))
- price = rand(price_min, price_max)
+ randomize_price()
if(isnull(stock))
- stock = rand(stock_min, stock_max)
+ randomize_stock()
+ if(isnull(spawn_weighting))
+ if(availability_prob == 0 || availability_prob == 100)
+ spawn_weighting = FALSE
+ else
+ spawn_weighting = TRUE
/// Used for spawning the wanted item, override if you need to do something special with the item.
/datum/blackmarket_item/proc/spawn_item(loc)
return new item(loc)
+/datum/blackmarket_item/proc/randomize_price()
+ price = rand(price_min, price_max)
+
+/datum/blackmarket_item/proc/randomize_stock()
+ stock = rand(stock_min, stock_max)
+
+/datum/blackmarket_item/proc/cycle(price = TRUE, availibility = TRUE, stock = FALSE, force_appear = FALSE)
+ if(price)
+ randomize_price()
+ if(stock)
+ randomize_stock()
+ if(availibility)
+ if(spawn_weighting ? prob(max(0, (availability_prob + (weight * 10)))) : prob(availability_prob))
+ available = TRUE
+ weight--
+ else
+ available = FALSE
+ weight++
+ if(force_appear)
+ available = TRUE
+
/// Buys the item and makes SSblackmarket handle it.
/datum/blackmarket_item/proc/buy(obj/item/blackmarket_uplink/uplink, mob/buyer, shipping_method)
// Sanity
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
new file mode 100644
index 00000000000..24a39c848ff
--- /dev/null
+++ b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
@@ -0,0 +1,335 @@
+/datum/blackmarket_item/ammo
+ category = "Ammunition"
+
+/datum/blackmarket_item/ammo/shotgun_dart
+ name = "Shotgun Dart"
+ desc = "These handy darts can be filled up with any chemical and be shot with a shotgun! \
+ Prank your friends by shooting them with laughter! \
+ Not recommended for comercial use."
+ item = /obj/item/ammo_casing/shotgun/dart
+
+ price_min = 10
+ price_max = 50
+ stock_min = 10
+ stock_max = 60
+ availability_prob = 40
+
+/datum/blackmarket_item/ammo/himehabu_mag
+ name = "Himehabu Magazines"
+ desc = "Compact 10 round .22 LR magazines for use in the Himehabu pistol."
+ item = /obj/item/ammo_box/magazine/m22lr_himehabu
+
+ price_min = 100
+ price_max = 200
+ stock_min = 6
+ stock_max = 10
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/a357_box
+ name = ".357 Ammo Box"
+ desc = "A 50 round ammo box of .357."
+ item = /obj/item/storage/box/ammo/a357
+
+ price_min = 150
+ price_max = 500
+ stock_min = 3
+ stock_max = 6
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/e40_mag
+ name = "Eoehoma .299 Caseless Magazine"
+ desc = "A 30 round magazine for the E-40 Hybrid Rifle."
+ item = /obj/item/ammo_box/magazine/e40
+
+ price_min = 750
+ price_max = 1250
+ stock = 6
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/cm23_mag
+ name = "CM-23 Magazines"
+ desc = "10 round 10mm magazines for use in the CM-23 pistol."
+ item = /obj/item/ammo_box/magazine/cm23
+
+ price_min = 150
+ price_max = 300
+ stock_min = 6
+ stock_max = 10
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/cm70_mag
+ name = "CM-70 Magazines"
+ desc = "18 round 9mm magazines for use in the CM-70 pistol."
+ item = /obj/item/ammo_box/magazine/m9mm_cm70
+
+ price_min = 200
+ price_max = 300
+ stock_min = 4
+ stock_max = 8
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/cm5_mag
+ name = "CM-5 Magazines"
+ desc = "30 round 9mm magazines for use in the CM-5 SMG."
+ item = /obj/item/ammo_box/magazine/cm5_9mm
+
+ price_min = 300
+ price_max = 600
+ stock_min = 2
+ stock_max = 6
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/saber_mag
+ name = "Saber 9mm SMG Magazines"
+ desc = "Magazines for use in the Saber 9mm SMG. No, they don't work as swords."
+ item = /obj/item/ammo_box/magazine/smgm9mm
+
+ price_min = 500
+ price_max = 1000
+ stock_min = 4
+ stock_max = 6
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/model_h_mag
+ name = "Model H Magazine"
+ desc = "A 10 round magazine for Model H slug pistol."
+ item = /obj/item/ammo_box/magazine/modelh
+
+ price_min = 500
+ price_max = 1000
+ stock_max = 4
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/sgg_stripper
+ name = "8x58mm Stripper Clip"
+ desc = "A five round 8x58mm stripper clip for use with the SGG-669C. Also doubles as a paperweight, because of course it does. Fucking Solarians."
+ item = /obj/item/ammo_box/a858
+
+ price_min = 500
+ price_max = 1000
+ stock_min = 6
+ stock_max = 8
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/pistole_c_mag
+ name = "5.56 Caseless Magazine"
+ desc = "A 12 round magazine for the Pistole Cheese."
+ item = /obj/item/ammo_box/magazine/pistol556mm
+
+ price_min = 250
+ price_max = 750
+ stock = 2
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/proto_gauss_mag
+ name = "Prototype Gauss Rifle Magazine"
+ desc = "A 25 round ferromagnetic pellet magazine for the prototype gauss rifle. Choking hazard, keep pellets away from children under the age of 5."
+ item = /obj/item/ammo_box/magazine/gauss
+
+ price_min = 500
+ price_max = 800
+ stock_min = 3
+ stock_max = 5
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/polymer_clip
+ name = "7.62 Stripper Clip"
+ desc = "A 5 round stripper clip of 7.62x40mm CLIP."
+ item = /obj/item/ammo_box/a762_stripper
+
+ price_min = 500
+ price_max = 750
+ stock_min = 4
+ stock_max = 6
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/carbine_mag
+ name = "SKM-24v Magazine"
+ desc = "A 30 round magazine of 4.6x30mm for the SKM-24v. A hermit classic."
+ item = /obj/item/ammo_box/magazine/skm_46_30
+
+ price_min = 500
+ price_max = 1000
+ stock_min = 3
+ stock_max = 5
+ availability_prob = 40
+
+/datum/blackmarket_item/ammo/skm_extended
+ name = "Extended SKM Magazine"
+ desc = "An extended 40 round 7.62x40mm CLIP magazine for the SKM family of assault rifles. Extra curves mean extra ammo."
+ item = /obj/item/ammo_box/magazine/skm_762_40/extended
+
+ price_min = 1000
+ price_max = 3000
+ stock_max = 4
+ availability_prob = 40
+
+/datum/blackmarket_item/ammo/skm_drum
+ name = "SKM Drum Magazine"
+ desc = "Do you have too much ammo on your hands? Do you have someone you really hate? \
+ Do you want them to be absolutely suppressed for the next 15 seconds? \
+ This 75 round 7.62x40mm CLIP drum magazine is perfect for you! (SKM not included.)"
+ item = /obj/item/ammo_box/magazine/skm_762_40/drum
+
+ price_min = 1500
+ price_max = 3500
+ stock = 2
+ availability_prob = 20
+
+/datum/blackmarket_item/ammo/damaged_cell
+ name = "Discount Weapon Power Cells"
+ desc = "These cells got a little banged up during a raid by GOLD authorities, but they still should be safe to use. Probably."
+ item = /obj/item/stock_parts/cell/gun
+
+ price_min = 100
+ price_max = 400
+ stock_min = 5
+ stock_max = 10
+ availability_prob = 80
+
+/datum/blackmarket_item/ammo/damaged_cell/spawn_item(loc)
+ var/obj/item/stock_parts/cell/damaged_cell = ..()
+ damaged_cell.name = "dented weapon power cell"
+ damaged_cell.desc = "A rechargeable electrochemical power cell. This one doesn't appear to be in the greatest condition."
+ if(prob(35))
+ damaged_cell.rigged = TRUE
+ damaged_cell.show_rigged = FALSE
+
+ return new damaged_cell(loc)
+
+/datum/blackmarket_item/ammo/advanced_weapon_cell
+ name = "Upgraded Weapon Power Cells"
+ desc = "These upgraded weapon powercells come with twice the capacity of the standard cells, and quality checked to make sure they won't explode!"
+ item = /obj/item/stock_parts/cell/gun/upgraded
+
+ price_min = 1000
+ price_max = 1750
+ stock_min = 2
+ stock_max = 4
+ availability_prob = 25
+
+/datum/blackmarket_item/ammo/huge_weapon_cell
+ name = "Extra Large Weapon Power Cells"
+ desc = "We're way past double A now. These extra-large power cells (in both charge and size!) are purpose built for the most heavy duty energy weapons."
+ item = /obj/item/stock_parts/cell/gun/large
+
+ price_min = 2500
+ price_max = 4000
+ stock = 2
+ availability_prob = 20
+ spawn_weighting = FALSE
+
+/datum/blackmarket_item/ammo/mecha_hades_ammo
+ name = "FNX-99 Incediary Ammo"
+ desc = "A box of 24 incendiary shells for the FNX-99 mounted carbine."
+ item = /obj/item/mecha_ammo/incendiary
+
+ price_min = 250
+ price_max = 350
+ stock_min = 3
+ stock_max = 5
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/mauler_mag
+ name = "Mauler Magazine"
+ desc = "A 12 round 9mm magazine for the Mauler Machine Pistol."
+ item = /obj/item/ammo_box/magazine/m9mm_mauler
+ price_min = 250
+ price_max = 750
+ stock_min = 3
+ stock_max = 5
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/spitter_mag
+ name = "Spitter Magazine"
+ desc = "A 30 round 9mm magazine for the Spitter submachine gun."
+ item = /obj/item/ammo_box/magazine/spitter_9mm
+
+ price_min = 250
+ price_max = 750
+ stock_min = 2
+ stock_max = 5
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/pounder_mag
+ name = "Pounder Pan Magazine"
+ desc = "A 50 round pan magazine for the Pounder submachine gun. Heavy enough to double as an emergency melee weapon to beat off your enemies in a pinch."
+ item = /obj/item/ammo_box/magazine/c22lr_pounder_pan
+
+ price_min = 400
+ price_max = 750
+ stock = 2
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/a4570hp
+ name = ".45-70 Hollow Point Ammo Box"
+ desc = "Put the hollow in hollow point by blowing a crater in some random sod with this devastating .45-70 cartridge."
+ item = /obj/item/storage/box/ammo/a4570_hp
+
+ price_min = 600
+ price_max = 1000
+ stock_min = 3
+ stock_max = 5
+ availability_prob = 20
+
+/datum/blackmarket_item/ammo/a4570explo
+ name = "Single .45-70 Explosive Round"
+ desc = "If you need to fuck someone, hard, we got just the thing. Only one round, though, hope you got good aim."
+ item = /obj/item/ammo_casing/a4570/explosive
+
+ price_min = 400
+ price_max = 800 //still an exorbitantly high price for one round that you might not even hit
+ stock_min = 2
+ stock_max = 10
+ availability_prob = 10
+
+/datum/blackmarket_item/ammo/c38hotshot
+ name = ".38 Hearth Ammo Box"
+ desc = "We got our ship cook to marinade some .38 in some hearthflame we pocketed off some hunters. It'll cook your targets to a nice well done."
+ item = /obj/item/ammo_box/c38/hotshot
+
+ price_min = 300
+ price_max = 500
+ stock_min = 3
+ stock_max = 8
+ availability_prob = 50
+
+/datum/blackmarket_item/ammo/c38iceblox
+ name = ".38 Chilled Ammo Box"
+ desc = "One of our runners accidentally spilled some .38 into a fucking pristine wine of ice shipment. It'll freeze your targets faster than our runner froze solid outside for making a mess."
+ item = /obj/item/ammo_box/c38/iceblox
+
+ price_min = 300
+ price_max = 500
+ stock_min = 3
+ stock_max = 8
+ availability_prob = 50
+
+/datum/blackmarket_item/ammo/a8x50match
+ name = "8x50mm Match Box"
+ desc = "We found this dead guy with a recording of him going \"Watch this!\", and richoetting something before crumbling over. This is the ammo he had!"
+ item = /obj/item/storage/box/ammo/a8_50r/match
+ price_min = 500
+ price_max = 1000
+ stock_min = 1
+ stock_max = 4
+ availability_prob = 30
+
+/datum/blackmarket_item/ammo/c22rub
+ name = ".22lr Rubbers"
+ desc = "A 100 round box of .22 rubbershot from some godsforsaken frontier world. We're pretty sure the use-case is making someone think that they just pissed off a beehive"
+ item = /obj/item/storage/box/ammo/c22lr/rubber
+ price_min = 400
+ price_max = 800
+ stock_min = 1
+ stock_max = 4
+ availability_prob = 40
+
+/datum/blackmarket_item/ammo/a8x58trac
+ name = "8x58mm Tracker"
+ desc = "We hot glued a GPS onto the inside of this 8x58mm shell! For the low low price of. Whatever the price is. You can have it!"
+ item = /obj/item/ammo_casing/caseless/a858/trac
+ price_min = 50
+ price_max = 500
+ stock_min = 4
+ stock_max = 8
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index a4c4195beca..1beb0a0de7d 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -11,15 +11,26 @@
stock_max = 5
availability_prob = 80
-/datum/blackmarket_item/clothing/crown
- name = "Crown"
- desc = "A beautiful golden crown, rich with history and pedigree. Better worn than left to collect dust in a museum, right?"
- item = /obj/item/clothing/head/crown/fancy
+/datum/blackmarket_item/clothing/straitjacket
+ name = "Straitjacket"
+ desc = "These straitjackets might be a tight fit, but you can certain the poor sod wont be getting away anytime soon."
+ item = /obj/item/clothing/suit/straight_jacket
- price_min = 1000
- price_max = 2000
- stock_max = 1
- availability_prob = 20
+ price_min = 500
+ price_max = 1000
+ stock_max = 3
+ availability_prob = 40
+
+/datum/blackmarket_item/clothing/surplus_uniform
+ name = "Surplus Combat Uniforms"
+ desc = "A mass produced and non-descript surplus combat uniform. For when you need to look like another faceless thug in the crowd."
+ item = /obj/item/clothing/under/rank/security/officer/military
+
+ price_min = 50
+ price_max = 200
+ stock_min = 5
+ stock_max = 10
+ availability_prob = 80
/datum/blackmarket_item/clothing/galaxy_blue
name = "Blue Galaxy Suit"
@@ -81,28 +92,48 @@
return B
/datum/blackmarket_item/clothing/frontiersmen_armor_set
- name = "X-11 Bulletproof Armor Set"
- desc = "We got a good deal on some extra bulletproof armor from a Frontiersmen Quartermaster, and we're passing those savings onto you!"
+ name = "X-11 Armor Set"
+ desc = "We got a good deal on some extra armor from a Frontiersmen Quartermaster, and we're passing those savings onto you!"
item = /obj/item/storage/box
- price_min = 1000
- price_max = 1750
+ price_min = 500
+ price_max = 1250
stock_max = 3
availability_prob = 50
/datum/blackmarket_item/clothing/frontiersmen_armor_set/spawn_item(loc)
var/obj/item/storage/box/B = ..()
- B.name = "Bulletproof Armor Set Box"
+ B.name = "Armor Set Box"
B.desc = "A beat up looking box with some armor inside."
- new /obj/item/clothing/suit/armor/vest/bulletproof/frontier(B)
+ new /obj/item/clothing/suit/armor/vest/frontier(B)
new /obj/item/clothing/head/helmet/bulletproof/x11/frontier(B)
return B
+/datum/blackmarket_item/clothing/frontiersmen_armor_fireproof
+ name = "Fireproof Armor Set"
+ desc = "Get it while it's hot! This fireproofed armor and uniform set is made with a pre-Night Of Fire miracle material that renders it almost impervious to flames. The Frontiersmen swear by the stuff. It's kept each of it's previous owners safe until they passed away from illness."
+ item = /obj/item/storage/box
+
+ price_min = 1000
+ price_max = 1750
+ stock_max = 3
+ availability_prob = 50
+
+/datum/blackmarket_item/clothing/frontiersmen_armor_fireproof/spawn_item(loc)
+ var/obj/item/storage/box/B = ..()
+ B.name = "Fireproof Armor Set Box"
+ B.desc = "A singed box with some folded clothes and a helmet inside."
+ new /obj/item/clothing/suit/armor/frontier/fireproof(B)
+ new /obj/item/clothing/head/helmet/bulletproof/x11/frontier/fireproof(B)
+ new /obj/item/clothing/under/frontiersmen/fireproof(B)
+ new /obj/item/clothing/mask/gas/frontiersmen(B)
+ return B
+
/datum/blackmarket_item/clothing/gezena_armor
name = "Raksha-Plating vest"
desc = "Genuine armor vests used by the PGF Marine Corp. If a military guy in a cape comes by, play dumb."
item = /obj/item/clothing/suit/armor/gezena/marine
- pair_item = /datum/blackmarket_item/clothing/gezena_helmet
+ pair_item = list(/datum/blackmarket_item/clothing/gezena_helmet)
price_min = 750
price_max = 1250
@@ -137,6 +168,54 @@
new /obj/item/clothing/head/helmet/space(B)
return B
+/datum/blackmarket_item/clothing/syndie_spacesuit_set
+ name = "\improper Syndicate Branded Spacesuit Box"
+ desc = "An armored syndicate softsuit, popular among the ACLF operatives who were too broke to get an actual hardsuit."
+ item = /obj/item/storage/box/syndie_kit
+
+ price_min = 750
+ price_max = 2500
+ stock_max = 3
+ availability_prob = 50
+
+/datum/blackmarket_item/clothing/syndie_spacesuit_set/spawn_item(loc)
+ var/obj/item/storage/box/syndie_kit/B = ..()
+ B.name = "Spacesuit Box"
+ B.desc = "It has a Syndicate logo on it."
+ var/suit_color = pick(list("red","green","dark green","blue","orange","black","black-green","black-blue","black-orange","black-red"))
+ switch(suit_color)
+ if("red")
+ new /obj/item/clothing/head/helmet/space/syndicate(B)
+ new /obj/item/clothing/suit/space/syndicate(B)
+ if("green")
+ new /obj/item/clothing/head/helmet/space/syndicate/green(B)
+ new /obj/item/clothing/suit/space/syndicate/green(B)
+ if("dark-green")
+ new /obj/item/clothing/head/helmet/space/syndicate/green/dark(B)
+ new /obj/item/clothing/suit/space/syndicate/green/dark(B)
+ if("orange")
+ new /obj/item/clothing/head/helmet/space/syndicate/orange(B)
+ new /obj/item/clothing/suit/space/syndicate/orange(B)
+ if("blue")
+ new /obj/item/clothing/head/helmet/space/syndicate/blue(B)
+ new /obj/item/clothing/suit/space/syndicate/blue(B)
+ if("black")
+ new /obj/item/clothing/head/helmet/space/syndicate/black(B)
+ new /obj/item/clothing/suit/space/syndicate/black(B)
+ if("black-green")
+ new /obj/item/clothing/head/helmet/space/syndicate/black/green(B)
+ new /obj/item/clothing/suit/space/syndicate/black/green(B)
+ if("black-blue")
+ new /obj/item/clothing/head/helmet/space/syndicate/black/blue(B)
+ new /obj/item/clothing/suit/space/syndicate/black/blue(B)
+ if("black-orange")
+ new /obj/item/clothing/head/helmet/space/syndicate/black/orange(B)
+ new /obj/item/clothing/suit/space/syndicate/black/orange(B)
+ if("black-red")
+ new /obj/item/clothing/head/helmet/space/syndicate/black/red(B)
+ new /obj/item/clothing/suit/space/syndicate/black/red(B)
+ return B
+
/datum/blackmarket_item/clothing/chameleon_hat
name = "Chameleon Hat"
desc = "Pick any hat you want with this Handy device. Not Quality Tested."
@@ -147,6 +226,17 @@
stock_max = 2
availability_prob = 70
+/datum/blackmarket_item/clothing/cham_kit
+ name = "Chameleon Kit"
+ desc = "Not sure what to wear? This adaptive set of clothing can change to suit whatever you desire! Quality tested."
+ item = /obj/item/storage/box/syndie_kit/chameleon
+
+ price_min = 1000
+ price_max = 2500
+ stock_max = 2
+ availability_prob = 10
+ spawn_weighting = FALSE
+
/datum/blackmarket_item/clothing/combatmedic_suit
name = "Combat Medic Hardsuit"
desc = "A discarded combat medic hardsuit, found in the ruins of a carpet bombed xeno hive. Definitely used, but as sturdy as an anchor."
@@ -164,7 +254,7 @@
price_min = 1500
price_max = 2500
- stock = 1
+ stock_max = 3
availability_prob = 30
/datum/blackmarket_item/clothing/frontiersmen_hardsuit
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index e3a20e0e890..871b103af05 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -4,7 +4,7 @@
/datum/blackmarket_item/consumable/donk_pocket_box
name = "Box of Donk Pockets"
desc = "A well packaged box containing the favourite snack of every spacefarer."
- item = /obj/effect/spawner/lootdrop/donkpockets
+ item = /obj/effect/spawner/random/food_or_drink/donkpockets
stock_min = 2
stock_max = 5
@@ -17,10 +17,10 @@
desc = "A random cocktail of luxury drugs that are sure to put a smile on your face!"
item = /obj/item/storage/pill_bottle
- stock_min = 2
- stock_max = 3
- price_min = 200
- price_max = 500
+ stock_min = 4
+ stock_max = 6
+ price_min = 50
+ price_max = 300
availability_prob = 50
/datum/blackmarket_item/consumable/suspicious_pills/spawn_item(loc)
@@ -42,6 +42,28 @@
price_max = 60
availability_prob = 50
+/datum/blackmarket_item/consumable/cannabis
+ name = "Cannabis Leaves"
+ desc = "Homegrown cannabis, fresh off the garden just for your pleasure!"
+ item = /obj/item/reagent_containers/food/snacks/grown/cannabis
+
+ stock_min = 4
+ stock_max = 6
+ price_min = 50
+ price_max = 300
+ availability_prob = 50
+
+/datum/blackmarket_item/consumable/syndie_cigs
+ name = "Syndicate Cigarettes"
+ desc = "Who said smoking was bad for you? These omnizine laced cigarettes will have you feeling like a million bucks!"
+ item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
+
+ stock_min = 4
+ stock_max = 6
+ price_min = 50
+ price_max = 300
+ availability_prob = 50
+
/datum/blackmarket_item/consumable/trickwine
name = "Trickwine"
desc = "The SRM keeps the recipes for their trickwines a closely guarded secret. The Hunters carrying those bottles? Less so."
@@ -57,21 +79,19 @@
var/trickwine = pick(list(/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine))
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,))
return new trickwine(loc)
+/datum/blackmarket_item/consumable/stimpack
+ name = "Stimpack"
+ desc = "A quick inject medipen loaded with a cocktail of powerful stimulants. Side effects may include nasuea, heartburn, constipation, weight loss, increased blood pressure, kidney stones, liver damage, mood swings, mania, anemia, weight gain, total organ failure, runny nose and minor retinal irritation."
+ item = /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor
-/datum/blackmarket_item/consumable/pumpup
- name = "Maintenance Pump-Up"
- desc = "Resist any Baton stun with this handy instant tetanus free injector!."
- item = /obj/item/reagent_containers/hypospray/medipen/pumpup
-
- stock_max = 3
- price_min = 50
- price_max = 150
- availability_prob = 90
+ stock_min = 4
+ stock_max = 6
+ price_min = 250
+ price_max = 500
+ availability_prob = 50
/datum/blackmarket_item/consumable/morphine
name = "Morphine Bottle"
@@ -80,6 +100,7 @@
price_min = 50
price_max = 150
+ stock_min = 2
stock_max = 4
availability_prob = 50
@@ -88,9 +109,10 @@
desc = "Cyanide, a tried and true classic for all your poisoning needs."
item = /obj/item/reagent_containers/glass/bottle/cyanide
- price_min = 300
- price_max = 600
- stock_max = 3
+ price_min = 200
+ price_max = 400
+ stock_min = 2
+ stock_max = 4
availability_prob = 30
/datum/blackmarket_item/consumable/sodium_thiopental
@@ -98,19 +120,21 @@
desc = "Sodium Thiopental, a potent and fast acting sedative for any occasion."
item = /obj/item/reagent_containers/glass/bottle/sodium_thiopental
- price_min = 300
+ price_min = 250
price_max = 600
- stock_max = 3
+ stock_min = 2
+ stock_max = 4
availability_prob = 30
/datum/blackmarket_item/consumable/amanitin
- name = "Amanitin bottle"
+ name = "Amanitin Bottle"
desc = "A slow acting, but nearly undetectable poison. For the dignified assassin."
item = /obj/item/reagent_containers/glass/bottle/amanitin
price_min = 300
price_max = 600
- stock_max = 3
+ stock_max = 2
+ stock_max = 4
availability_prob = 30
/datum/blackmarket_item/consumable/gumballs
@@ -124,15 +148,21 @@
stock_max = 20
availability_prob = 80
-/datum/blackmarket_item/consumable/xeno_meat
- name = "Xenomorph steak"
+/datum/blackmarket_item/consumable/xeno_corpse
+ name = "Xenomorph Corpse"
desc = "The Frontier's most dangerous game, delivered right to your plate! May constitute a violation of your local BARD laws and regulations."
- item = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
+ item = /mob/living/simple_animal/hostile/alien
- price_min = 300
- price_max = 500
- stock_max = 5
- availability_prob = 20
+ price_min = 6000
+ price_max = 10000
+ stock = 1
+ availability_prob = 10
+ spawn_weighting = FALSE
+
+/datum/blackmarket_item/consumable/xeno_corpse/spawn_item(loc)
+ var/mob/living/simple_animal/hostile/alien = ..()
+ alien.stat = DEAD
+ return new alien(loc)
/datum/blackmarket_item/consumable/berries
name = "Berries"
@@ -154,10 +184,10 @@
/datum/blackmarket_item/consumable/ration
name = "Ration Pack"
desc = "PGF military surplus rations. What's in them? Who knows. Surprise is the spice of life after all."
- item = /obj/effect/spawner/lootdrop/ration
+ item = /obj/effect/spawner/random/food_or_drink/ration
price_min = 150
- price_max = 400
+ price_max = 300
availability_prob = 80
unlimited = TRUE
@@ -177,10 +207,10 @@
desc = "A bundle of sutures for stitching up your latest bullet wound."
item = /obj/item/stack/medical/suture
- price_min = 200
- price_max = 450
- stock_min = 2
- stock_max = 5
+ price_min = 25
+ price_max = 150
+ stock_min = 4
+ stock_max = 6
availability_prob = 40
/datum/blackmarket_item/consumable/regen_mesh
@@ -188,10 +218,10 @@
desc = "A smoothing pack of regenerative mesh for your burns."
item = /obj/item/stack/medical/mesh
- price_min = 200
- price_max = 450
- stock_min = 2
- stock_max = 5
+ price_min = 25
+ price_max = 150
+ stock_min = 4
+ stock_max = 6
availability_prob = 40
/datum/blackmarket_item/consumable/bruise_pack
@@ -199,19 +229,53 @@
desc = "A bundle of old bruise packs, for you guessed it, bruises. Any rumors of these containing hazardous chemicals are just that. Rumors."
item = /obj/item/stack/medical/bruise_pack
- price_min = 300
- price_max = 500
- stock_min = 2
- stock_max = 5
+ price_min = 50
+ price_max = 175
+ stock_min = 4
+ stock_max = 6
availability_prob = 30
/datum/blackmarket_item/consumable/ointment
- name = "Burn ointment"
+ name = "Burn Ointment"
desc = "A tube of burn ointment. It's past the expiry date, but those are only suggestions."
item = /obj/item/stack/medical/ointment
- price_min = 300
- price_max = 500
- stock_min = 2
- stock_max = 5
+ price_min = 50
+ price_max = 175
+ stock_min = 4
+ stock_max = 6
availability_prob = 30
+
+/datum/blackmarket_item/consumable/goliath
+ name = "A Live Goliath"
+ desc = "We reappropiated an outpost freighter a week back, and the entire thing was packed with goliaths for whatever reason. Point is, we're sick and tired of eating them, so we're selling what's left so we can buy some actual take out."
+ item = /mob/living/simple_animal/hostile/asteroid/goliath/beast
+
+ price_min = 750
+ price_max = 2000
+ stock_max = 4
+ availability_prob = 15
+ spawn_weighting = FALSE
+
+/datum/blackmarket_item/consumable/color_salve
+ name = "Color Salve"
+ desc = "A cosmetic salve used for changing the hue of Elzouse. Now with 20% less harmful chemical dyes!"
+ item = /obj/item/colorsalve
+
+ price_min = 100
+ price_max = 200
+ stock_min = 4
+ stock_max = 10
+ availability_prob = 80
+
+/datum/blackmarket_item/consumable/secret_sauce
+ name = "Family Sauce Recipe"
+ desc = "This used to belong to a good friend of mine before the authorities did em in. Best goddamn sauce I've ever tasted, but I could never get it right myself. Maybe you can do it justice."
+ item = /obj/item/paper/secretrecipe
+
+ price_min = 1000
+ price_max = 2000
+ stock = 1
+ availability_prob = 5
+ spawn_weighting = FALSE
+
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
index 7fe78cdcd05..26402e3dfac 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
@@ -11,6 +11,16 @@
stock_max = 5
availability_prob = 50
+/datum/blackmarket_item/explosive/smoke_grenade
+ name = "Smoke Grenade"
+ desc = "Too much heat on your back? This handy smoke grenade is perfect for a hasty getaway."
+ item = /obj/item/grenade/smokebomb
+
+ price_min = 100
+ price_max = 400
+ stock_max = 5
+ availability_prob = 50
+
/datum/blackmarket_item/explosive/h_e
name = "HE Grenade"
desc = "These high explosive grenades are sure to get some bang for your buck."
@@ -57,7 +67,7 @@
/datum/blackmarket_item/explosive/slipocalypse
name = "Slipocalyse Cluster Bomb"
- desc = "Wash away the opposition with sudstastic grenade!"
+ desc = "Wash away the opposition with this sudstastic grenade!"
item = /obj/item/grenade/clusterbuster/soap
price_min = 500
@@ -65,9 +75,21 @@
stock = 1
availability_prob = 10
+/datum/blackmarket_item/explosive/disco_grenade
+ name = "Portable Disco Grenade"
+ desc = "Become the life of the party with this groovy grenade!"
+ item = /obj/item/grenade/discogrenade
+
+ price_min = 500
+ price_max = 750
+ stock_min = 2
+ stock_max = 3
+ availability_prob = 10
+ spawn_weighting = FALSE
+
/datum/blackmarket_item/explosive/rusted_mine
name = "Landmine"
- desc = "Recovered from a decades old ICW battlefield by our best EOD tech, Nicky Nine Fingers."
+ desc = "Recovered from a decade old ICW battlefield by our best EOD tech, Nicky Nine Fingers."
item = /obj/item/mine/pressure/explosive/rusty
price_min = 250
@@ -75,14 +97,29 @@
stock_max = 7
availability_prob = 50
-/datum/blackmarket_item/explosive/rpg
- name = "PML-9 RPG"
- desc = "Offically, it's an anti-armor RPG launcher. Technically, it's anti-everything. Most things don't enjoy being hit in the face with high explosives."
- item = /obj/item/gun/ballistic/rocketlauncher
+/datum/blackmarket_item/explosive/live_bomb
+ name = "Active ICW Era Ordinance"
+ desc = "Look, I won't mince words. This thing is counting down and I don't want to be the next causualty of ICW after it's already ended. I'll sell it to you real cheap."
+ item = /obj/machinery/syndicatebomb
- price_min = 3500
- price_max = 6500
- stock_min = 2
- stock_max = 5
- availability_prob = 20
+ price_min = 500
+ price_max = 1000
+ stock = 1
+ availability_prob = 5
+ spawn_weighting = FALSE
+/datum/blackmarket_item/explosive/live_bomb/spawn_item(loc)
+ var/obj/machinery/syndicatebomb/bomb = ..()
+ bomb.activate()
+ return new bomb(loc)
+
+/datum/blackmarket_item/explosive/firecrackers
+ name = "Firecracker"
+ desc = "Nuclear Bomb brand extra strength firecrackers, painted in the signature blood red of the Gorlex Marauders. Enjoyed a successful, albeit short run in PGF space due to a certain event in 492 FS made selling them somewhat in poor taste."
+ item = /obj/item/grenade/firecracker
+
+ price_min = 50
+ price_max = 250
+ stock_min = 5
+ stock_max = 10
+ availability_prob = 50
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index a5e2c67175a..a9221fb95ec 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -11,15 +11,15 @@
stock_max = 6
availability_prob = 80
-/datum/blackmarket_item/misc/shoulder_holster
- name = "Shoulder holster"
- desc = "Yeehaw, hardboiled friends! This holster is the first step in your dream of becoming a detective and being allowed to shoot real guns!"
+/datum/blackmarket_item/misc/cham_holster
+ name = "Chameleon Shoulder holster"
+ desc = "Looking to pack some heat without attracting attention? This adapative chameleon shoulder holster can disguise itself and your piece!"
item = /obj/item/clothing/accessory/holster
price_min = 200
price_max = 800
- stock_max = 8
- availability_prob = 60
+ stock_max = 4
+ availability_prob = 40
/datum/blackmarket_item/misc/strange_seed
name = "Strange Seeds"
@@ -56,31 +56,11 @@
desc = "Why, it could be anything. Are you feeling lucky?"
item = /obj/structure/closet/crate/secure/loot
- price_min = 250
- price_max = 400
+ price_min = 100
+ price_max = 300
availability_prob = 100
unlimited = TRUE
-/datum/blackmarket_item/misc/spygass
- name = "Spy Glass Kit"
- desc = "A set of trick glasses and a linked camera. Suit and dashing shades not included."
- item = /obj/item/storage/box/rxglasses/spyglasskit
-
- price_min = 250
- price_max = 1000
- stock_max = 3
- availability_prob = 30
-
-/datum/blackmarket_item/misc/ripley_mk_4
- name = "Ripley Mk IV Upgrade Kit"
- desc = "Pimp out your Ripley to the CLIP Mark IV Rogue Model today! Killjoy bureaucrats not included, thank god."
- item = /obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/clip
-
- price_min = 1500
- price_max = 2500
- stock_max = 3
- availability_prob = 30
-
/datum/blackmarket_item/misc/secret_docs
name = "Classified Documents"
desc = "Good people died to get these. Luckily, we aren't good people."
@@ -107,3 +87,57 @@
price_max = 10000
stock = 1
availability_prob = 40
+
+/datum/blackmarket_item/misc/knockoff_plush
+ name = "Knockoff T4LI Plush"
+ desc = "You'll hardly be able to tell that it's an offbrand rip off!"
+ item = /obj/item/toy/plush/tali
+
+ price_min = 50
+ price_max = 150
+ stock_min = 2
+ stock_max = 5
+ availability_prob = 60
+
+/datum/blackmarket_item/misc/knockoff_plush/spawn_item(loc)
+ var/obj/item/toy/plush/tali/plush = ..()
+ plush.name = "T3MMI"
+ plush.desc = "A rather shoddy and unlicensed plushie 'paying homage' to a character from the RILENA series."
+ return new plush(loc)
+
+/datum/blackmarket_item/misc/pens
+ name = "Pen"
+ desc = "We found an old Cybersun blacksite, and came across an unmarked crate full of pens. Want one?"
+ item = /obj/item/pen
+
+ price_min = 50
+ price_max = 150
+ unlimited = TRUE
+ availability_prob = 60
+
+/datum/blackmarket_item/misc/pens/spawn_item(loc)
+ var/pen = pick(list(/obj/item/pen,
+ /obj/item/pen/blue,
+ /obj/item/pen/red,
+ /obj/item/pen/fourcolor,
+ /obj/item/pen/fountain,
+ /obj/item/pen/fountain/captain,
+ /obj/item/pen/solgov,
+ /obj/item/pen/fountain/solgov,
+ /obj/item/pen/edagger,
+ /obj/item/pen/survival,
+ /obj/item/pen/sleepy))
+ return new pen(loc)
+
+/datum/blackmarket_item/misc/hexacrete
+ name = "Jug of Hexacrete"
+ desc = "Need to make a blacksite in a jiffy? Skip the fuss with this 150u jug of hexacrete!"
+ item = /obj/item/reagent_containers/glass/chem_jug/hexacrete
+
+ price_min = 750
+ price_max = 1500
+ stock_min = 3
+ stock_max = 10
+ availability_prob = 30
+
+
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tech.dm b/code/modules/cargo/blackmarket/blackmarket_items/tech.dm
new file mode 100644
index 00000000000..63db8cbb75d
--- /dev/null
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tech.dm
@@ -0,0 +1,214 @@
+/datum/blackmarket_item/tech
+ category = "Technology"
+
+/datum/blackmarket_item/tech/ripley_mk_4
+ name = "Ripley Mk IV Upgrade Kit"
+ desc = "Pimp out your Ripley to the CLIP Mark IV Rogue Model today! Killjoy bureaucrats not included, thank god."
+ item = /obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/clip
+
+ price_min = 1500
+ price_max = 2500
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/tech/chem_master
+ name = "Chem Master Board"
+ desc = "A Chem Master board, capable of seperating and packaging reagents. Perfect for any aspiring at home chemist."
+ item = /obj/item/circuitboard/machine/chem_master
+
+ price_min = 1000
+ price_max = 3000
+ stock = 1
+ availability_prob = 30
+
+/datum/blackmarket_item/tech/ltrsbt
+ name = "Black Market Long-To-Short-Range-Bluespace-Transciever"
+ desc = "Need a faster and better way of transporting your illegal goods from and to the sector? Fear not, the Long-To-Short-Range-Bluespace-Transceiver (LTSRBT for short) is here to help. This handy teleporter will teleport your purchases directly to you once built."
+ item = /obj/item/circuitboard/machine/ltsrbt
+
+ price_min = 500
+ price_max = 1000
+ stock_max = 3
+ availability_prob = 20
+
+/datum/blackmarket_item/tech/mrs_pacman
+ name = "MRSPACMAN-type Generator Board"
+ desc = "A ridiciously overclocked PACMAN generator that somehow burns diamonds as fuel."
+ item = /obj/item/circuitboard/machine/pacman/mrs
+
+ price_min = 2000
+ price_max = 3000
+ stock = 1
+ availability_prob = 30
+
+/datum/blackmarket_item/tech/ai_core
+ name = "AI Core Board"
+ desc = "The future is now! Become one with your ship with this AI core board! (Some assembly required.)"
+ item = /obj/item/circuitboard/aicore
+ pair_item = list(/datum/blackmarket_item/tech/boris, /datum/blackmarket_item/tech/mmi, /datum/blackmarket_item/tech/borg)
+
+ price_min = 5000
+ price_max = 8000
+ stock = 1
+ availability_prob = 5
+ spawn_weighting = FALSE
+
+/datum/blackmarket_item/tech/boris
+ name = "B.O.R.I.S Module"
+ desc = "A Bluespace Optimi-blah blah blah, I'm bored already. This module will convert a cyborg frame into an AI compatible shell."
+ item = /obj/item/borg/upgrade/ai
+
+ price_min = 500
+ price_max = 1000
+ stock = 1
+ availability_prob = 0
+
+/datum/blackmarket_item/tech/mmi
+ name = "Man Machine Interface"
+ desc = "Transcend the weakness of your flesh with this man machine interface, compatible with AIs, Cyborgs and Mechs!"
+ item = /obj/item/mmi
+ pair_item = list(/datum/blackmarket_item/tech/borg)
+
+ price_min = 250
+ price_max = 750
+ stock_max = 3
+ availability_prob = 40
+
+/datum/blackmarket_item/tech/borg
+ name = "Cyborg Construction Kit"
+ desc = "This durable and verastile cyborg frame is capable of fufilling a number of roles and survive situations that would kill the average person. Brain sold seperately."
+ item = /obj/structure/closet/crate/cyborg
+
+ price_min = 1000
+ price_max = 2000
+ stock_max = 2
+ availability_prob = 0
+
+/datum/blackmarket_item/tech/t4_capacitor
+ name = "Quadratic Capacitor"
+ desc = "A top grade quadractic capacitor. These highly effiecent capacitors are capable of storing massive amounts of electricity. Keep away from open plugs."
+ item = /obj/item/stock_parts/capacitor/quadratic
+
+ price_min = 400
+ price_max = 700
+ stock_min = 2
+ stock_max = 4
+ availability_prob = 20
+
+/datum/blackmarket_item/tech/t4_scanner
+ name = "Triphasic Scanning Module"
+ desc = "A top grade triphasic scanning module. These finely tuned scanning modules are usually reserved for vital systems like early warning defence radars against raiders and pirates. We decided to put it to better use."
+ item = /obj/item/stock_parts/scanning_module/triphasic
+
+ price_min = 400
+ price_max = 700
+ stock_min = 2
+ stock_max = 4
+ availability_prob = 20
+
+/datum/blackmarket_item/tech/t4_manip
+ name = "Femto Manipulator"
+ desc = "A top grade femto manipulator. These insanely precise manipuators are capable of manipulating particles up to a quadtillionth of a meter. Still not precise enough to find a single braincell in an NT exec's head though."
+ item = /obj/item/stock_parts/manipulator/femto
+
+ price_min = 400
+ price_max = 700
+ stock_min = 2
+ stock_max = 4
+ availability_prob = 20
+
+/datum/blackmarket_item/tech/t4_laser
+ name = "Quad-Ultra Microlaser"
+ desc = "A top grade quad-ultra microlaser. A bit too micro of a laser to actually kill anyone with, but more than enough to get the most out of your materials."
+ item = /obj/item/stock_parts/micro_laser/quadultra
+
+ price_min = 400
+ price_max = 700
+ stock_min = 2
+ stock_max = 4
+ availability_prob = 20
+
+/datum/blackmarket_item/tech/t4_bin
+ name = "Bluespace Matter Bin"
+ desc = "A top grade bluespace matter bin. Uses the power of bluespace to contain tons of matter without all the hassle of actually needing to carry literal tons with only a miniscule chance of ripping a hole in reality."
+ item = /obj/item/stock_parts/matter_bin/bluespace
+
+ price_min = 400
+ price_max = 700
+ stock_min = 2
+ stock_max = 4
+ availability_prob = 20
+
+/datum/blackmarket_item/tech/crew_monitor
+ name = "Crew Monitor Board"
+ desc = "A crew monitor computer board, for watching your hapless crew die in real time."
+ item = /obj/machinery/computer/crew
+
+ price_min = 750
+ price_max = 1250
+ stock_max = 3
+ availability_prob = 40
+
+/datum/blackmarket_item/tech/sec_cam
+ name = "Camera Console Board"
+ desc = "A camera console computer board, for when you want to invade your crew's privacy."
+ item = /obj/item/circuitboard/computer/security
+
+ price_min = 750
+ price_max = 1250
+ stock_max = 3
+ availability_prob = 40
+
+/datum/blackmarket_item/tech/emag_limited
+ name = "Limited Cryptographic Sequencer"
+ desc = "These cryptographic sequencers are perfect for bypassing any mechanical safties or just breaking shit in general. They're pretty old though, and will probably burn out after a single use. Do not keep in the same wallet as your credit card."
+ item = /obj/item/card/emag/limited
+
+ price_min = 750
+ price_max = 1500
+ stock_min = 2
+ stock_max = 7
+ availability_prob = 30
+
+/datum/blackmarket_item/tech/joywire
+ name = "Pleasure Vivifier Neural Implant"
+ desc = "Midi-Sim's ever popular pleasure vivifier implant promises a constant rush of dopamine to get you high on life."
+ item = /obj/item/organ/cyberimp/brain/joywire
+
+ price_min = 500
+ price_max = 1000
+ stock_min = 3
+ stock_max = 5
+ availability_prob = 50
+
+/datum/blackmarket_item/tech/joywire/spawn_item(loc)
+ if(prob(10))
+ var/obj/item/organ/cyberimp/brain/mindscrew/implant = ..()
+ implant.name = "\improper Midi-Sed pleasure vivifier"
+ implant.desc = "A widely popular (and addictive) implant produced by Miditeke-Sedari Tokoce that \
+ stimulates the brain's pleasure centers. \
+ Dramatically increases mood, but interferes with taste reception even if uninstalled. \
+ Its wires seem a little loose."
+ return new implant(loc)
+ return ..()
+
+/datum/blackmarket_item/tech/mindscrew
+ name = "MNDFCK Neural Implant"
+ desc = "Got a tough customer who refuses to crack? This aftermarket modification of the Midi-Sed pleasure vivifier will amplify their pain receptors and get them talking fast."
+ item = /obj/item/organ/cyberimp/brain/mindscrew
+
+ price_min = 500
+ price_max = 1500
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/tech/arm_gun
+ name = "Arm Mounted Laser Cannon Implant"
+ desc = "A retractable laser cannon that fits inside your arm for concealment. You won't be passing any metal detector scans though."
+ item = /obj/item/organ/cyberimp/arm/gun/laser
+
+ price_min = 2000
+ price_max = 4000
+ stock = 1
+ availability_prob = 15
+ spawn_weighting = FALSE
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index 384886ac30d..fabde1d0dfc 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -11,19 +11,19 @@
stock = 1
availability_prob = 20
-/datum/blackmarket_item/tool/syndi_toolbox
- name = "Syndicate Toolbox"
- desc = "A set of specialized tools, built to precision perfection and certified by the GEC."
- item = /obj/item/storage/toolbox/syndicate
+/datum/blackmarket_item/tool/surgery_duffel
+ name = "Cybersun Advanced Surgical Kit"
+ desc = "You might say it's morally wrong to steal. I say it's justified when it's Cybersun."
+ item = /obj/item/storage/backpack/duffelbag/syndie/surgery
- price_min = 500
- price_max = 2000
+ price_min = 2500
+ price_max = 5000
stock = 1
- availability_prob = 30
+ availability_prob = 25
/datum/blackmarket_item/tool/binoculars
name = "Binoculars"
- desc = "Increase your sight by 150% with this handy Tool!"
+ desc = "Twice as effective as a monocular for seeing across long distances."
item = /obj/item/binoculars
price_min = 50
@@ -32,6 +32,28 @@
stock_max = 4
availability_prob = 70
+/datum/blackmarket_item/tool/whetstone
+ name = "Whetstone"
+ desc = "Your blades not making the cut? This whetstone will give you the edge you need!"
+ item = /obj/item/sharpener
+
+ price_min = 100
+ price_max = 300
+ stock_min = 2
+ stock_max = 4
+ availability_prob = 50
+
+/datum/blackmarket_item/tool/cham_stamp
+ name = "Chameleon Stamp"
+ desc = "Can't find a forger? Look no further than these handy chameleon stamps, capable of replicating all manner of offical or government seals."
+ item = /obj/item/stamp/chameleon
+
+ price_min = 50
+ price_max = 200
+ stock_min = 2
+ stock_max = 4
+ availability_prob = 80
+
/datum/blackmarket_item/tool/riot_shield
name = "Riot Shield"
desc = "Protect yourself from an unexpected Riot at your local Police department!"
@@ -47,8 +69,8 @@
desc = "30u of Thermite to assist in creating a quick access point or get away!"
item = /obj/item/reagent_containers/glass/bottle/thermite
- price_min = 100
- price_max = 600
+ price_min = 75
+ price_max = 300
stock_max = 10
availability_prob = 50
@@ -58,7 +80,7 @@
item = /obj/item/reagent_containers/glass/chem_jug/thermite
price_min = 400
- price_max = 1500
+ price_max = 1200
stock_max = 3
availability_prob = 20
@@ -80,7 +102,8 @@
price_min = 1000
price_max = 3000
stock = 1
- availability_prob = 20
+ availability_prob = 10
+ spawn_weighting = FALSE
/datum/blackmarket_item/tool/jumpboots
name = "Jump Boots"
@@ -101,16 +124,7 @@
price_max = 2000
stock_max = 3
availability_prob = 30
-
-/datum/blackmarket_item/tool/chem_master
- name = "Chem Master Board"
- desc = "A Chem Master board, capable of seperating and packaging reagents. Perfect for any aspiring at home chemist."
- item = /obj/item/circuitboard/machine/chem_master
-
- price_min = 1000
- price_max = 3000
- stock = 1
- availability_prob = 30
+ spawn_weighting = FALSE
/datum/blackmarket_item/tool/rcd
name = "Rapid Construction Device"
@@ -125,10 +139,10 @@
/datum/blackmarket_item/tool/suppressor
name = "Suppressor"
desc = "A suppressor, for when you to keep your murder on the down low."
- item = /obj/item/suppressor
+ item = /obj/item/attachment/silencer
price_min = 100
- price_max = 700
+ price_max = 300
stock_min = 3
stock_max = 6
availability_prob = 60
@@ -148,28 +162,19 @@
desc = "A lovingly handcrafted jetpack built by our salvage techs. For the frugal space explorer."
item = /obj/item/tank/jetpack/improvised
- price_min = 500
- price_max = 1000
+ price_min = 100
+ price_max = 500
stock_min = 3
stock_max = 6
availability_prob = 70
-/datum/blackmarket_item/tool/jet_harness
- name = "Jet Harness"
- desc = "A compact oxygen filled jet harness for tactical EVA insertions and extractions."
- item = /obj/item/tank/jetpack/oxygen/harness
-
- price_min = 1250
- price_max = 3500
- stock_max = 3
- availability_prob = 30
-
/datum/blackmarket_item/tool/jetpack_upgrade
name = "Hardsuit Jetpack Upgrade"
desc = "A modular jetpack compatible with most hardsuits. If the screws feel a bit loose, it's because the last suit it was attached to was beyond recovery."
item = /obj/item/tank/jetpack/suit
- price_min = 1750
+ price_min = 1250
price_max = 3000
- stock = 1
+ stock_min = 1
+ stock_max = 3
availability_prob = 25
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 6ac8b8d36d8..d14bc026401 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -12,23 +12,10 @@
stock_max = 7
availability_prob = 40
-/datum/blackmarket_item/weapon/shotgun_dart
- name = "Shotgun Dart"
- desc = "These handy darts can be filled up with any chemical and be shot with a shotgun! \
- Prank your friends by shooting them with laughter! \
- Not recommended for comercial use."
- item = /obj/item/ammo_casing/shotgun/dart
-
- price_min = 10
- price_max = 50
- stock_min = 10
- stock_max = 60
- availability_prob = 40
-
/datum/blackmarket_item/weapon/bone_spear
name = "Bone Spear"
desc = "Authentic tribal spear, made from real bones! A steal at any price, especially if you're a caveman."
- item = /obj/item/spear/bonespear
+ item = /obj/item/melee/spear/bone
price_min = 200
price_max = 300
@@ -38,13 +25,42 @@
/datum/blackmarket_item/weapon/switchblade
name = "Switchblade"
desc = "Extra shrap switchblades for intimidation AND style. Bandages not included if you cut yourself."
- item = /obj/item/kitchen/knife/switchblade
+ item = /obj/item/melee/knife/switchblade
price_min = 500
price_max = 700
stock_max = 3
availability_prob = 50
+/datum/blackmarket_item/weapon/fireaxe
+ name = "Fire Axe"
+ desc = "An incredibly sharp axe of reputable make, used by various engineers to settle arguments while hammered. Sold to us by a very friendly man in a suit."
+ item = /obj/item/melee/axe/fire
+
+ price_min = 1200
+ price_max = 2300
+ stock_max = 3
+ availability_prob = 40
+
+/datum/blackmarket_item/weapon/sledgehammer
+ name = "Breaching Sledgehammer"
+ desc = "A Clique outfit had to ditch a lot of equipment to evade a Gezenan assault. This little piece breaks legs and walls like no other. You want in?"
+ item = /obj/item/melee/axe/sledgehammer
+
+ price_min = 2000
+ price_max = 3000
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/weapon/powerfist
+ name = "Powerfist"
+ desc = "Need a bit more... omph in your right hook? This gas operated powerfist will put you in the heavyweight."
+ item = /obj/item/melee/powerfist
+ price_min = 1500
+ price_max = 4000
+ stock_max = 2
+ availability_prob = 50
+
/datum/blackmarket_item/weapon/sabre
name = "SUNS Dueling Sabre"
desc = "A mastercrafted sabre formerly wielded by a SUNS academic. It's very sharp, we had to spend hours stitching our fingers back on after getting it."
@@ -55,12 +71,24 @@
stock = 1
availability_prob = 25
+/datum/blackmarket_item/weapon/mag_cleaver
+ name = "Magnetic Cleaver"
+ desc = "A prototype modification to the standard crusher, featuring an energy blade rather than the standard alloy cutting edge allowing for much more devasting detonations. The guy who sold this to us disappeared the next week, but that's probably a coincidence."
+ item = /obj/item/kinetic_crusher/syndie_crusher
+
+ price_min = 1750
+ price_max = 3000
+ stock = 2
+ availability_prob = 15
+ spawn_weighting = FALSE
+
/datum/blackmarket_item/weapon/derringer
name = "Derringer"
desc = "A concealable handgun small enough to hide nearly anywhere. Uses .38 revolver rounds."
item = /obj/item/gun/ballistic/derringer
+
price_min = 100
- price_max = 500
+ price_max = 300
stock_max = 6
availability_prob = 50
@@ -68,40 +96,53 @@
name = "Golden Derringer"
desc = "Rumored to have been once used by a famous assassin who never missed a shot. Unlike the legends, however, this uses regular rounds as opposed to custom, golden ones."
item = /obj/item/gun/ballistic/derringer/gold
+
price_min = 1000
price_max = 3000
stock = 1
availability_prob = 10
+ spawn_weighting = FALSE
+
+/datum/blackmarket_item/weapon/syndi_derringer
+ name = ".357 Derringer"
+ desc = "A concealable hangun with a tasteful red and black paintjob, which makes it slightly more noticable. Chambered in .357, so you actually have a chance at killing something."
+ item = /obj/item/gun/ballistic/derringer/traitor
+ pair_item = list(/datum/blackmarket_item/ammo/a357_box)
+
+ price_min = 300
+ price_max = 800
+ stock = 2
+ availability_prob = 30
+
+/datum/blackmarket_item/weapon/disposable_gun_disk
+ name = "Disposable Gun Design Disk"
+ desc = "An autolathe compatible fabrication disk for printing disposable guns chambered in .22 LR. Improper disposal or recycling of these guns is an enviromental felony misdemeanor in Solarian space. Luckily, we aren't in Solarian space, so litter all you want."
+ item = /obj/item/disk/design_disk/disposable_gun
+
+ price_min = 1500
+ price_max = 2500
+ stock = 1
+ availability_prob = 10
+ spawn_weighting = FALSE
/datum/blackmarket_item/weapon/himehabu
name = "Himehabu Pistol"
desc = "Great things come in small packages. The Himehabu is perfect for all your espionage needs. Chambered in .22lr."
item = /obj/item/gun/ballistic/automatic/pistol/himehabu
- pair_item = /datum/blackmarket_item/weapon/himehabu_mag
+ pair_item = list(/datum/blackmarket_item/ammo/himehabu_mag)
price_min = 100
price_max = 600
stock_max = 6
availability_prob = 50
-/datum/blackmarket_item/weapon/himehabu_mag
- name = "Himehabu Magazines"
- desc = "Compact 10 round .22lr magazines for use in the Himehabu pistol."
- item = /obj/item/ammo_box/magazine/m22lr
-
- price_min = 100
- price_max = 200
- stock_min = 3
- stock_max = 6
- availability_prob = 0
-
/datum/blackmarket_item/weapon/e10
name = "E-10 Laser Pistol"
desc = "Sharplite letting you down? Try these classic Eoehoma Firearms E-10 Laser Pistols."
item = /obj/item/gun/energy/laser/e10
price_min = 500
- price_max = 1250
+ price_max = 1000
stock_max = 5
availability_prob = 20
@@ -119,55 +160,80 @@
name = "E-40 Hybrid Assault Rifle"
desc = "A dual mode hybrid assault rifle made by the now defunct Eoehoma Firearms. Capable of firing both bullets AND lasers, for the discerning dealer in death. Chambered in Eoehoma .299 Caseless."
item = /obj/item/gun/ballistic/automatic/assault/e40
- pair_item = /datum/blackmarket_item/weapon/e40_mag
+ pair_item = list(/datum/blackmarket_item/ammo/e40_mag)
price_min = 7000
- price_max = 15000
+ price_max = 10000
stock_max = 2
- availability_prob = 20
-
-/datum/blackmarket_item/weapon/e40_mag
- name = "Eoehoma .299 Caseless Magazine"
- desc = "A 30 round magazine for the E-40 Hybrid Rifle."
- item = /obj/item/ammo_box/magazine/e40
-
- price_min = 750
- price_max = 1250
- stock_min = 2
- stock_max = 6
- availability_prob = 0
+ availability_prob = 10
+ spawn_weighting = FALSE
/datum/blackmarket_item/weapon/e50
name = "E-50 Energy Emitter"
desc = "An Eoehoma Firearms E-50 Emitter cannon. For when you want a send a message. A really big message."
item = /obj/item/gun/energy/laser/e50
+ pair_item = (/datum/blackmarket_item/ammo/huge_weapon_cell)
price_min = 4000
price_max = 7000
stock_max = 2
availability_prob = 20
+ spawn_weighting = FALSE
+
+/datum/blackmarket_item/weapon/e60
+ name = "E-60 Disabler"
+ desc = "Looking for a live capture? This Eoehoma Firearms E-60 disabler will get your man."
+ item = /obj/item/gun/energy/disabler/e60
+
+ price_min = 500
+ price_max = 750
+ stock_max = 3
+ availability_prob = 40
+
+/datum/blackmarket_item/weapon/cm23
+ name = "CM-23 pistol"
+ desc = "The service pistol of the Confederated League. Chambered in 10mm and fresh off a crashed clipper. We made sure to scratch the ID off this time."
+
+ item = /obj/item/gun/ballistic/automatic/pistol/cm23
+ pair_item = list(/datum/blackmarket_item/ammo/cm23_mag)
+ price_min = 500
+ price_max = 1500
+ stock_max = 4
+ availability_prob = 50
+
+/datum/blackmarket_item/weapon/cm70
+ name = "CM-70 Machine Pistol"
+ desc = "One slick piece from the Confederated League. Chambered in 9mm. That officer wasn't happy to lose this but you should be safe."
+
+ item = /obj/item/gun/ballistic/automatic/pistol/cm70
+ pair_item = list(/datum/blackmarket_item/ammo/cm70_mag)
+ price_min = 900
+ price_max = 2100
+ stock_max = 2
+ availability_prob = 50
+
+/datum/blackmarket_item/weapon/cm5
+ name = "CM-5 SMG"
+ desc = "Now isn't this a good find. A whole League sub-machinegun, chambered in 9mm. We're pretty sure no one is gonna notice the pallet of these missing."
+
+ item = /obj/item/gun/ballistic/automatic/smg/cm5
+ pair_item = list(/datum/blackmarket_item/ammo/cm5_mag)
+ price_min = 1750
+ price_max = 3500
+ stock_max = 2
+ availability_prob = 30
/datum/blackmarket_item/weapon/saber_smg
name = "Saber 9mm SMG"
desc = "A prototype 9mm submachine gun. Most of these never got past the RND phase and into distribution. But we happen know a guy."
- item = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto
- pair_item = /datum/blackmarket_item/weapon/saber_mag
+ item = /obj/item/gun/ballistic/automatic/smg/skm_carbine/saber
+ pair_item = list(/datum/blackmarket_item/ammo/saber_mag)
- price_min = 2500
- price_max = 4200
+ price_min = 2250
+ price_max = 3750
stock_max = 2
availability_prob = 25
-/datum/blackmarket_item/weapon/saber_mag
- name = "Saber 9mm SMG Magazines"
- desc = "Magazines for use in the Saber 9mm SMG. No, they don't work as swords."
- item = /obj/item/ammo_box/magazine/smgm9mm
-
- price_min = 500
- price_max = 1000
- stock = 2
- availability_prob = 0
-
/datum/blackmarket_item/weapon/bg_16
name = "BG-16 Beam Gun"
desc = "Not satisfied by Etherbor's civilian offerings? Try this military grade one we found!"
@@ -178,27 +244,28 @@
stock = 2
availability_prob = 20
+/datum/blackmarket_item/weapon/larker
+ name = "Model 13 \"Larker\""
+ desc = "Gotta deal for you broski. We got this mod of those shoddy Sporter Rifles an' you can buy one, or two, orreven three if yer int' that."
+ item = /obj/item/storage/guncase/m13
+
+ price_min = 500
+ price_max = 1200
+ stock_min = 3
+ stock_max = 5
+ availability_prob = 40
+
/datum/blackmarket_item/weapon/sawn_illestren
name = "Sawn off Illestren Rifle"
desc = "We had to saw down the barrels on these to fit them in the smuggling compartment. They don't aim too good, but it still packs a good punch."
item = /obj/item/gun/ballistic/rifle/illestren/sawn
price_min = 600
- price_max = 1250
+ price_max = 1000
stock_min = 2
stock_max = 5
availability_prob = 60
-/datum/blackmarket_item/weapon/combat_shotgun
- name = "Combat Shotgun"
- desc = "Are your arms tired from pumping Hunter's Pride shotguns? This semi-automatic combat shotgun will make killing a breeze."
- item = /obj/item/gun/ballistic/shotgun/automatic/combat
-
- price_min = 2000
- price_max = 4000
- stock_max = 3
- availability_prob = 40
-
/datum/blackmarket_item/weapon/mecha_weapon_bay
name = "Concealed Weapons Bay"
desc = "Ripley with a laser cannon? Odysseus with a missile rack? Sky's the limit with this omni-compatible weapons bay! (Missiles and lasers not included)"
@@ -207,7 +274,8 @@
price_min = 1000
price_max = 2000
stock_max = 3
- availability_prob = 30
+ availability_prob = 20
+ spawn_weighting = FALSE
/datum/blackmarket_item/weapon/mecha_syringe_gun
name = "Mounted Syringe Gun"
@@ -217,35 +285,25 @@
price_min = 5000
price_max = 7000
stock = 1
- availability_prob = 15
+ availability_prob = 10
+ spawn_weighting = FALSE
/datum/blackmarket_item/weapon/mecha_hades
name = "Mounted FNX-99 Carbine"
- desc = "This so called \"Hades\" carbine is sure to burn brightly above the competition! Not to be confused with the \"Hades\" energy rifle. Exosuit not included."
+ desc = "This so called \"Phoenix\" carbine is sure to burn brightly above the competition! Exosuit not included."
item = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
- pair_item = /datum/blackmarket_item/weapon/mecha_hades_ammo
+ pair_item = list(/datum/blackmarket_item/ammo/mecha_hades_ammo)
price_min = 2000
price_max = 3000
stock_max = 2
availability_prob = 25
-/datum/blackmarket_item/weapon/mecha_hades_ammo
- name = "FNX-99 Incediary Ammo"
- desc = "A box of 24 incendiary shells for the FNX-99 mounted carbine."
- item = /obj/item/mecha_ammo/incendiary
-
- price_min = 250
- price_max = 350
- stock_min = 3
- stock_max = 5
- availability_prob = 0
-
/datum/blackmarket_item/weapon/model_h
name = "Model H"
desc = "A Model H slug pistol. The H stands for Hurt. Chambered in ferromagnetic slugs."
item = /obj/item/gun/ballistic/automatic/powered/gauss/modelh
- pair_item = /datum/blackmarket_item/weapon/model_h_mag
+ pair_item = list(/datum/blackmarket_item/ammo/model_h_mag)
price_min = 2000
price_max = 3500
@@ -257,122 +315,135 @@
/obj/item/gun/ballistic/automatic/powered/gauss/modelh))
return new model_h(loc)
-/datum/blackmarket_item/weapon/model_h_mag
- name = "Model H Magazine"
- desc = "A 10 round magazine for Model H slug pistol."
- item = /obj/item/ammo_box/magazine/modelh
-
- price_min = 500
- price_max = 1000
- stock_max = 4
- availability_prob = 0
-
/datum/blackmarket_item/weapon/sgg
name = "SSG-669C Rotary Sniper Rifle"
- desc = "I could tell you it's full name, but we'd be here all day. It's a sniper rifle. It shoots people from far away. Chambered in 8x58mm."
+ desc = "I could tell you it's full name, but we'd be here all day. It's a sniper rifle. It shoots people from far away. Chambered in 8x58mm caseless."
item = /obj/item/gun/ballistic/rifle/solgov
- pair_item = /datum/blackmarket_item/weapon/sgg_stripper
+ pair_item = list(/datum/blackmarket_item/ammo/sgg_stripper)
price_min = 3000
price_max = 6000
stock = 1
availability_prob = 20
-/datum/blackmarket_item/weapon/sgg_stripper
- name = "8x58mm Stripper Clip"
- desc = "A five round 8x58mm stripper clip for use with the SGG-669C."
- item = /obj/item/ammo_box/a858
-
- price_min = 500
- price_max = 1000
- stock_min = 4
- stock_max = 6
- availability_prob = 0
-
/datum/blackmarket_item/weapon/pistole_c
name = "Pistole C"
desc = "Pistole Compact? Pistole Caseless? Pistole Cheese? Fuck if I know. All I know is these little numbers pack a nasty sting. Chambered in 5.56 caseless."
item = /obj/item/gun/ballistic/automatic/pistol/solgov/old
- pair_item = /datum/blackmarket_item/weapon/pistole_c_mag
+ pair_item = list(/datum/blackmarket_item/ammo/pistole_c_mag)
price_min = 900
price_max = 1250
stock_max = 3
availability_prob = 30
-/datum/blackmarket_item/weapon/pistole_c_mag
- name = "5.56 Caseless Magazine"
- desc = "A 12 round magazine for the Pistole Cheese."
- item = /obj/item/ammo_box/magazine/pistol556mm
-
- price_min = 250
- price_max = 750
- stock_max = 2
- availability_prob = 0
-
/datum/blackmarket_item/weapon/proto_gauss
name = "Prototype Gauss Rifle"
desc = "A prototype gauss rifle made by Nanotrasen. Perfect for making swiss cheese out of people. Chambered in ferromagnetic pellets."
item = /obj/item/gun/ballistic/automatic/powered/gauss
- pair_item = /datum/blackmarket_item/weapon/proto_gauss_mag
+ pair_item = list(/datum/blackmarket_item/ammo/proto_gauss_mag)
- price_min = 3500
- price_max = 6000
+ price_min = 2500
+ price_max = 4000
stock = 2
availability_prob = 25
-/datum/blackmarket_item/weapon/proto_gauss_mag
- name = "Prototype Gauss Rifle Magazine"
- desc = "A 25 round ferromagnetic pellet magazine for the prototype gauss rifle."
- item = /obj/item/ammo_box/magazine/gauss
+/datum/blackmarket_item/weapon/syringe_gun
+ name = "Dart Pistol"
+ desc = "A compact dart pistol, for clandestine poisoining from a distance."
+ item = /obj/item/gun/syringe/syndicate
- price_min = 600
- price_max = 1100
- stock_min = 2
- stock_max = 4
- availability_prob = 0
+ price_min = 750
+ price_max = 1500
+ stock = 2
+ availability_prob = 30
+
+/datum/blackmarket_item/weapon/mauler
+ name = "Mauler Machine Pistol"
+ desc = "This gun's got teeth! Twelve 9mm teeth to be exact. Hardly a full smile, and you'll be losing the rest pretty quick with this thing's rate of fire."
+ item = /obj/item/gun/ballistic/automatic/pistol/mauler
+ pair_item = list(/datum/blackmarket_item/ammo/mauler_mag)
+
+ price_min = 1000
+ price_max = 2000
+ stock_max = 3
+ availability_prob = 50
-/datum/blackmarket_item/weapon/tec
- name = "TEC-9 Machine Pistol"
- desc = "Hallelujah! It's raining lead! This 9mm machine pistol is capable of spitting out bullets at rapid pace."
- item = /obj/item/gun/ballistic/automatic/pistol/tec9
- pair_item = /datum/blackmarket_item/weapon/tec_mag
+/datum/blackmarket_item/weapon/spitter
+ name = "Spitter Submachine Gun"
+ desc = "The aptly named Spitter won't be hitting anything outside of spitting distance. Anything in that range on the otherhand? Let's just say the bereaved will be wanting a closed casket funeral. Chambered in 9mm."
+ item = /obj/item/gun/ballistic/automatic/pistol/spitter
+ pair_item = list(/datum/blackmarket_item/ammo/spitter_mag)
price_min = 1500
- price_max = 2750
+ price_max = 2250
+ stock_min = 1
stock_max = 2
+ availability_prob = 30
+
+/datum/blackmarket_item/weapon/pounder
+ name = "Pounder Submachine Gun"
+ desc = "There's a certain quality to quantity. With a massive 50 round capacity, this .22lr submachine is capable of laying down an jawdropping amount of fire."
+ item = /obj/item/gun/ballistic/automatic/smg/pounder
+ pair_item = list(/datum/blackmarket_item/ammo/pounder_mag)
+
+ price_min = 1500
+ price_max = 2000
+ stock = 1
availability_prob = 35
-/datum/blackmarket_item/weapon/tec_mag
- name = "TEC-9 AP Magazine"
- desc = "A 20 round magazine of AP ammo for the TEC-9 machine pistol."
- item = /obj/item/ammo_box/magazine/tec9
+/datum/blackmarket_item/weapon/polymer
+ name = "Polymer Survivor Rifle"
+ desc = "A slapdash rifle held together by spite, dreams and a good helping of duct tape. Chambered in 7.62x40mm CLIP."
+ item = /obj/item/gun/ballistic/rifle/polymer
+ pair_item = list(/datum/blackmarket_item/ammo/polymer_clip)
price_min = 600
- price_max = 1000
- stock_max = 2
- availability_prob = 0
+ price_max = 1250
+ stock_min = 2
+ stock_max = 4
+ availability_prob = 50
-/datum/blackmarket_item/weapon/scout
- name = "HP Scout"
- desc = "A scoped rifle chambered in .300 Magnum. As the name would imply, perfect for scouts. Try not to tunnel vision with the scope like the last guy."
- item = /obj/item/gun/ballistic/rifle/scout
- pair_item = /datum/blackmarket_item/weapon/scout_stripper
+/datum/blackmarket_item/weapon/skm_carbine
+ name = "SKM-24v Carbine"
+ desc = "Technically this is just a sawn down SKM-24 assault rifle, but what's CLIP going to do? Sue us? Chambered in 4.6x30mm."
+ item = /obj/item/gun/ballistic/automatic/smg/skm_carbine
+ pair_item = list(/datum/blackmarket_item/ammo/carbine_mag)
- price_min = 4000
- price_max = 6500
- stock = 1
+ price_min = 3000
+ price_max = 4500
+ stock_max = 2
availability_prob = 20
-/datum/blackmarket_item/weapon/scout_stripper
- name = ".300 Magnum Stripper Clip"
- desc = "A 5 round .300 Magnum stripper clips for use with the HP Scout."
- item = /obj/item/ammo_box/a300
+/datum/blackmarket_item/weapon/oneshot
+ name = "Hammer Launcher"
+ desc = "A one-shot solution to a myriad amount of problems, ranging from Exosuits to obnoxious neighbors. Contains one ready-to-fire 84mm HE rocket. "
+ item = /obj/item/gun/ballistic/rocketlauncher/oneshot
- price_min = 500
- price_max = 1000
- stock_min = 4
- stock_max = 6
- availability_prob = 0
+ price_min = 3000
+ price_max = 4500
+ stock_min = 1
+ stock_max = 5
+ availability_prob = 25
+/datum/blackmarket_item/weapon/oneshot/hedp
+ name = "Hammer-DP Launcher"
+ desc = "A one-shot solution to a myriad amount of problems, ranging from Exosuits to obnoxious neighbors. Contains one ready-to-fire 84mm HEDP rocket. "
+ item = /obj/item/gun/ballistic/rocketlauncher/oneshot/hedp
+ price_min = 4000
+ price_max = 6000
+ stock_min = 1
+ stock_max = 5
+ availability_prob = 10
+
+/datum/blackmarket_item/weapon/skm_lmg
+ name = "SKM-24u Light Machinegun"
+ desc = "Your regular rifles not have enough oomph for you? This SKM-24 was converted with help from a 'liberated' CM-40 parts shipment into a light machinegun, ready to blow away whatever you point it at. Increased firerate makes it buck like a mule, so keep that bipod on the ground. Drums sold separately!"
+ item = /obj/item/gun/ballistic/automatic/hmg/skm_lmg
+
+ price_min = 5000
+ price_max = 7000
+ stock_max = 2
+ availability_prob = 15
+ spawn_weighting = FALSE
diff --git a/code/modules/cargo/blackmarket/blackmarket_market.dm b/code/modules/cargo/blackmarket/blackmarket_market.dm
index 3e055048a85..5b0c2365b3d 100644
--- a/code/modules/cargo/blackmarket/blackmarket_market.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_market.dm
@@ -12,11 +12,37 @@
/// Item categories available from this market, only items which are in these categories can be gotten from this market.
var/list/categories = list()
+/datum/blackmarket_market/New()
+ . = ..()
+ addtimer(CALLBACK(src, PROC_REF(cycle_stock)), 60 MINUTES, TIMER_STOPPABLE|TIMER_LOOP|TIMER_DELETE_ME)
+
+/datum/blackmarket_market/proc/cycle_stock()
+ var/list/pair_items_to_handle = list()
+
+ for(var/category in available_items)
+ for(var/item in available_items[category])
+ if(istype(item, /datum/blackmarket_item))
+ var/datum/blackmarket_item/b_item = item
+ b_item.cycle()
+ if(b_item.available == TRUE)
+ for(var/paired_item in b_item.pair_item)
+ var/datum/blackmarket_item/item_to_set = get_item_in_market(paired_item)
+ if(!(item_to_set in pair_items_to_handle) && !isnull(item_to_set))
+ pair_items_to_handle += item_to_set
+
+ for(var/item in pair_items_to_handle)
+ var/datum/blackmarket_item/b_item = item
+ b_item.cycle(TRUE,FALSE,FALSE,TRUE)
+
+// returns the blackmarket_item datum currently in the availible items list. Null if not in the list
+/datum/blackmarket_market/proc/get_item_in_market(datum/blackmarket_item/item)
+ for(var/item_to_find in available_items[item.category])
+ if(istype(item_to_find,item))
+ return item_to_find
+ return null
+
/// Adds item to the available items and add it's category if it is not in categories yet.
/datum/blackmarket_market/proc/add_item(datum/blackmarket_item/item, paired)
- if(!prob(initial(item.availability_prob)) && !paired)
- return FALSE
-
if(ispath(item))
item = new item()
@@ -26,8 +52,10 @@
available_items[item.category] += item
- if(item.pair_item)
- add_item(item.pair_item, TRUE)
+ if(prob(initial(item.availability_prob)) || paired)
+ item.available = TRUE
+ else
+ item.available = FALSE
return TRUE
@@ -52,5 +80,6 @@
/datum/blackmarket_market/blackmarket
name = "Black Market"
- shipping = list(SHIPPING_METHOD_LTSRBT =50,
- SHIPPING_METHOD_LAUNCH =10)
+ shipping = list(SHIPPING_METHOD_LTSRBT =100,
+ SHIPPING_METHOD_LAUNCH =10,
+ SHIPPING_METHOD_DEAD_DROP = 20)
diff --git a/code/modules/cargo/blackmarket/blackmarket_telepad.dm b/code/modules/cargo/blackmarket/blackmarket_telepad.dm
index 14211cad687..bd8ec96e80b 100644
--- a/code/modules/cargo/blackmarket/blackmarket_telepad.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_telepad.dm
@@ -3,11 +3,8 @@
icon_state = "bluespacearray"
build_path = /obj/machinery/ltsrbt
req_components = list(
- /obj/item/stack/ore/bluespace_crystal = 2,
- /obj/item/stock_parts/subspace/ansible = 1,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/scanning_module = 2)
- def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial)
/obj/machinery/ltsrbt
name = "Long-To-Short-Range-Bluespace-Transciever"
@@ -121,3 +118,17 @@
if(queue.len)
recieving = pick_n_take(queue)
+
+/datum/crafting_recipe/blackmarket_telepad
+ name = "Black Market LTRSBT Board"
+ result = /obj/item/circuitboard/machine/ltsrbt
+ time = 30
+ tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER, TOOL_MULTITOOL)
+ reqs = list(
+ /obj/item/stack/ore/bluespace_crystal = 2,
+ /obj/item/stack/tape/industrial = 5,
+ /obj/item/card/bank = 1,
+ /obj/item/computer_hardware/network_card = 1,
+ /obj/item/circuitboard = 1
+ )
+ category = CAT_MISC
diff --git a/code/modules/cargo/blackmarket/blackmarket_uplink.dm b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
index 26363bf71b8..2d25c9c444f 100644
--- a/code/modules/cargo/blackmarket/blackmarket_uplink.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
@@ -82,13 +82,14 @@
if(viewing_category && market)
if(market.available_items[viewing_category])
for(var/datum/blackmarket_item/I in market.available_items[viewing_category])
- data["items"] += list(list(
- "id" = I.type,
- "name" = I.name,
- "cost" = I.price,
- "amount" = I.unlimited ? "INF" : I.stock,
- "desc" = I.desc || I.name
- ))
+ if(I.available)
+ data["items"] += list(list(
+ "id" = I.type,
+ "name" = I.name,
+ "cost" = I.price,
+ "amount" = I.unlimited ? "INF" : I.stock,
+ "desc" = I.desc || I.name
+ ))
return data
/obj/item/blackmarket_uplink/ui_static_data(mob/user)
diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm
index 3ddc15dfa33..37507132a86 100644
--- a/code/modules/cargo/bounties/assistant.dm
+++ b/code/modules/cargo/bounties/assistant.dm
@@ -15,7 +15,7 @@
name = "Skateboard"
description = "Nanotrasen has determined walking to be wasteful. Ship a skateboard to CentCom to speed operations up."
reward = 900 // the tony hawk
- wanted_types = list(/obj/vehicle/ridden/scooter/skateboard, /obj/item/melee/skateboard)
+ wanted_types = list(/obj/vehicle/ridden/scooter/skateboard, /obj/item/skateboard)
/datum/bounty/item/assistant/stunprod
name = "Stunprod"
@@ -35,7 +35,7 @@
description = "CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears."
reward = 2000
required_count = 5
- wanted_types = list(/obj/item/spear)
+ wanted_types = list(/obj/item/melee/spear)
/datum/bounty/item/assistant/toolbox
name = "Toolboxes"
diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm
index d0e946ba2a6..969a41601fb 100644
--- a/code/modules/cargo/bounties/chef.dm
+++ b/code/modules/cargo/bounties/chef.dm
@@ -2,7 +2,7 @@
name = "Birthday Cake"
description = "Nanotrasen's birthday is coming up! Ship them a birthday cake to celebrate!"
reward = 4000
- wanted_types = list(/obj/item/reagent_containers/food/snacks/store/cake/birthday, /obj/item/reagent_containers/food/snacks/cakeslice/birthday)
+ wanted_types = list(/obj/item/food/cake/birthday, /obj/item/food/cakeslice/birthday)
/datum/bounty/item/chef/soup
name = "Soup"
@@ -43,7 +43,7 @@
name = "Bread"
description = "Problems with central planning have led to bread prices skyrocketing. Ship some bread to ease tensions."
reward = 1000
- wanted_types = list(/obj/item/reagent_containers/food/snacks/store/bread, /obj/item/reagent_containers/food/snacks/breadslice, /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/pizzabread, /obj/item/reagent_containers/food/snacks/rawpastrybase)
+ wanted_types = list(/obj/item/food/bread, /obj/item/food/breadslice, /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/pizzabread, /obj/item/reagent_containers/food/snacks/rawpastrybase)
/datum/bounty/item/chef/pie
name = "Pie"
diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm
index d4832a460fb..4c42d312ece 100644
--- a/code/modules/cargo/bounties/engineering.dm
+++ b/code/modules/cargo/bounties/engineering.dm
@@ -4,7 +4,7 @@
reward = 7500
wanted_types = list(/obj/item/tank)
var/moles_required = 20 // A full tank is 28 moles, but CentCom ignores that fact.
- var/gas_type = GAS_PLUOXIUM
+ var/gas_type = GAS_O3
/datum/bounty/item/engineering/gas/applies_to(obj/O)
if(!..())
@@ -12,11 +12,6 @@
var/obj/item/tank/T = O
return T.air_contents.get_moles(gas_type) >= moles_required
-/datum/bounty/item/engineering/gas/nitryl_tank
- name = "Full Tank of Nitryl"
- description = "The non-human staff of Station 88 has been volunteered to test performance enhancing drugs. Ship them a tank full of Nitryl so they can get started."
- gas_type = GAS_NITRYL
-
/datum/bounty/item/engineering/gas/freon_tank
name = "Full Tank of Freon"
description = "The Supermatter of station 33 has started the delamination process. Deliver a tank of Freon gas to help them stop it!"
diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm
index 4eb48b09c7c..6527228f31e 100644
--- a/code/modules/cargo/bounties/mining.dm
+++ b/code/modules/cargo/bounties/mining.dm
@@ -22,7 +22,7 @@
name = "Bone Axe"
description = "Station 12 has had their fire axes stolen by marauding clowns. Ship them a bone axe as a replacement."
reward = 7500
- wanted_types = list(/obj/item/fireaxe/boneaxe)
+ wanted_types = list(/obj/item/melee/axe/bone)
/datum/bounty/item/mining/bone_armor
name = "Bone Armor"
@@ -48,7 +48,7 @@
description = "Central Command's canteen is undergoing budget cuts. Ship over some bone daggers so our Chef can keep working."
reward = 5000
required_count = 3
- wanted_types = list(/obj/item/kitchen/knife/combat/bone)
+ wanted_types = list(/obj/item/melee/knife/bone)
/datum/bounty/item/mining/polypore_mushroom
name = "Mushroom Bowl"
diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm
index 0849efb6ede..18fc501da94 100644
--- a/code/modules/cargo/bounties/science.dm
+++ b/code/modules/cargo/bounties/science.dm
@@ -28,13 +28,6 @@
reward = 10000
wanted_types = list(/obj/item/clothing/glasses/night, /obj/item/clothing/glasses/meson/night, /obj/item/clothing/glasses/hud/health/night, /obj/item/clothing/glasses/hud/security/night, /obj/item/clothing/glasses/hud/diagnostic/night)
-/datum/bounty/item/science/experimental_welding_tool
- name = "Experimental Welding Tool"
- description = "A recent accident has left most of CentCom's welding tools exploded. Ship replacements to be rewarded."
- reward = 10000
- required_count = 3
- wanted_types = list(/obj/item/weldingtool/experimental)
-
/datum/bounty/item/science/cryostasis_beaker
name = "Cryostasis Beaker"
description = "Chemists at Central Command have discovered a new chemical that can only be held in cryostasis beakers. The only problem is they don't have any! Rectify this to receive payment."
diff --git a/code/modules/cargo/bounties/slime.dm b/code/modules/cargo/bounties/slime.dm
deleted file mode 100644
index 4aa0797c700..00000000000
--- a/code/modules/cargo/bounties/slime.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-/datum/bounty/item/slime
- reward = 3000
-
-/datum/bounty/item/slime/New()
- ..()
- description = "Nanotrasen's science lead is hunting for the rare and exotic [name]. A bounty has been offered for finding it."
- reward += rand(0, 4) * 500
-
-/datum/bounty/item/slime/green
- name = "Green Slime Extract"
- wanted_types = list(/obj/item/slime_extract/green)
-
-/datum/bounty/item/slime/pink
- name = "Pink Slime Extract"
- wanted_types = list(/obj/item/slime_extract/pink)
-
-/datum/bounty/item/slime/gold
- name = "Gold Slime Extract"
- wanted_types = list(/obj/item/slime_extract/gold)
-
-/datum/bounty/item/slime/oil
- name = "Oil Slime Extract"
- wanted_types = list(/obj/item/slime_extract/oil)
-
-/datum/bounty/item/slime/black
- name = "Black Slime Extract"
- wanted_types = list(/obj/item/slime_extract/black)
-
-/datum/bounty/item/slime/lightpink
- name = "Light Pink Slime Extract"
- wanted_types = list(/obj/item/slime_extract/lightpink)
-
-/datum/bounty/item/slime/adamantine
- name = "Adamantine Slime Extract"
- wanted_types = list(/obj/item/slime_extract/adamantine)
-
-/datum/bounty/item/slime/rainbow
- name = "Rainbow Slime Extract"
- wanted_types = list(/obj/item/slime_extract/rainbow)
diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm
index 3807e9bd698..ddc07ddab61 100644
--- a/code/modules/cargo/bounty.dm
+++ b/code/modules/cargo/bounty.dm
@@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
// Called when the claim button is clicked. Override to provide fancy rewards.
/datum/bounty/proc/claim(datum/bank_account/claimer_account)
if(can_claim() && claimer_account)
- claimer_account.adjust_money(reward, "bounty")
+ claimer_account.adjust_money(reward, CREDIT_LOG_BOUNTY)
claimed = TRUE
// If an item sent in the cargo shuttle can satisfy the bounty.
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
// Returns a new bounty of random type, but does not add it to GLOB.bounties_list.
/proc/random_bounty()
- switch(rand(1, 13))
+ switch(rand(1, 12))
if(1)
var/subtype = pick(subtypesof(/datum/bounty/item/assistant))
return new subtype
@@ -103,18 +103,15 @@ GLOBAL_LIST_EMPTY(bounties_list)
var/subtype = pick(subtypesof(/datum/bounty/item/science))
return new subtype
if(9)
- var/subtype = pick(subtypesof(/datum/bounty/item/slime))
- return new subtype
- if(10)
var/subtype = pick(subtypesof(/datum/bounty/item/engineering))
return new subtype
- if(11)
+ if(10)
var/subtype = pick(subtypesof(/datum/bounty/item/mining))
return new subtype
- if(12)
+ if(11)
var/subtype = pick(subtypesof(/datum/bounty/item/medical))
return new subtype
- if(13)
+ if(12)
var/subtype = pick(subtypesof(/datum/bounty/item/botany))
return new subtype
@@ -153,10 +150,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
/********************************Dynamic Gens********************************/
for(var/i in 0 to 1)
- if(prob(50))
- pick = pick(subtypesof(/datum/bounty/item/slime))
- else
- pick = pick(subtypesof(/datum/bounty/item/science))
+ pick = pick(subtypesof(/datum/bounty/item/science))
try_add_bounty(new pick)
/********************************Cutoff for Non-Low Priority Bounties********************************/
diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index dfec659e164..0b302925e10 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -383,7 +383,7 @@
if (specificTarget)
specificTarget = null
return
- var/list/mobs = getpois()//code stolen from observer.dm
+ var/list/mobs = SSpoints_of_interest.get_mob_pois()
var/inputTarget = input("Select a mob! (Smiting does this automatically)", "Target", null, null) as null|anything in mobs
if (isnull(inputTarget))
return
diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm
index 143480b2bc7..1d937060b8c 100644
--- a/code/modules/cargo/console.dm
+++ b/code/modules/cargo/console.dm
@@ -1,33 +1,48 @@
+#define BEACON_COST 500
+#define SP_LINKED 1
+#define SP_READY 2
+#define SP_LAUNCH 3
+#define SP_UNLINK 4
+#define SP_UNREADY 5
+
/obj/machinery/computer/cargo
- name = "supply console"
- desc = "Used to order supplies, approve requests, and control the shuttle."
- icon_screen = "supply"
+ name = "outpost communications console"
+ desc = "This console allows the user to communicate with a nearby outpost to \
+ purchase supplies and manage missions. Purchases are delivered near-instantly."
+ icon_screen = "supply_express"
circuit = /obj/item/circuitboard/computer/cargo
light_color = COLOR_BRIGHT_ORANGE
- var/requestonly = FALSE
+ /// The ship we reside on for ease of access
+ var/datum/overmap/ship/controlled/current_ship
var/contraband = FALSE
var/self_paid = FALSE
var/safety_warning = "For safety reasons, the automated supply shuttle \
cannot transport live organisms, human remains, classified nuclear weaponry, \
homing beacons or machinery housing any form of artificial intelligence."
- var/blockade_warning = "Bluespace instability detected. Shuttle movement impossible."
- /// radio used by the console to send messages on supply channel
- var/obj/item/radio/headset/radio
/// var that tracks message cooldown
var/message_cooldown
-
-/obj/machinery/computer/cargo/request
- name = "supply request console"
- desc = "Used to request supplies from cargo."
- icon_screen = "request"
- circuit = /obj/item/circuitboard/computer/cargo/request
- requestonly = TRUE
+ var/blockade_warning = "Bluespace instability detected. Delivery impossible."
+ var/message
+ /// Number of beacons printed. Used to determine beacon names.
+ var/printed_beacons = 0
+ var/list/supply_pack_data
+ /// The currently linked supplypod beacon
+ var/obj/item/supplypod_beacon/beacon
+ /// Area instance that cargo pods are sent to
+ var/area/landingzone
+ /// The pod type used to deliver orders
+ var/podType = /obj/structure/closet/supplypod/centcompod
+ /// Cooldown to prevent printing supplypod beacon spam
+ var/cooldown = 0
+ /// Is the console in beacon mode? exists to let beacon know when a pod may come in
+ var/use_beacon = FALSE
+ /// The account to charge purchases to, defaults to the cargo budget
+ var/datum/bank_account/charge_account
/obj/machinery/computer/cargo/Initialize()
. = ..()
- radio = new /obj/item/radio/headset/headset_cargo(src)
var/obj/item/circuitboard/computer/cargo/board = circuit
contraband = board.contraband
if (board.obj_flags & EMAGGED)
@@ -36,7 +51,8 @@
obj_flags &= ~EMAGGED
/obj/machinery/computer/cargo/Destroy()
- QDEL_NULL(radio)
+ if(beacon)
+ beacon.unlink_console()
return ..()
/obj/machinery/computer/cargo/proc/get_export_categories()
@@ -62,70 +78,70 @@
board.obj_flags |= EMAGGED
update_static_data(user)
+/obj/machinery/computer/cargo/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
+ current_ship = port.current_ship
+
/obj/machinery/computer/cargo/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, "Cargo", name)
+ ui = new(user, src, "OutpostCommunications", name)
ui.open()
+ if(!charge_account)
+ reconnect()
+
+/obj/machinery/computer/cargo/ui_static_data(mob/user)
+ . = ..()
+ var/outpost_docked = istype(current_ship.docked_to, /datum/overmap/outpost)
+ if(outpost_docked)
+ generate_pack_data()
+ else
+ supply_pack_data = list()
-/obj/machinery/computer/cargo/ui_data()
+/obj/machinery/computer/cargo/ui_data(mob/user)
+ var/canBeacon = beacon && (isturf(beacon.loc) || ismob(beacon.loc))//is the beacon in a valid location?
var/list/data = list()
- data["location"] = SSshuttle.supply.getStatusText()
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- if(D)
- data["points"] = D.account_balance
- data["away"] = SSshuttle.supply.get_docked() == SSshuttle.supply_away_port
- data["self_paid"] = self_paid
- data["docked"] = SSshuttle.supply.mode == SHUTTLE_IDLE
- var/message = "Remember to stamp and send back the supply manifests."
- if(SSshuttle.centcom_message)
- message = SSshuttle.centcom_message
+
+ var/outpost_docked = istype(current_ship.docked_to, /datum/overmap/outpost)
+
+ data["onShip"] = !isnull(current_ship)
+ data["numMissions"] = current_ship ? LAZYLEN(current_ship.missions) : 0
+ data["maxMissions"] = current_ship ? current_ship.max_missions : 0
+ data["outpostDocked"] = outpost_docked
+ data["points"] = charge_account ? charge_account.account_balance : 0
+ data["siliconUser"] = user.has_unlimited_silicon_privilege && check_ship_ai_access(user)
+ data["beaconZone"] = beacon ? get_area(beacon) : ""//where is the beacon located? outputs in the tgui
+ data["usingBeacon"] = use_beacon //is the mode set to deliver to the beacon or the cargobay?
+ data["canBeacon"] = !use_beacon || canBeacon //is the mode set to beacon delivery, and is the beacon in a valid location?
+ data["canBuyBeacon"] = charge_account ? (cooldown <= 0 && charge_account.account_balance >= BEACON_COST) : FALSE
+ data["beaconError"] = use_beacon && !canBeacon ? "(BEACON ERROR)" : ""//changes button text to include an error alert if necessary
+ data["hasBeacon"] = beacon != null//is there a linked beacon?
+ data["beaconName"] = beacon ? beacon.name : "No Beacon Found"
+ data["printMsg"] = cooldown > 0 ? "Print Beacon for [BEACON_COST] credits ([cooldown])" : "Print Beacon for [BEACON_COST] credits"//buttontext for printing beacons
+ data["supplies"] = list()
+ message = "Sales are near-instantaneous - please choose carefully."
if(SSshuttle.supplyBlocked)
message = blockade_warning
+ if(use_beacon && !beacon)
+ message = "BEACON ERROR: BEACON MISSING"//beacon was destroyed
+ else if (use_beacon && !canBeacon)
+ message = "BEACON ERROR: MUST BE EXPOSED"//beacon's loc/user's loc must be a turf
data["message"] = message
- data["cart"] = list()
- for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
- data["cart"] += list(list(
- "object" = SO.pack.name,
- "cost" = SO.pack.cost,
- "id" = SO.id,
- "orderer" = SO.orderer,
- "paid" = !isnull(SO.paying_account) //paid by requester
- ))
- data["requests"] = list()
- for(var/datum/supply_order/SO in SSshuttle.requestlist)
- data["requests"] += list(list(
- "object" = SO.pack.name,
- "cost" = SO.pack.cost,
- "orderer" = SO.orderer,
- "reason" = SO.reason,
- "id" = SO.id
- ))
+ data["supplies"] = supply_pack_data
+ if (cooldown > 0)//cooldown used for printing beacons
+ cooldown--
- return data
+ data["shipMissions"] = list()
+ data["outpostMissions"] = list()
+
+ if(current_ship)
+ for(var/datum/mission/M as anything in current_ship.missions)
+ data["shipMissions"] += list(M.get_tgui_info())
+ if(outpost_docked)
+ var/datum/overmap/outpost/out = current_ship.docked_to
+ for(var/datum/mission/M as anything in out.missions)
+ data["outpostMissions"] += list(M.get_tgui_info())
-/obj/machinery/computer/cargo/ui_static_data(mob/user)
- var/list/data = list()
- data["requestonly"] = requestonly
- data["supplies"] = list()
- for(var/pack in SSshuttle.supply_packs)
- var/datum/supply_pack/P = SSshuttle.supply_packs[pack]
- if(!data["supplies"][P.group])
- data["supplies"][P.group] = list(
- "name" = P.group,
- "packs" = list()
- )
- if((P.hidden && !(obj_flags & EMAGGED)) || (P.contraband && !contraband) || (P.special && !P.special_enabled) || P.DropPodOnly)
- continue
- data["supplies"][P.group]["packs"] += list(list(
- "name" = P.name,
- "cost" = P.cost,
- "id" = pack,
- "desc" = P.desc || P.name, // If there is a description, use it. Otherwise use the pack's name.
- "small_item" = P.small_item,
- "access" = P.access
- ))
return data
/obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui)
@@ -133,115 +149,169 @@
if(.)
return
switch(action)
- if("send")
- if(!SSshuttle.supply.canMove())
- say(safety_warning)
- return
- if(SSshuttle.supplyBlocked)
- say(blockade_warning)
- return
- if(SSshuttle.supply.get_docked() == SSshuttle.supply_home_port)
- SSshuttle.supply.export_categories = get_export_categories()
- SSshuttle.moveShuttle(SSshuttle.supply, SSshuttle.supply_away_port, TRUE)
- say("The supply shuttle is departing.")
- investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO)
- else
- investigate_log("[key_name(usr)] called the supply shuttle.", INVESTIGATE_CARGO)
- say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.")
- SSshuttle.moveShuttle(SSshuttle.supply, SSshuttle.supply_home_port, TRUE)
- . = TRUE
- if("add")
- if(istype(src, /obj/machinery/computer/cargo/express))
- return
- var/id = text2path(params["id"])
- var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
- if(!istype(pack))
- return
- if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.contraband && !contraband) || pack.DropPodOnly)
+ if("withdrawCash")
+ var/val = text2num(params["value"])
+ // no giving yourself money
+ if(!charge_account || !val || val <= 0)
return
+ if(charge_account.adjust_money(-val, CREDIT_LOG_WITHDRAW))
+ var/obj/item/holochip/cash_chip = new /obj/item/holochip(drop_location(), val)
+ if(ishuman(usr))
+ var/mob/living/carbon/human/user = usr
+ user.put_in_hands(cash_chip)
+ playsound(src, 'sound/machines/twobeep_high.ogg', 50, TRUE)
+ src.visible_message("[src] dispenses a holochip.")
+ return TRUE
- var/name = "*None Provided*"
- var/rank = "*None Provided*"
- var/ckey = usr.ckey
- if(ishuman(usr))
- var/mob/living/carbon/human/H = usr
- name = H.get_authentification_name()
- rank = H.get_assignment(hand_first = TRUE)
- else if(issilicon(usr))
- name = usr.real_name
- rank = "Silicon"
-
- var/datum/bank_account/account
- if(self_paid && ishuman(usr))
- var/mob/living/carbon/human/H = usr
- var/obj/item/card/id/id_card = H.get_idcard(TRUE)
- if(!istype(id_card))
- say("No ID card detected.")
- return
- account = id_card.registered_account
- if(!istype(account))
- say("Invalid bank account.")
+ if("LZCargo")
+ use_beacon = FALSE
+ if (beacon)
+ beacon.update_status(SP_UNREADY) //ready light on beacon will turn off
+ if("LZBeacon")
+ use_beacon = TRUE
+ if (beacon)
+ beacon.update_status(SP_READY) //turns on the beacon's ready light
+ if("printBeacon")
+ if(charge_account?.adjust_money(-BEACON_COST, "cargo_beacon"))
+ cooldown = 10//a ~ten second cooldown for printing beacons to prevent spam
+ var/obj/item/supplypod_beacon/C = new /obj/item/supplypod_beacon(drop_location())
+ C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc)
+ printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1
+ beacon.name = "Supply Pod Beacon #[printed_beacons]"
+ if("add")
+ var/datum/overmap/outpost/current_outpost = current_ship.docked_to
+ if(istype(current_ship.docked_to))
+ var/datum/supply_pack/current_pack = locate(params["ref"]) in current_outpost.supply_packs
+ var/same_faction = current_pack.faction ? current_pack.faction.allowed_faction(current_ship.faction_datum) : FALSE
+ var/total_cost = (same_faction && current_pack.faction_discount) ? current_pack.cost - (current_pack.cost * (current_pack.faction_discount * 0.01)) : current_pack.cost
+ if(!current_pack || !charge_account?.has_money(total_cost))
return
- var/reason = ""
- if(requestonly && !self_paid)
- reason = stripped_input("Reason:", name, "")
- if(isnull(reason) || ..())
- return
+ var/turf/landing_turf
+ if(!isnull(beacon) && use_beacon) // prioritize beacons over landing in cargobay
+ landing_turf = get_turf(beacon)
+ beacon.update_status(SP_LAUNCH)
+ else if(!use_beacon)// find a suitable supplypod landing zone in cargobay
+ var/list/empty_turfs = list()
+ if(!landingzone)
+ reconnect()
+ if(!landingzone)
+ WARNING("[src] couldnt find a Ship/Cargo (aka cargobay) area on a ship, and as such it has set the supplypod landingzone to the area it resides in.")
+ landingzone = get_area(src)
+ for(var/turf/open/floor/T in landingzone.contents)//uses default landing zone
+ if(T.is_blocked_turf())
+ continue
+ empty_turfs += T
+ CHECK_TICK
+ landing_turf = pick(empty_turfs)
- var/turf/T = get_turf(src)
- var/datum/supply_order/SO = new(pack, name, rank, ckey, reason, account)
- SO.generateRequisition(T)
- if(requestonly && !self_paid)
- SSshuttle.requestlist += SO
- else
- SSshuttle.shoppinglist += SO
- if(self_paid)
- say("Order processed. The price will be charged to [account.account_holder]'s bank account on delivery.")
- if(requestonly && message_cooldown < world.time)
- radio.talk_into(src, "A new order has been requested.", RADIO_CHANNEL_COMMAND)
- message_cooldown = world.time + 30 SECONDS
- . = TRUE
- if("remove")
- var/id = text2num(params["id"])
- for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
- if(SO.id == id)
- SSshuttle.shoppinglist -= SO
- . = TRUE
- break
- if("clear")
- SSshuttle.shoppinglist.Cut()
- . = TRUE
- if("approve")
- var/id = text2num(params["id"])
- for(var/datum/supply_order/SO in SSshuttle.requestlist)
- if(SO.id == id)
- SSshuttle.requestlist -= SO
- SSshuttle.shoppinglist += SO
- . = TRUE
- break
- if("deny")
- var/id = text2num(params["id"])
- for(var/datum/supply_order/SO in SSshuttle.requestlist)
- if(SO.id == id)
- SSshuttle.requestlist -= SO
- . = TRUE
- break
- if("denyall")
- SSshuttle.requestlist.Cut()
- . = TRUE
- if("toggleprivate")
- self_paid = !self_paid
- . = TRUE
- if(.)
- post_signal("supply")
+ // note that, because of CHECK_TICK above, we aren't sure if we can
+ // afford the pack, even though we checked earlier. luckily adjust_money
+ // returns false if the account can't afford the price
+ if(landing_turf && charge_account.adjust_money(-total_cost, CREDIT_LOG_CARGO))
+ var/name = "*None Provided*"
+ var/rank = "*None Provided*"
+ if(ishuman(usr))
+ var/mob/living/carbon/human/H = usr
+ name = H.get_authentification_name()
+ rank = H.get_assignment(hand_first = TRUE)
+ else if(issilicon(usr))
+ name = usr.real_name
+ rank = "Silicon"
+ var/datum/supply_order/SO = new(current_pack, name, rank, usr.ckey, "", ordering_outpost = current_ship.docked_to)
+ new /obj/effect/pod_landingzone(landing_turf, podType, SO)
+ update_appearance() // ??????????????????
+ return TRUE
-/obj/machinery/computer/cargo/proc/post_signal(command)
+ if("mission-act")
+ var/datum/mission/mission = locate(params["ref"])
+ var/obj/docking_port/mobile/D = SSshuttle.get_containing_shuttle(src)
+ var/datum/overmap/ship/controlled/ship = D.current_ship
+ var/datum/overmap/outpost/outpost = ship.docked_to
+ if(!istype(outpost) || mission.source_outpost != outpost) // important to check these to prevent href fuckery
+ return
+ if(!mission.accepted)
+ if(LAZYLEN(ship.missions) >= ship.max_missions)
+ return
+ mission.accept(ship, loc)
+ return TRUE
+ else if(mission.servant == ship)
+ if(mission.can_complete())
+ mission.turn_in()
+ else if(tgui_alert(usr, "Give up on [mission]?", src, list("Yes", "No")) == "Yes")
+ mission.give_up()
+ return TRUE
- var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
+/obj/machinery/computer/cargo/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
+ . = ..()
+ reconnect(port)
- if(!frequency)
+/obj/machinery/computer/cargo/proc/reconnect(obj/docking_port/mobile/port)
+ if(!port)
+ var/area/ship/current_area = get_area(src)
+ if(!istype(current_area))
+ return
+ port = current_area.mobile_port
+ if(!port)
return
+ charge_account = port.current_ship.ship_account
+ landingzone = locate(/area/ship/cargo) in port.shuttle_areas
+
+/obj/machinery/computer/cargo/attackby(obj/item/W, mob/living/user, params)
+ var/value = W.get_item_credit_value()
+ if(value && charge_account)
+ charge_account.adjust_money(value, CREDIT_LOG_DEPOSIT)
+ to_chat(user, "You deposit [W]. The Vessel Budget is now [charge_account.account_balance] cr.")
+ qdel(W)
+ return TRUE
+ else if(istype(W, /obj/item/supplypod_beacon))
+ var/obj/item/supplypod_beacon/sb = W
+ if (sb.cargo_console != src)
+ sb.link_console(src, user)
+ return TRUE
+ else
+ to_chat(user, "[src] is already linked to [sb].")
+ ..()
+
+/obj/machinery/computer/cargo/proc/generate_pack_data()
+ supply_pack_data = list()
+
+ if(!current_ship.docked_to)
+ return supply_pack_data
+
+ var/datum/overmap/outpost/outpost_docked = current_ship.docked_to
+
+ if(!istype(outpost_docked))
+ return supply_pack_data
+
+ for(var/datum/supply_pack/current_pack as anything in outpost_docked.supply_packs)
+ if(!supply_pack_data[current_pack.group])
+ supply_pack_data[current_pack.group] = list(
+ "name" = current_pack.group,
+ "packs" = list()
+ )
+ if((current_pack.hidden))
+ continue
+ var/same_faction = current_pack.faction ? current_pack.faction.allowed_faction(current_ship.faction_datum) : FALSE
+ var/discountedcost = (same_faction && current_pack.faction_discount) ? current_pack.cost - (current_pack.cost * (current_pack.faction_discount * 0.01)) : null
+ if(current_pack.faction_locked && !same_faction)
+ continue
+ supply_pack_data[current_pack.group]["packs"] += list(list(
+ "name" = current_pack.name,
+ "cost" = current_pack.cost,
+ "discountedcost" = discountedcost ? discountedcost : null,
+ "discountpercent" = current_pack.faction_discount,
+ "faction_locked" = current_pack.faction_locked, //this will only show if you are same faction, so no issue
+ "ref" = REF(current_pack),
+ "desc" = (current_pack.desc || current_pack.name) + (discountedcost ? "\n-[current_pack.faction_discount]% off due to your faction affiliation.\nWas [current_pack.cost]" : "") + (current_pack.faction_locked ? "\nYou are able to purchase this item due to your faction affiliation." : "") // If there is a description, use it. Otherwise use the pack's name.
+ ))
+
+/obj/machinery/computer/cargo/retro
+ icon = 'icons/obj/machines/retro_computer.dmi'
+ icon_state = "computer-retro"
+ deconpath = /obj/structure/frame/computer/retro
- var/datum/signal/status_signal = new(list("command" = command))
- frequency.post_signal(src, status_signal)
+/obj/machinery/computer/cargo/solgov
+ icon = 'icons/obj/machines/retro_computer.dmi'
+ icon_state = "computer-solgov"
+ deconpath = /obj/structure/frame/computer/solgov
diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm
index be3ec7a2659..165cfb6c119 100644
--- a/code/modules/cargo/exports.dm
+++ b/code/modules/cargo/exports.dm
@@ -59,7 +59,8 @@ then the player gets the profit from selling his own wasted time.
if(!dry_run && (sold || delete_unsold))
if(ismob(thing))
thing.investigate_log("deleted through cargo export",INVESTIGATE_CARGO)
- qdel(thing)
+ if(!dry_run)
+ qdel(AM)
return report
diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm
index 030e51cf24f..bb556dc7861 100644
--- a/code/modules/cargo/exports/large_objects.dm
+++ b/code/modules/cargo/exports/large_objects.dm
@@ -98,8 +98,5 @@
var/worth = 10
worth += C.air_contents.get_moles(GAS_BZ)*2
- worth += C.air_contents.get_moles(GAS_STIMULUM)*100
- worth += C.air_contents.get_moles(GAS_HYPERNOB)*1000
worth += C.air_contents.get_moles(GAS_TRITIUM)*4
- worth += C.air_contents.get_moles(GAS_PLUOXIUM)*5
return worth
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index 4779886622a..ba721f10213 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -9,10 +9,6 @@
/obj/item/book_of_babel,
/obj/item/wisp_lantern,
/obj/item/reagent_containers/glass/bottle/potion/flight,
- /obj/item/katana/cursed,
- /obj/item/clothing/glasses/godeye,
- /obj/item/melee/ghost_sword,
- /obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/voodoo,
/obj/item/grenade/clusterbuster/inferno,
/obj/item/clothing/neck/memento_mori,
@@ -21,17 +17,13 @@
/obj/item/dragons_blood,
/obj/item/lava_staff,
/obj/item/ship_in_a_bottle,
- /obj/item/clothing/shoes/clown_shoes/banana_shoes,
- /obj/item/kitchen/knife/envy,
/obj/item/veilrender/vealrender,
- /obj/item/nullrod/scythe/talking/necro,
/obj/item/clothing/suit/armor/ascetic)
/datum/export/lavaland/major //valuable chest/ruin loot and staff of storms
cost = 10000
unit_name = "lava planet artifact"
- export_types = list(/obj/item/guardiancreator,
- /obj/item/rod_of_asclepius,
+ export_types = list(/obj/item/rod_of_asclepius,
/obj/item/clothing/suit/space/hardsuit/ert/paranormal,
/obj/item/prisoncube,
/obj/item/staff/storm,
@@ -47,12 +39,11 @@
cost = 40000
unit_name = "major lava planet artifact"
export_types = list(/obj/item/hierophant_club,
- /obj/item/melee/transforming/cleaving_saw,
+ /obj/item/melee/cleaving_saw,
/obj/item/organ/vocal_cords/colossus,
/obj/machinery/anomalous_crystal,
/obj/item/mayhem,
/obj/item/blood_contract,
- /obj/item/guardiancreator/miner/choose//this is basically the most valulable mining loot so good luck getting a miner to part ways
)
/*
/datum/export/lavaland/trophycommon
diff --git a/code/modules/cargo/exports/parts.dm b/code/modules/cargo/exports/parts.dm
index 0df08954398..115dfdf3ff6 100644
--- a/code/modules/cargo/exports/parts.dm
+++ b/code/modules/cargo/exports/parts.dm
@@ -15,11 +15,6 @@
unit_name = "solar panel control board"
export_types = list(/obj/item/circuitboard/computer/solar_control)
-/datum/export/swarmer
- cost = 2000
- unit_name = "deactivated alien deconstruction drone"
- export_types = list(/obj/item/deactivated_swarmer)
-
//Computer Tablets and Parts
/datum/export/modular_part
cost = 15
diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm
index 287fba69aaa..efb0cfdb4a5 100644
--- a/code/modules/cargo/exports/tools.dm
+++ b/code/modules/cargo/exports/tools.dm
@@ -96,10 +96,6 @@
exclude_types = list(/obj/item/radio/mech)
//Advanced/Power Tools.
-/datum/export/weldingtool/experimental
- cost = 90
- unit_name = "experimental welding tool"
- export_types = list(/obj/item/weldingtool/experimental)
/datum/export/jawsoflife
cost = 100
diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm
index bbe73991f7e..118cfa8a69e 100644
--- a/code/modules/cargo/exports/weapons.dm
+++ b/code/modules/cargo/exports/weapons.dm
@@ -13,7 +13,7 @@
/datum/export/weapon/knife
cost = 100
unit_name = "combat knife"
- export_types = list(/obj/item/kitchen/knife/combat)
+ export_types = list(/obj/item/melee/knife/combat)
/datum/export/weapon/taser
@@ -41,12 +41,6 @@
unit_name = "WT-550 automatic rifle"
export_types = list(/obj/item/gun/ballistic/automatic/smg/wt550)
-/datum/export/weapon/shotgun
- cost = 300
- unit_name = "combat shotgun"
- export_types = list(/obj/item/gun/ballistic/shotgun/automatic/combat)
-
-
/datum/export/weapon/flashbang
cost = 5
unit_name = "flashbang grenade"
diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm
deleted file mode 100644
index 81409d63d03..00000000000
--- a/code/modules/cargo/expressconsole.dm
+++ /dev/null
@@ -1,262 +0,0 @@
-#define BEACON_COST 500
-#define SP_LINKED 1
-#define SP_READY 2
-#define SP_LAUNCH 3
-#define SP_UNLINK 4
-#define SP_UNREADY 5
-
-/obj/machinery/computer/cargo/express
- name = "outpost communications console"
- desc = "This console allows the user to communicate with a nearby outpost to \
- purchase supplies and manage missions. Purchases are delivered near-instantly."
- icon_screen = "supply_express"
- circuit = /obj/item/circuitboard/computer/cargo/express
- var/blockade_warning = "Bluespace instability detected. Delivery impossible."
-
- var/message
- /// Number of beacons printed. Used to determine beacon names.
- var/printed_beacons = 0
- var/list/meme_pack_data
- /// The currently linked supplypod beacon
- var/obj/item/supplypod_beacon/beacon
- /// Area instance that cargo pods are sent to
- var/area/landingzone
- /// The pod type used to deliver orders
- var/podType = /obj/structure/closet/supplypod/centcompod
- /// Cooldown to prevent printing supplypod beacon spam
- var/cooldown = 0
- /// Is the console in beacon mode? exists to let beacon know when a pod may come in
- var/use_beacon = FALSE
- /// The account to charge purchases to, defaults to the cargo budget
- var/datum/bank_account/charge_account
-
-/obj/machinery/computer/cargo/express/retro
- icon = 'icons/obj/machines/retro_computer.dmi'
- icon_state = "computer-retro"
- deconpath = /obj/structure/frame/computer/retro
-
-/obj/machinery/computer/cargo/express/solgov
- icon = 'icons/obj/machines/retro_computer.dmi'
- icon_state = "computer-solgov"
- deconpath = /obj/structure/frame/computer/solgov
-
-/obj/machinery/computer/cargo/express/Initialize()
- . = ..()
- packin_up()
-
-/obj/machinery/computer/cargo/express/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
- . = ..()
- reconnect(port)
-
-/obj/machinery/computer/cargo/express/proc/reconnect(obj/docking_port/mobile/port)
- if(!port)
- var/area/ship/current_area = get_area(src)
- if(!istype(current_area))
- return
- port = current_area.mobile_port
- if(!port)
- return
- charge_account = port.current_ship.ship_account
- landingzone = locate(/area/ship/cargo) in port.shuttle_areas
-
-/obj/machinery/computer/cargo/express/Destroy()
- if(beacon)
- beacon.unlink_console()
- return ..()
-
-/obj/machinery/computer/cargo/express/attackby(obj/item/W, mob/living/user, params)
- var/value = W.get_item_credit_value()
- if(value && charge_account)
- charge_account.adjust_money(value)
- to_chat(user, "You deposit [W]. The Vessel Budget is now [charge_account.account_balance] cr.")
- qdel(W)
- return TRUE
- else if(istype(W, /obj/item/supplypod_beacon))
- var/obj/item/supplypod_beacon/sb = W
- if (sb.express_console != src)
- sb.link_console(src, user)
- return TRUE
- else
- to_chat(user, "[src] is already linked to [sb].")
- ..()
-
-/obj/machinery/computer/cargo/express/proc/packin_up() // oh shit, I'm sorry
- meme_pack_data = list() // sorry for what?
- for(var/pack in SSshuttle.supply_packs) // our quartermaster taught us not to be ashamed of our supply packs
- var/datum/supply_pack/P = SSshuttle.supply_packs[pack] // specially since they're such a good price and all
- if(!meme_pack_data[P.group]) // yeah, I see that, your quartermaster gave you good advice
- meme_pack_data[P.group] = list( // it gets cheaper when I return it
- "name" = P.group, // mmhm
- "packs" = list() // sometimes, I return it so much, I rip the manifest
- ) // see, my quartermaster taught me a few things too
- if((P.hidden)) // like, how not to rip the manifest
- continue// by using someone else's crate
- meme_pack_data[P.group]["packs"] += list(list(
- "name" = P.name,
- "cost" = P.cost,
- "id" = pack,
- "desc" = P.desc || P.name // If there is a description, use it. Otherwise use the pack's name.
- ))
-
-/obj/machinery/computer/cargo/express/ui_interact(mob/living/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "OutpostCommunications", name)
- ui.open()
- if(!charge_account)
- reconnect()
-
-/obj/machinery/computer/cargo/express/ui_data(mob/user)
- var/canBeacon = beacon && (isturf(beacon.loc) || ismob(beacon.loc))//is the beacon in a valid location?
- var/list/data = list()
-
- // not a big fan of get_containing_shuttle
- var/obj/docking_port/mobile/D = SSshuttle.get_containing_shuttle(src)
- var/datum/overmap/ship/controlled/ship
- var/outpost_docked = FALSE
- if(D)
- ship = D.current_ship
- outpost_docked = istype(ship.docked_to, /datum/overmap/outpost)
-
- data["onShip"] = !isnull(ship)
- data["numMissions"] = ship ? LAZYLEN(ship.missions) : 0
- data["maxMissions"] = ship ? ship.max_missions : 0
- data["outpostDocked"] = outpost_docked
- data["points"] = charge_account ? charge_account.account_balance : 0
- data["siliconUser"] = user.has_unlimited_silicon_privilege && check_ship_ai_access(user)
- data["beaconZone"] = beacon ? get_area(beacon) : ""//where is the beacon located? outputs in the tgui
- data["usingBeacon"] = use_beacon //is the mode set to deliver to the beacon or the cargobay?
- data["canBeacon"] = !use_beacon || canBeacon //is the mode set to beacon delivery, and is the beacon in a valid location?
- data["canBuyBeacon"] = charge_account ? (cooldown <= 0 && charge_account.account_balance >= BEACON_COST) : FALSE
- data["beaconError"] = use_beacon && !canBeacon ? "(BEACON ERROR)" : ""//changes button text to include an error alert if necessary
- data["hasBeacon"] = beacon != null//is there a linked beacon?
- data["beaconName"] = beacon ? beacon.name : "No Beacon Found"
- data["printMsg"] = cooldown > 0 ? "Print Beacon for [BEACON_COST] credits ([cooldown])" : "Print Beacon for [BEACON_COST] credits"//buttontext for printing beacons
- data["supplies"] = list()
- message = "Sales are near-instantaneous - please choose carefully."
- if(SSshuttle.supplyBlocked)
- message = blockade_warning
- if(use_beacon && !beacon)
- message = "BEACON ERROR: BEACON MISSING"//beacon was destroyed
- else if (use_beacon && !canBeacon)
- message = "BEACON ERROR: MUST BE EXPOSED"//beacon's loc/user's loc must be a turf
- data["message"] = message
- if(!meme_pack_data)
- packin_up()
- stack_trace("You didn't give the cargo tech good advice, and he ripped the manifest. As a result, there was no pack data for [src]")
- data["supplies"] = meme_pack_data
- if (cooldown > 0)//cooldown used for printing beacons
- cooldown--
-
- data["shipMissions"] = list()
- data["outpostMissions"] = list()
-
- if(ship)
- for(var/datum/mission/M as anything in ship.missions)
- data["shipMissions"] += list(M.get_tgui_info())
- if(outpost_docked)
- var/datum/overmap/outpost/out = ship.docked_to
- for(var/datum/mission/M as anything in out.missions)
- data["outpostMissions"] += list(M.get_tgui_info())
-
- return data
-
-/obj/machinery/computer/cargo/express/ui_act(action, params, datum/tgui/ui)
- . = ..()
- if(.)
- return
-
- switch(action)
- if("withdrawCash")
- var/val = text2num(params["value"])
- // no giving yourself money
- if(!charge_account || !val || val <= 0)
- return
- if(charge_account.adjust_money(-val))
- var/obj/item/holochip/cash_chip = new /obj/item/holochip(drop_location(), val)
- if(ishuman(usr))
- var/mob/living/carbon/human/user = usr
- user.put_in_hands(cash_chip)
- playsound(src, 'sound/machines/twobeep_high.ogg', 50, TRUE)
- src.visible_message("[src] dispenses a holochip.")
- return TRUE
-
- if("LZCargo")
- use_beacon = FALSE
- if (beacon)
- beacon.update_status(SP_UNREADY) //ready light on beacon will turn off
- if("LZBeacon")
- use_beacon = TRUE
- if (beacon)
- beacon.update_status(SP_READY) //turns on the beacon's ready light
- if("printBeacon")
- if(charge_account?.adjust_money(-BEACON_COST))
- cooldown = 10//a ~ten second cooldown for printing beacons to prevent spam
- var/obj/item/supplypod_beacon/C = new /obj/item/supplypod_beacon(drop_location())
- C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc)
- printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1
- beacon.name = "Supply Pod Beacon #[printed_beacons]"
-
- if("add")
- var/area/ship/current_area = get_area(src)
- var/datum/supply_pack/pack = SSshuttle.supply_packs[text2path(params["id"])]
- if( \
- !pack || !charge_account?.has_money(pack.cost) || !istype(current_area) || \
- !istype(current_area.mobile_port.current_ship.docked_to, /datum/overmap/outpost) \
- )
- return
-
- var/turf/landing_turf
- if(!isnull(beacon) && use_beacon) // prioritize beacons over landing in cargobay
- landing_turf = get_turf(beacon)
- beacon.update_status(SP_LAUNCH)
- else if(!use_beacon)// find a suitable supplypod landing zone in cargobay
- var/list/empty_turfs = list()
- if(!landingzone)
- reconnect()
- if(!landingzone)
- WARNING("[src] couldnt find a Ship/Cargo (aka cargobay) area on a ship, and as such it has set the supplypod landingzone to the area it resides in.")
- landingzone = get_area(src)
- for(var/turf/open/floor/T in landingzone.contents)//uses default landing zone
- if(T.is_blocked_turf())
- continue
- empty_turfs += T
- CHECK_TICK
- landing_turf = pick(empty_turfs)
-
- // note that, because of CHECK_TICK above, we aren't sure if we can
- // afford the pack, even though we checked earlier. luckily adjust_money
- // returns false if the account can't afford the price
- if(landing_turf && charge_account.adjust_money(-pack.cost))
- var/name = "*None Provided*"
- var/rank = "*None Provided*"
- if(ishuman(usr))
- var/mob/living/carbon/human/H = usr
- name = H.get_authentification_name()
- rank = H.get_assignment(hand_first = TRUE)
- else if(issilicon(usr))
- name = usr.real_name
- rank = "Silicon"
- var/datum/supply_order/SO = new(pack, name, rank, usr.ckey, "")
- new /obj/effect/pod_landingzone(landing_turf, podType, SO)
- update_appearance() // ??????????????????
- return TRUE
-
- if("mission-act")
- var/datum/mission/mission = locate(params["ref"])
- var/obj/docking_port/mobile/D = SSshuttle.get_containing_shuttle(src)
- var/datum/overmap/ship/controlled/ship = D.current_ship
- var/datum/overmap/outpost/outpost = ship.docked_to
- if(!istype(outpost) || mission.source_outpost != outpost) // important to check these to prevent href fuckery
- return
- if(!mission.accepted)
- if(LAZYLEN(ship.missions) >= ship.max_missions)
- return
- mission.accept(ship, loc)
- return TRUE
- else if(mission.servant == ship)
- if(mission.can_complete())
- mission.turn_in()
- else
- mission.give_up()
- return TRUE
diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm
index 560fc46668d..2a05796e67f 100644
--- a/code/modules/cargo/gondolapod.dm
+++ b/code/modules/cargo/gondolapod.dm
@@ -20,7 +20,7 @@
layer = TABLE_LAYER//so that deliveries dont appear underneath it
loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 2, /obj/item/reagent_containers/food/snacks/meat/slab/gondola = 2)
//Gondolas aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
maxHealth = 200
diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm
index e802bf1aa27..010e4e3d0ef 100644
--- a/code/modules/cargo/order.dm
+++ b/code/modules/cargo/order.dm
@@ -15,15 +15,21 @@
var/reason
var/datum/supply_pack/pack
var/datum/bank_account/paying_account
+ var/datum/overmap/outpost/ordering_outpost
-/datum/supply_order/New(datum/supply_pack/pack, orderer, orderer_rank, orderer_ckey, reason, paying_account)
- id = SSshuttle.ordernum++
+/datum/supply_order/New(datum/supply_pack/pack, orderer, orderer_rank, orderer_ckey, reason, paying_account, ordering_outpost)
src.pack = pack
src.orderer = orderer
src.orderer_rank = orderer_rank
src.orderer_ckey = orderer_ckey
src.reason = reason
src.paying_account = paying_account
+ src.ordering_outpost = ordering_outpost
+ if(src.ordering_outpost)
+ id = src.ordering_outpost.ordernum++
+ if(pack)
+ SSblackbox.record_feedback("nested tally", "crate_ordered", 1, list(pack.name, "amount"))
+ SSblackbox.record_feedback("nested tally", "crate_ordered", pack.cost, list(pack.name, "cost"))
/datum/supply_order/proc/generateRequisition(turf/T)
var/obj/item/paper/requisition_paper = new(T)
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 8098ff6b513..4e26a713a6b 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -7,10 +7,13 @@
var/crate_name = "crate"
var/desc = ""//no desc by default
var/crate_type = /obj/structure/closet/crate
- // var/DropPodOnly = FALSE//only usable by the Bluespace Drop Pod via the express cargo console
var/admin_spawned = FALSE
var/small_item = FALSE //Small items can be grouped into a single crate.
+ var/datum/faction/faction
+ var/faction_discount = 15
+ var/faction_locked = FALSE
+
/datum/supply_pack/proc/generate(atom/A, datum/bank_account/paying_account)
var/obj/structure/closet/crate/C
if(paying_account)
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index e0d1743c328..19510740f34 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -1,74 +1,240 @@
/datum/supply_pack/ammo
- group = "Ammunition"
+ group = "Bulk Ammunition"
crate_type = /obj/structure/closet/crate/secure/gear
+ crate_name = "ammo crate"
-/*
- Pistol ammo
-*/
+/* Misc */
+
+/datum/supply_pack/ammo/blank_ammo_disk
+ name = "Blank Ammo Design Disk Crate"
+ desc = "Run your own training drills!"
+ cost = 1000
+ contains = list(/obj/item/disk/design_disk/blanks)
+
+/* .22lr */
+
+/datum/supply_pack/ammo/c22lr
+ name = ".22 LR Ammo Box Crate"
+ desc = "Contains a 100-round ammo box for refilling .22 LR weapons."
+ contains = list(/obj/item/storage/box/ammo/c22lr)
+ cost = 250
+
+/datum/supply_pack/ammo/c22lr_hp
+ name = ".22 LR HP Ammo Box Crate"
+ desc = "Contains a 100-round hollow point ammo box for refilling .22 LR weapons."
+ contains = list(/obj/item/storage/box/ammo/c22lr/hp)
+ cost = 600
+
+/datum/supply_pack/ammo/c22lr_ap
+ name = ".22 LR AP Ammo Box Crate"
+ desc = "Contains a 100-round armour piercing ammo box for refilling .22 LR weapons."
+ contains = list(/obj/item/storage/box/ammo/c22lr/ap)
+ cost = 600
+
+
+/* 9mm */
+
+/datum/supply_pack/ammo/c9mm_ammo_box
+ name = "9mm Ammo Box Crate"
+ desc = "Contains a 60-round 9mm box for pistols and SMGs such as the Commander or Saber."
+ contains = list(/obj/item/storage/box/ammo/c9mm)
+ cost = 200
+
+/datum/supply_pack/ammo/c9mmap_ammo_box
+ name = "9mm AP Ammo Box Crate"
+ desc = "Contains a 60-round 9mm box loaded with armor piercing ammo."
+ contains = list(/obj/item/storage/box/ammo/c9mm_ap)
+ cost = 400
+
+/datum/supply_pack/ammo/c9mmhp_ammo_box
+ name = "9mm HP Ammo Box Crate"
+ desc = "Contains a 60-round 9mm box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/c9mm_hp)
+ cost = 400
+
+/datum/supply_pack/ammo/c9mmrubber_ammo_box
+ name = "9mm Rubber Ammo Box Crate"
+ desc = "Contains a 60-round 9mm box loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/storage/box/ammo/c9mm_rubber)
+ cost = 200
-/datum/supply_pack/ammo/co9mm_mag
- name = "9mm Commander Magazine Crate"
- desc = "Contains a 9mm magazine for the standard-issue Commander pistol, containing ten rounds."
- contains = list(/obj/item/ammo_box/magazine/co9mm)
+/* .38 */
+
+/datum/supply_pack/ammo/c38
+ name = ".38 Ammo Boxes Crate"
+ desc = "Contains two 50 round ammo boxes for refilling .38 weapons."
+ cost = 250
+ contains = list(/obj/item/storage/box/ammo/c38,
+ /obj/item/storage/box/ammo/c38)
+ crate_name = "ammo crate"
+
+/* 10mm */
+
+/datum/supply_pack/ammo/c10mm_ammo_box
+ name = "10mm Ammo Box Crate"
+ desc = "Contains a 48-round 10mm box for pistols and SMGs like the Ringneck or the SkM-44(k)."
+ contains = list(/obj/item/storage/box/ammo/c10mm)
+ cost = 250
+
+/datum/supply_pack/ammo/c10mmap_ammo_box
+ name = "10mm AP Ammo Box Crate"
+ desc = "Contains a 48-round 10mm box loaded with armor piercing ammo."
+ contains = list(/obj/item/storage/box/ammo/c10mm_ap)
cost = 500
-/datum/supply_pack/ammo/m45_mag
- name = ".45 ACP Candor Magazine Crate"
- desc = "Contains a .45 ACP magazine for the Candor pistol, containing eight rounds."
- contains = list(/obj/item/ammo_box/magazine/m45)
+/datum/supply_pack/ammo/c10mmhp_ammo_box
+ name = "10mm HP Ammo Box Crate"
+ desc = "Contains a 48-round 10mm box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/c10mm_hp)
cost = 500
-/datum/supply_pack/ammo/a44roum_speedloader
- name = ".44 Roumain Speedloader Crate"
- desc = "Contains a .44 Roumain speedloader for the HP Montagne, containing six rounds."
- contains = list(/obj/item/ammo_box/a44roum_speedloader)
- cost = 400
+/datum/supply_pack/ammo/c10mmrubber_ammo_box
+ name = "10mm Rubber Ammo Box Crate"
+ desc = "Contains a 48-round 10mm box loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/storage/box/ammo/c10mm_rubber)
+ cost = 250
-/datum/supply_pack/ammo/c38_mag
- name = ".38 Speedloader Crate"
- desc = "Contains a .38 speedloader for revolvers, containing six rounds."
- contains = list(/obj/item/ammo_box/c38)
- cost = 350
+/* .45 */
+
+/datum/supply_pack/ammo/c45_ammo_box
+ name = ".45 Ammo Box Crate"
+ desc = "Contains a 48-round .45 box for pistols and SMGs like the Candor or the C-20r."
+ contains = list(/obj/item/storage/box/ammo/c45)
+ cost = 250
-/datum/supply_pack/ammo/m10mm_mag
- name = "10mm Stechkin Magazine Crate"
- desc = "Contains a 10mm magazine for the stechkin pistol, containing eight rounds."
- contains = list(/obj/item/ammo_box/magazine/m10mm)
+/datum/supply_pack/ammo/c45ap_ammo_box
+ name = ".45 AP Ammo Box Crate"
+ desc = "Contains a 48-round .45 box loaded with armor piercing ammo."
+ contains = list(/obj/item/storage/box/ammo/c45_ap)
cost = 500
-/datum/supply_pack/ammo/a357_mag
- name = ".357 Speedloader Crate"
- desc = "Contains a .357 speedloader for revolvers, containing seven rounds."
- contains = list(/obj/item/ammo_box/a357)
- cost = 750
+/datum/supply_pack/ammo/c45hp_ammo_box
+ name = ".45 HP Ammo Box Crate"
+ desc = "Contains a 48-round .45 box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/c45_hp)
+ cost = 500
-/datum/supply_pack/ammo/mag_556mm
- name = "5.56 Pistole C Magazine Crate"
- desc = "Contains a 5.56mm magazine for the Pistole C, containing twelve rounds."
- contains = list(/obj/item/ammo_box/magazine/pistol556mm)
- cost = 750
+/datum/supply_pack/ammo/c45mmrubber_ammo_box
+ name = ".45 Rubber Ammo Box Crate"
+ desc = "Contains a 48-round .45 box loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/storage/box/ammo/c45_rubber)
+ cost = 250
-/datum/supply_pack/ammo/fms_mag
- name = "Ferromagnetic Slug Magazine Crate"
- desc = "Contains a ferromagnetic slug magazine for the Model H pistol, containing ten rounds."
- contains = list(/obj/item/ammo_box/magazine/modelh)
- cost = 750
+/* .357 */
-/*
- Shotgun ammo
-*/
+/datum/supply_pack/ammo/a357_ammo_box
+ name = ".357 Ammo Box Crate"
+ desc = "Contains a 48-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand."
+ contains = list(/obj/item/storage/box/ammo/a357)
+ cost = 250
+
+/datum/supply_pack/ammo/a357hp_ammo_box
+ name = ".357 HP Ammo Box Crate"
+ desc = "Contains a 48-round .357 box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/a357_hp)
+ cost = 500
+
+/datum/supply_pack/ammo/a357match_ammo_box
+ name = ".357 Match Ammo Box Crate"
+ desc = "Contains a 48-round .357 match box for better performance against armor."
+ contains = list(/obj/item/storage/box/ammo/a357_match)
+ cost = 500
+
+/* .44 */
+
+/datum/supply_pack/ammo/a44roum
+ name = ".44 Roumain Ammo Box Crate"
+ desc = "Contains a 48-round box of .44 roumain ammo for revolvers such as the Shadow and Montagne."
+ contains = list(/obj/item/storage/box/ammo/a44roum)
+ cost = 250
+
+/datum/supply_pack/ammo/a44roum_rubber
+ name = ".44 Roumain Rubber Ammo Box Crate"
+ desc = "Contains a 48-round box of .44 roumain ammo loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/storage/box/ammo/a44roum_rubber)
+ cost = 250
+
+/datum/supply_pack/ammo/a44roum_hp
+ name = ".44 Roumain Hollow Point Ammo Box Crate"
+ desc = "Contains a 48-round box of .44 roumain hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/a44roum_hp)
+ cost = 500
+
+/* 4.6x30 */
+
+/datum/supply_pack/ammo/c46x30mm_boxcrate
+ name = "4.6x30mm Ammo Box Crate"
+ desc = "Contains an 80-round 4.6x30mm box for PDWs such as the WT-550."
+ contains = list(/obj/item/storage/box/ammo/c46x30mm)
+ cost = 250
+
+/datum/supply_pack/ammo/c46x30mm_ap
+ name = "4.6x30mm Armour Piercing Ammo Box Crate"
+ desc = "Contains a 80-round 4.6x30mm armour piercing box for PDWs such as the WT-550."
+ contains = list(/obj/item/storage/box/ammo/c46x30mm/ap)
+ cost = 500
+
+/datum/supply_pack/ammo/c46x30mm_hp
+ name = "4.6x30mm Hollow Point Ammo Box Crate"
+ desc = "Contains a 80-round 4.6x30mm hollow point box for PDWs such as the WT-550."
+ contains = list(/obj/item/storage/box/ammo/c46x30mm/hp)
+ cost = 500
+
+
+/* 5.7x39 */
+
+/datum/supply_pack/ammo/c57x39mm_boxcrate
+ name = "5.7x39mm Ammo Box Crate"
+ desc = "Contains two 48-round 5.7x39mm box for PDWs such as the Sidewinder."
+ contains = list(
+ /obj/item/storage/box/ammo/c57x39,
+ /obj/item/storage/box/ammo/c57x39,
+ )
+ cost = 350
+
+/datum/supply_pack/ammo/c57x39mm_ap
+ name = "5.7x39mm Armour Piercing Ammo Box Crate"
+ desc = "Contains two 48-round 5.7x39mm box for PDWs such as the Sidewinder."
+ contains = list(
+ /obj/item/storage/box/ammo/c57x39/ap,
+ /obj/item/storage/box/ammo/c57x39/ap,
+ )
+ cost = 700
+
+/datum/supply_pack/ammo/c57x39mm_hp
+ name = "5.7x39mm Hollow Point Ammo Box Crate"
+ desc = "Contains two 48-round 5.7x39mm Hollow Point boxes for PDWs such as the Sidewinder."
+ contains = list(
+ /obj/item/storage/box/ammo/c57x39/hp,
+ /obj/item/storage/box/ammo/c57x39/hp,
+ )
+ cost = 700
+
+/* 12 Gauge */
/datum/supply_pack/ammo/buckshot
name = "Buckshot Crate"
- desc = "Contains a box of twenty-five buckshot shells for use in lethal persuasion."
+ desc = "Contains a box of 32 buckshot shells for use in lethal persuasion."
cost = 500
- contains = list(/obj/item/ammo_box/a12g)
+ contains = list(/obj/item/storage/box/ammo/a12g_buckshot)
/datum/supply_pack/ammo/slugs
name = "Shotgun Slug Crate"
- desc = "Contains a box of twenty-five slug shells for use in lethal persuasion."
+ desc = "Contains a box of 32 slug shells for use in lethal persuasion."
cost = 500
- contains = list(/obj/item/ammo_box/a12g/slug)
+ contains = list(/obj/item/storage/box/ammo/a12g_slug)
+
+/datum/supply_pack/ammo/blank_shells
+ name = "Blank Shell Crate"
+ desc = "Contains a box of blank shells."
+ cost = 500
+ contains = list(/obj/item/storage/box/ammo/a12g_blank)
+
+/datum/supply_pack/ammo/rubbershot
+ name = "Rubbershot Crate"
+ desc = "Contains a box of 32 12 gauge rubbershot shells. Perfect for crowd control and training."
+ cost = 500
+ contains = list(/obj/item/storage/box/ammo/a12g_rubbershot)
/datum/supply_pack/ammo/techshells
name = "Unloaded Shotgun Technological Shells Crate"
@@ -76,25 +242,19 @@
cost = 210
contains = list(/obj/item/storage/box/techshot)
-/*
- .38 ammo
-*/
+/* .45-70 */
-/datum/supply_pack/ammo/winchester_ammo
- name = "Flaming Arrow and Detective Special .38 Ammo Boxes"
- desc = "Contains two 50 round ammo boxes for refilling .38 weapons."
- cost = 250
- contains = list(/obj/item/ammo_box/c38_box,
- /obj/item/ammo_box/c38_box)
- crate_name = "ammo crate"
+/datum/supply_pack/ammo/a4570_box
+ name = ".45-70 Ammo Box Crate"
+ desc = "Contains a 20-round box containing devastatingly powerful .45-70 caliber ammunition."
+ contains = list(/obj/item/storage/box/ammo/a4570)
+ cost = 400
-/datum/supply_pack/ammo/match
- name = ".38 Match Grade Speedloader"
- desc = "Contains one speedloader of match grade .38 ammunition, perfect for showing off trickshots."
- cost = 200
- small_item = TRUE
- contains = list(/obj/item/ammo_box/c38/match)
- crate_name = ".38 match crate"
+/datum/supply_pack/ammo/a4570_box/match
+ name = ".45-70 Match Crate"
+ desc = "Contains a 20-round box containing devastatingly powerful .45-70 caliber ammunition, that travels faster, pierces armour better, and ricochets off targets."
+ contains = list(/obj/item/storage/box/ammo/a4570_match)
+ cost = 800
/datum/supply_pack/ammo/dumdum
name = ".38 DumDum Speedloader"
@@ -125,7 +285,7 @@
name = ".45 Cobra Ammo Crate"
desc = "Contains a .45 magazine for the Cobra-20, containing 24 rounds."
cost = 750
- contains = list(/obj/item/ammo_box/magazine/smgm45)
+ contains = list(/obj/item/ammo_box/magazine/m45_cobra)
/*
Rifle ammo
@@ -179,212 +339,186 @@
contains = list(/obj/item/ammo_box/magazine/illestren_a850r)
cost = 250
+/* 7.62 */
+
/datum/supply_pack/ammo/a762_ammo_box
name = "7.62x40mm CLIP Ammo Box Crate"
- desc = "Contains a eighty-round 7.62x40mm CLIP box for the SKM rifles."
- contains = list(/obj/item/ammo_box/a762_40)
+ desc = "Contains two 60-round 7.62x40mm CLIP boxes for the SKM rifles."
+ contains = list(/obj/item/storage/box/ammo/a762_40,
+ /obj/item/storage/box/ammo/a762_40)
cost = 500
-/datum/supply_pack/ammo/a357_ammo_box
- name = ".357 Ammo Box Crate"
- desc = "Contains a fifty-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand."
- contains = list(/obj/item/ammo_box/a357_box)
- cost = 250
+/datum/supply_pack/ammo/a762_ap
+ name = "7.62x40mm CLIP Armour Piercing Ammo Box Crate"
+ desc = "Contains two 60-round 7.62x40mm CLIP Armour Piercing boxes for the SKM rifles."
+ contains = list(/obj/item/storage/box/ammo/a762_40/ap,
+ /obj/item/storage/box/ammo/a762_40/ap)
+ cost = 1000
-/datum/supply_pack/ammo/c556mmHITP_ammo_box
- name = "5.56 Caseless Ammo Box Crate"
- desc = "Contains a fifty-round 5.56mm caseless box for SolGov sidearms like the Pistole C."
- contains = list(/obj/item/ammo_box/c556mmHITP)
- cost = 250
+/datum/supply_pack/ammo/a762_hp
+ name = "7.62x40mm CLIP Hollow Point Ammo Box Crate"
+ desc = "Contains two 60-round 7.62x40mm CLIP Hollow Point boxes for the SKM rifles."
+ contains = list(/obj/item/storage/box/ammo/a762_40/hp,
+ /obj/item/storage/box/ammo/a762_40/hp)
+ cost = 1000
-/datum/supply_pack/ammo/c45_ammo_box
- name = ".45 Ammo Box Crate"
- desc = "Contains a fifty-round .45 box for pistols and SMGs like the Candor or the C-20r."
- contains = list(/obj/item/ammo_box/c45)
- cost = 250
+/* 5.56 */
-/datum/supply_pack/ammo/c10mm_ammo_box
- name = "10mm Ammo Box Crate"
- desc = "Contains a fifty-round 10mm box for pistols and SMGs like the Stechkin or the SkM-44(k)."
- contains = list(/obj/item/ammo_box/c10mm)
- cost = 250
+/datum/supply_pack/ammo/a556_ammo_box
+ name = "5.56x42mm CLIP Ammo Box Crate"
+ desc = "Contains two 60-round 5.56x42mm CLIP boxes for most newer rifles."
+ contains = list(/obj/item/storage/box/ammo/a556_42,
+ /obj/item/storage/box/ammo/a556_42)
+ cost = 450
-/datum/supply_pack/ammo/c9mm_ammo_box
- name = "9mm Ammo Box Crate"
- desc = "Contains a fifty-round 9mm box for pistols and SMGs such as the Commander or Saber."
- contains = list(/obj/item/ammo_box/c9mm)
- cost = 200
+/datum/supply_pack/ammo/a556_ap
+ name = "5.56x42mm CLIP Armour Piercing Ammo Box Crate"
+ desc = "Contains two 60-round 5.56x42mm CLIP Armour Piercing boxes for most newer rifles."
+ contains = list(/obj/item/storage/box/ammo/a556_42/ap,
+ /obj/item/storage/box/ammo/a556_42/ap)
+ cost = 900
-/datum/supply_pack/ammo/a308_ammo_box
- name = "308 Ammo Box Crate"
- desc = "Contains a thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S."
- contains = list(/obj/item/ammo_box/a308)
- cost = 500
+/datum/supply_pack/ammo/a556_hp
+ name = "5.56x42mm CLIP Hollow Point Ammo Box Crate"
+ desc = "Contains two 60-round 5.56x42mm CLIP Hollow Point boxes for most newer rifles."
+ contains = list(/obj/item/storage/box/ammo/a556_42/hp,
+ /obj/item/storage/box/ammo/a556_42/hp)
+ cost = 900
-/datum/supply_pack/ammo/c9mmap_ammo_box
- name = "9mm AP Ammo Box Crate"
- desc = "Contains a fifty-round 9mm box loaded with armor piercing ammo."
- contains = list(/obj/item/ammo_box/c9mm/ap)
- cost = 400
+/* 5.56 caseless */
-/datum/supply_pack/ammo/a357match_ammo_box
- name = ".357 Match Ammo Box Crate"
- desc = "Contains a fifty-round .357 match box for better performance against armor."
- contains = list(/obj/item/ammo_box/a357_box/match)
- cost = 500
+/datum/supply_pack/ammo/c556mmHITP_ammo_box
+ name = "5.56 Caseless Ammo Box Crate"
+ desc = "Contains a 48-round 5.56mm caseless box for SolGov sidearms like the Pistole C."
+ contains = list(/obj/item/storage/box/ammo/c556mm)
+ cost = 250
/datum/supply_pack/ammo/c556mmHITPap_ammo_box
name = "5.56 caseless AP Ammo Box Crate"
- desc = "Contains a fifty-round 5.56mm caseless boxloaded with armor piercing ammo."
- contains = list(/obj/item/ammo_box/c556mmHITP/ap)
- cost = 500
-
-/datum/supply_pack/ammo/c45ap_ammo_box
- name = ".45 AP Ammo Box Crate"
- desc = "Contains a fifty-round .45 box loaded with armor piercing ammo."
- contains = list(/obj/item/ammo_box/c45/ap)
- cost = 500
-
-/datum/supply_pack/ammo/c10mmap_ammo_box
- name = "10mm AP Ammo Box Crate"
- desc = "Contains a fifty-round 10mm box loaded with armor piercing ammo."
- contains = list(/obj/item/ammo_box/c10mm/ap)
- cost = 500
-
-/datum/supply_pack/ammo/c9mmhp_ammo_box
- name = "9mm HP Ammo Box Crate"
- desc = "Contains a fifty-round 9mm box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/c9mm/hp)
- cost = 400
-
-/datum/supply_pack/ammo/a357hp_ammo_box
- name = ".357 HP Ammo Box Crate"
- desc = "Contains a fifty-round .357 box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/a357_box/hp)
- cost = 500
-
-/datum/supply_pack/ammo/c10mmhp_ammo_box
- name = "10mm HP Ammo Box Crate"
- desc = "Contains a fifty-round 10mm box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/c10mm/hp)
- cost = 500
-/datum/supply_pack/ammo/c45hp_ammo_box
- name = ".45 HP Ammo Box Crate"
- desc = "Contains a fifty-round 10mm box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/c45/hp)
+ desc = "Contains a 48-round 5.56mm caseless boxloaded with armor piercing ammo."
+ contains = list(/obj/item/storage/box/ammo/c556mm_ap)
cost = 500
/datum/supply_pack/ammo/c556mmhitphp_ammo_box
name = "5.56 Caseless HP Ammo Box Crate"
- desc = "Contains a fifty-round 5.56mm caseless box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/c556mmHITP/hp)
+ desc = "Contains a 48-round 5.56mm caseless box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/c556mm_hp)
cost = 500
-/datum/supply_pack/ammo/c9mmrubber_ammo_box
- name = "9mm Rubber Ammo Box Crate"
- desc = "Contains a fifty-round 9mm box loaded with less-than-lethal rubber rounds."
- contains = list(/obj/item/ammo_box/c9mm/rubbershot)
- cost = 200
-
-/datum/supply_pack/ammo/c10mmrubber_ammo_box
- name = "10mm Rubber Ammo Box Crate"
- desc = "Contains a fifty-round 10mm box loaded with less-than-lethal rubber rounds."
- contains = list(/obj/item/ammo_box/c10mm/rubbershot)
- cost = 250
-
-/datum/supply_pack/ammo/c45mmrubber_ammo_box
- name = ".45 Rubber Ammo Box Crate"
- desc = "Contains a fifty-round .45 box loaded with less-than-lethal rubber rounds."
- contains = list(/obj/item/ammo_box/c45/rubbershot)
- cost = 250
-
-
/datum/supply_pack/ammo/c556HITPrubber_ammo_box
name = "5.56 Caseless Rubber Ammo Box Crate"
- desc = "Contains a fifty-round 5.56 caseless box loaded with less-than-lethal rubber rounds."
- contains = list(/obj/item/ammo_box/c556mmHITP/rubbershot)
+ desc = "Contains a 48-round 5.56 caseless box loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/storage/box/ammo/c556mm_rubber)
cost = 250
-/datum/supply_pack/ammo/guncell
- name = "Weapon Cell Crate"
- desc = "Contains a weapon cell, compatible with laser guns."
- contains = list(/obj/item/stock_parts/cell/gun)
- cost = 500
+/* .299 */
-/datum/supply_pack/ammo/guncell/kalix
- name = "Etherbor Cell Crate"
- desc = "Contains an Etherbor weapon cell, compatible with Etherbor armaments with a slightly higher capacity."
- contains = list(/obj/item/stock_parts/cell/gun/kalix)
- cost = 600
+/datum/supply_pack/ammo/c299
+ name = ".299 Eoehoma Caseless Ammo Box Crate"
+ desc = "Contains two 60-round boxes of .299 Caseless ammo from the defunct Eoehoma. Used for the E-40 Hybrid Rifle."
+ contains = list(/obj/item/storage/box/ammo/c299,
+ /obj/item/storage/box/ammo/c299)
+ cost = 400
-/datum/supply_pack/ammo/c46x30mm_boxcrate
- name = "4.6x30mm Ammo Box Crate"
- desc = "Contains a fifty-round 4.6x30mm box for PDWs such as the WT-550."
- contains = list(/obj/item/ammo_box/c46x30mm_box)
- cost = 250
+/* 8x50 */
/datum/supply_pack/ammo/c8x50mm_boxcrate
name = "8x50mm Ammo Box Crate"
- desc = "Contains a twenty-round 8x50mm ammo box for rifles such as the Illestren."
- contains = list(/obj/item/ammo_box/c8x50mm_box)
+ desc = "Contains a 40-round 8x50mm ammo box for rifles such as the Illestren."
+ contains = list(/obj/item/storage/box/ammo/a8_50r)
cost = 250
/datum/supply_pack/ammo/c8x50mm_boxhp_boxcrate
name = "8x50mm Hollow Point Crate"
- desc = "Contains a twenty-round 8x50mm ammo box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/c8x50mmhp_box)
+ desc = "Contains a 40-round 8x50mm ammo box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/a8_50r/hp)
+ cost = 500
+
+/datum/supply_pack/ammo/c8x50mm_tracbox
+ name = "8x50mm Tracker Crate"
+ desc = "Contains a 30-round 8x50mm ammo box loaded with tracker ammo, great for sustained hunts."
+ contains = list(/obj/item/storage/box/ammo/a8_50r/trac)
cost = 500
+
+/* .300 */
+
/datum/supply_pack/ammo/a300_box
name = ".300 Ammo Box Crate"
desc = "Contains a twenty-round .300 Magnum ammo box for sniper rifles such as the HP Scout."
- contains = list(/obj/item/ammo_box/a300_box)
+ contains = list(/obj/item/storage/box/ammo/a300)
+ cost = 400
+
+/datum/supply_pack/ammo/a300_trac
+ name = ".300 Trac Ammo Box Crate"
+ desc = "Contains a ten-round .300 TRAC ammo box for sniper rifles such as the HP Scout."
+ contains = list(/obj/item/storage/box/ammo/a300/trac)
+ cost = 600
+
+
+/* .308 */
+
+/datum/supply_pack/ammo/a308_ammo_box
+ name = "308 Ammo Box Crate"
+ desc = "Contains a thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S."
+ contains = list(/obj/item/storage/box/ammo/a308)
cost = 500
-/datum/supply_pack/ammo/a4570_box
- name = ".45-70 Ammo Box Crate"
- desc = "Contains a twelve-round box containing devastatingly powerful .45-70 caliber ammunition."
- contains = list(/obj/item/ammo_box/a4570)
+/datum/supply_pack/ammo/a308_ap
+ name = "308 Armour Piercing Ammo Box Crate"
+ desc = "Contains a thirty-round .308 armour piercing box for DMRs such as the SsG-04 and CM-GAL-S."
+ contains = list(/obj/item/storage/box/ammo/a308/ap)
cost = 500
-/datum/supply_pack/ammo/a4570_box/match
- name = ".45-70 Match Crate"
- desc = "Contains a twelve-round box containing devastatingly powerful .45-70 caliber ammunition, that travels faster, pierces armour better, and ricochets off targets."
- contains = list(/obj/item/ammo_box/a4570/match)
- cost = 750
+/datum/supply_pack/ammo/a308_hp
+ name = "308 Hollow Point Ammo Box Crate"
+ desc = "Contains a thirty-round .308 hollow point box for DMRs such as the SsG-04 and CM-GAL-S."
+ contains = list(/obj/item/storage/box/ammo/a308/hp)
+ cost = 500
+
+/* 6.5 */
+
+/datum/supply_pack/ammo/a65clip_box
+ name = "6.5x57mm CLIP Ammo Box Crate"
+ desc = "Contains a twenty-round 6.5x57mm CLIP ammo box for various sniper rifles such as the CM-F90 and the Boomslang series."
+ contains = list(/obj/item/storage/box/ammo/a65clip)
+ cost = 400
+
+/datum/supply_pack/ammo/a65clip_trackers
+ name = "6.5x57mm CLIP Tracker Shell Crate"
+ desc = "Contains a 10-round 6.5x57mm CLIP tracker box for various sniper rifles such as the CM-F90 and the Boomslang series."
+ contains = list(/obj/item/storage/box/ammo/a65clip/trac)
+ cost = 600
+
+/* 8x58 */
+
+/datum/supply_pack/ammo/a858
+ name = "8x58mm Ammo Box Crate"
+ desc = "Contains a twenty-round 8x58 ammo box for Solarian-manufactured sniper rifles, such as the SSG-69."
+ contains = list(/obj/item/storage/box/ammo/a858)
+ cost = 400
+
+
+/* ferro pellets */
/datum/supply_pack/ammo/ferropelletboxcrate
name = "Ferromagnetic Pellet Box Crate"
- desc = "Contains a fifty-round ferromagnetic pellet ammo box for gauss guns such as the Claris."
- contains = list(/obj/item/ammo_box/ferropelletbox)
+ desc = "Contains a 48-round ferromagnetic pellet ammo box for gauss guns such as the Claris."
+ contains = list(/obj/item/storage/box/ammo/ferropellet)
cost = 250
+/* ferroslugs */
+
/datum/supply_pack/ammo/ferroslugboxcrate
name = "Ferromagnetic Slug Box Crate"
desc = "Contains a twenty-round ferromagnetic slug for gauss guns such as the Model-H."
- contains = list(/obj/item/ammo_box/ferroslugbox)
+ contains = list(/obj/item/storage/box/ammo/ferroslug)
cost = 250
+/* ferro lances */
+
/datum/supply_pack/ammo/ferrolanceboxcrate
name = "Ferromagnetic Lance Box Crate"
- desc = "Contains a fifty-round box for high-powered gauss guns such as the GAR assault rifle."
- contains = list(/obj/item/ammo_box/ferrolancebox)
- cost = 250
-
-/datum/supply_pack/ammo/a44roum
- name = ".44 Roumain Ammo Box Crate"
- desc = "Contains a fifty-round box of .44 roumain ammo for revolvers such as the Shadow and Montagne."
- contains = list(/obj/item/ammo_box/a44roum)
- cost = 250
-
-/datum/supply_pack/ammo/a44roum_rubber
- name = ".44 Roumain Rubber Ammo Box Crate"
- desc = "Contains a fifty-round box of .44 roumain ammo loaded with less-than-lethal rubber rounds."
- contains = list(/obj/item/ammo_box/a44roum/rubber)
+ desc = "Contains a 48-round box for high-powered gauss guns such as the GAR assault rifle."
+ contains = list(/obj/item/storage/box/ammo/ferrolance)
cost = 250
-
-/datum/supply_pack/ammo/a44roum_hp
- name = ".44 Roumain Hollow Point Ammo Box Crate"
- desc = "Contains a fifty-round box of .44 roumain hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/a44roum/hp)
- cost = 500
diff --git a/code/modules/cargo/packs/animal.dm b/code/modules/cargo/packs/animal.dm
index 621d376035d..50a9d607b28 100644
--- a/code/modules/cargo/packs/animal.dm
+++ b/code/modules/cargo/packs/animal.dm
@@ -105,7 +105,7 @@
/datum/supply_pack/animal/fox
name = "Fox Crate"
- desc = "The fox goes...? Comes with a collar!"//what does the fox say // awful
+ desc = "The fox goes...? Comes with a collar!"//what does the fox say // awful //yip
cost = 5000
contains = list(/mob/living/simple_animal/pet/fox,
/obj/item/clothing/neck/petcollar)
diff --git a/code/modules/cargo/packs/canister.dm b/code/modules/cargo/packs/canister.dm
index c63a4f3e2a5..00fed0ff679 100644
--- a/code/modules/cargo/packs/canister.dm
+++ b/code/modules/cargo/packs/canister.dm
@@ -43,7 +43,7 @@
/datum/supply_pack/canister/nitrous_oxide
name = "Nitrous Oxide Canister"
- desc = "Contains a canister of nitrous oxide. Clowns love it!"
+ desc = "Contains a canister of nitrous oxide. Guaranted to make someone giggle!"
cost = 2500
contains = list(/obj/machinery/portable_atmospherics/canister/nitrous_oxide)
crate_name = "nitrous oxide canister crate"
diff --git a/code/modules/cargo/packs/chemistry.dm b/code/modules/cargo/packs/chemistry.dm
index 5c7ae4a20ab..236706f7b6c 100644
--- a/code/modules/cargo/packs/chemistry.dm
+++ b/code/modules/cargo/packs/chemistry.dm
@@ -10,19 +10,26 @@
name = "Chemical Starter Kit Crate"
desc = "Contains thirteen different chemicals, for all the fun experiments you can make."
cost = 1250 // This is intentionally underpriced; the hope is that people will start using ghettochem, upon which time the price can be raised.
- contains = list(/obj/item/reagent_containers/glass/bottle/hydrogen,
+ contains = list(/obj/item/reagent_containers/glass/bottle/aluminium,
+ /obj/item/reagent_containers/glass/bottle/bromine,
/obj/item/reagent_containers/glass/bottle/carbon,
+ /obj/item/reagent_containers/glass/bottle/chlorine,
+ /obj/item/reagent_containers/glass/bottle/copper,
+ /obj/item/reagent_containers/glass/bottle/ethanol,
+ /obj/item/reagent_containers/glass/bottle/fluorine,
+ /obj/item/reagent_containers/glass/bottle/hydrogen,
+ /obj/item/reagent_containers/glass/bottle/iodine,
+ /obj/item/reagent_containers/glass/bottle/lithium,
+ /obj/item/reagent_containers/glass/bottle/mercury,
/obj/item/reagent_containers/glass/bottle/nitrogen,
/obj/item/reagent_containers/glass/bottle/oxygen,
- /obj/item/reagent_containers/glass/bottle/fluorine,
/obj/item/reagent_containers/glass/bottle/phosphorus,
- /obj/item/reagent_containers/glass/bottle/silicon,
- /obj/item/reagent_containers/glass/bottle/chlorine,
- /obj/item/reagent_containers/glass/bottle/radium,
- /obj/item/reagent_containers/glass/bottle/sacid,
- /obj/item/reagent_containers/glass/bottle/ethanol,
/obj/item/reagent_containers/glass/bottle/potassium,
+ /obj/item/reagent_containers/glass/bottle/radium,
/obj/item/reagent_containers/glass/bottle/sugar,
+ /obj/item/reagent_containers/glass/bottle/sodium,
+ /obj/item/reagent_containers/glass/bottle/sulfur,
+ /obj/item/reagent_containers/glass/bottle/silicon,
/obj/item/reagent_scanner,
/obj/item/reagent_containers/dropper,
/obj/item/storage/box/beakers)
@@ -53,61 +60,96 @@
Bulk materials
*/
+/datum/supply_pack/chemistry/aluminium
+ name = "Bulk Aluminium Crate"
+ desc = "Contains a jug filled with 150u of aluminium."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/aluminium)
+ crate_name = "bulk aluminium crate"
+
+/datum/supply_pack/chemistry/bromine
+ name = "Bulk Bromine Crate"
+ desc = "Contains a jug filled with 150u of bromine."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/bromine)
+ crate_name = "bulk bromine crate"
+
/datum/supply_pack/chemistry/carbon
name = "Bulk Carbon Crate"
desc = "Contains a jug filled with 150u of carbon."
- cost = 500
+ cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/carbon)
crate_name = "bulk carbon crate"
-/datum/supply_pack/chemistry/oxygen
- name = "Bulk Oxygen Crate"
- desc = "Contains a jug filled with 150u of oxygen."
- cost = 500
- contains = list(/obj/item/reagent_containers/glass/chem_jug/oxygen)
- crate_name = "bulk oxygen crate"
+/datum/supply_pack/chemistry/chlorine
+ name = "Bulk Chlorine Crate"
+ desc = "Contains a jug filled with 150u of chlorine."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/chlorine)
+ crate_name = "bulk chlorine crate"
+
+/datum/supply_pack/chemistry/copper
+ name = "Bulk Copper Crate"
+ desc = "Contains a jug filled with 150u of copper."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/copper)
+ crate_name = "bulk copper crate"
+
+/datum/supply_pack/chemistry/fluorine
+ name = "Bulk Fluorine Crate"
+ desc = "Contains a jug filled with 150u of fluorine."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/fluorine)
+ crate_name = "bulk fluorine crate"
/datum/supply_pack/chemistry/hydrogen
name = "Bulk Hydrogen Crate"
desc = "Contains a jug filled with 150u of Hydrogen."
- cost = 500
+ cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/hydrogen)
crate_name = "bulk hydrogen crate"
+/datum/supply_pack/chemistry/iodine
+ name = "Bulk Iodine Crate"
+ desc = "Contains a jug filled with 150u of iodine."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/iodine)
+ crate_name = "bulk iodine crate"
+
+/datum/supply_pack/chemistry/lithium
+ name = "Bulk Lithium Crate"
+ desc = "Contains a jug filled with 150u of lithium."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/lithium)
+ crate_name = "bulk lithium crate"
+
+/datum/supply_pack/chemistry/mercury
+ name = "Bulk Mercury Crate"
+ desc = "Contains a jug filled with 150u of mercury."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/mercury)
+ crate_name = "bulk mercury crate"
+
/datum/supply_pack/chemistry/nitrogen
name = "Bulk Nitrogen Crate"
desc = "Contains a jug filled with 150u of nitrogen."
- cost = 625
+ cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/nitrogen)
crate_name = "bulk nitrogen crate"
-/datum/supply_pack/chemistry/aluminium
- name = "Bulk Aluminium Crate"
- desc = "Contains a jug filled with 150u of aluminium."
- cost = 625
- contains = list(/obj/item/reagent_containers/glass/chem_jug/aluminium)
- crate_name = "bulk aluminium crate"
-
-/datum/supply_pack/chemistry/copper
- name = "Bulk Copper Crate"
- desc = "Contains a jug filled with 150u of copper."
- cost = 625
- contains = list(/obj/item/reagent_containers/glass/chem_jug/copper)
- crate_name = "bulk copper crate"
-
-/datum/supply_pack/chemistry/bromine
- name = "Bulk Bromine Crate"
- desc = "Contains a jug filled with 150u of bromine."
- cost = 625
- contains = list(/obj/item/reagent_containers/glass/chem_jug/bromine)
- crate_name = "bulk bromine crate"
+/datum/supply_pack/chemistry/oxygen
+ name = "Bulk Oxygen Crate"
+ desc = "Contains a jug filled with 150u of oxygen."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/oxygen)
+ crate_name = "bulk oxygen crate"
-/datum/supply_pack/chemistry/iodine
- name = "Bulk Iodine Crate"
- desc = "Contains a jug filled with 150u of iodine."
+/datum/supply_pack/chemistry/phosphorus
+ name = "Bulk Phosphorus Crate"
+ desc = "Contains a jug filled with 150u of phosphorus."
cost = 750
- contains = list(/obj/item/reagent_containers/glass/chem_jug/iodine)
- crate_name = "bulk iodine crate"
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/phosphorus)
+ crate_name = "bulk phosphorus crate"
/datum/supply_pack/chemistry/potassium
name = "Bulk Potassium Crate"
@@ -116,23 +158,23 @@
contains = list(/obj/item/reagent_containers/glass/chem_jug/potassium)
crate_name = "bulk potassium crate"
+/datum/supply_pack/chemistry/radium
+ name = "Bulk Radium Crate"
+ desc = "Contains a jug filled with 150u of radium."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/radium)
+ crate_name = "bulk radium crate"
+
+/datum/supply_pack/chemistry/sodium
+ name = "Bulk Sodium Crate"
+ desc = "Contains a jug filled with 150u of sodium."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/chem_jug/sodium)
+ crate_name = "bulk sodium crate"
+
/datum/supply_pack/chemistry/sulfur
name = "Bulk Sulfur Crate"
desc = "Contains a jug filled with 150u of sulfur."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/sulfur)
crate_name = "bulk sulfur crate"
-
-/datum/supply_pack/chemistry/chlorine
- name = "Bulk Chlorine Crate"
- desc = "Contains a jug filled with 150u of chlorine."
- cost = 750
- contains = list(/obj/item/reagent_containers/glass/chem_jug/chlorine)
- crate_name = "bulk chlorine crate"
-
-/datum/supply_pack/chemistry/radium
- name = "Bulk Radium Crate"
- desc = "Contains a jug filled with 150u of radium."
- cost = 1000
- contains = list(/obj/item/reagent_containers/glass/chem_jug/radium)
- crate_name = "bulk radium crate"
diff --git a/code/modules/cargo/packs/civilian.dm b/code/modules/cargo/packs/civilian.dm
index 154dce436ee..9e0e8c7af6f 100644
--- a/code/modules/cargo/packs/civilian.dm
+++ b/code/modules/cargo/packs/civilian.dm
@@ -41,14 +41,6 @@
crate_name = "janitorial cart crate"
crate_type = /obj/structure/closet/crate/large
-/datum/supply_pack/civilian/lawnmower
- name = "Lawnmower"
- desc = "Removing plant from your backyard now made easy with the brand new Donk! Co. TM Deluxe Lawnmower 3003."
- cost = 800
- contains = list(/obj/vehicle/ridden/lawnmower)
- crate_name = "Donk! Co. TM Deluxe Lawnmower 3003"
- crate_type = /obj/structure/closet/crate/large
-
/*
Bundles
*/
@@ -86,10 +78,11 @@
contains = list(/obj/item/storage/box/fountainpens)
crate_name = "calligraphy crate"
crate_type = /obj/structure/closet/crate/wooden
+ faction = /datum/faction/solgov
/datum/supply_pack/civilian/wrapping_paper
name = "Festive Wrapping Paper Crate"
- desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, the Clown's severed head? You can do all that, with this crate full of wrapping paper."
+ desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, flattened flowers? You can do all that, with this crate full of wrapping paper."
cost = 1000
contains = list(/obj/item/stack/wrapping_paper)
crate_name = "festive wrapping paper crate"
@@ -97,7 +90,7 @@
/datum/supply_pack/civilian/paper
name = "Bureaucracy Crate"
- desc = "High stacks of papers on your desk Are a big problem - make it Pea-sized with these bureaucratic supplies! Contains six pens, some camera film, hand labeler supplies, a paper bin, a carbon paper bin, three folders, a laser pointer, two clipboards and two stamps."//that was too forced
+ desc = "High stacks of papers on your desk are a big problem - make it Pea-sized with these bureaucratic supplies! Contains six pens, some camera film, hand labeler supplies, a paper bin, a carbon paper bin, three folders, a laser pointer, two clipboards and two stamps."//that was too forced
cost = 1000
contains = list(/obj/structure/filingcabinet/chestdrawer/wheeled,
/obj/item/camera_film,
@@ -247,67 +240,3 @@
contains = list(/obj/machinery/jukebox)
crate_name = "Jukebox"
-/datum/supply_pack/civilian/fishingkit
- name = "Fishing Starter Kit"
- desc = "The bare necessities to get out there and catch some fish, all in one convenient box!"
- cost = 500
- contains = list(/obj/item/storage/toolbox/fishing,
- /obj/item/book/fish_catalog,
- /obj/item/reagent_containers/food/drinks/beer,
- /obj/item/reagent_containers/food/drinks/beer)
- crate_name = "fishing starter crate"
- crate_type = /obj/structure/closet/crate/wooden
-
-/datum/supply_pack/civilian/fishstasis
- name = "Fish Stasis Kit Supply Crate"
- desc = "Contains four stasis cases meant to keep fish alive during transportation."
- cost = 1000
- contains = list(/obj/item/storage/fish_case,
- /obj/item/storage/fish_case,
- /obj/item/storage/fish_case,
- /obj/item/storage/fish_case)
- crate_name = "stasis case crate"
-
-/datum/supply_pack/civilian/premiumworms
- name = "High Quality Worm Pack"
- desc = "A selection of the system's finest worms, guaranteed to lure in only the largest of fish."
- cost = 1000
- contains = list(/obj/item/bait_can/worm/premium,
- /obj/item/bait_can/worm/premium,
- /obj/item/bait_can/worm/premium,
- /obj/item/bait_can/worm/premium)
- crate_name = "premium worm crate"
-
-/datum/supply_pack/civilian/masterworkpole
- name = "Custom Made Masterwork Fishing Rod"
- desc = "Fishing rod forged after grueling hours of labor by a master rodsmith, truly a work of fishing art. Required to catch size 2 fish."
- cost = 5000
- contains = list(/obj/item/fishing_rod/master)
- crate_name = "masterwork fishing rod case"
- crate_type = /obj/structure/closet/crate/wooden
-
-/datum/supply_pack/civilian/fishinghooks
- name = "Fishing Hook Variety Pack"
- desc = "A variety of fishing hooks to allow for more specialized fishing."
- cost = 1000
- contains = list(/obj/item/storage/box/fishing_hooks)
- crate_name = "fishing hook crate"
- crate_type = /obj/structure/closet/crate/wooden
-
-/datum/supply_pack/civilian/fishinglines
- name = "Fishing Line Pack"
- desc = "Contains the necessary fishing lines for catching more exotic fish."
- cost = 1000
- contains = list(/obj/item/storage/box/fishing_lines,
- /obj/item/storage/box/fishing_lines) //Comes with two boxes on account of these being more necessary than the hooks
- crate_name = "fishing line crate"
- crate_type = /obj/structure/closet/crate/wooden
-
-/datum/supply_pack/civilian/aquarium
- name = "Aquarium Construction Kit"
- desc = "Why seek rare fish if not to show them off? This all-in-one aquarium kit's all you'll ever need to keep a stable population of fish onboard your ship! (Building materials not included, Aquatech Ltd. is a limited liability company and not responsible for any fish related mishaps)"
- cost = 2000
- contains = list(/obj/item/aquarium_kit,
- /obj/item/storage/box/aquarium_props,
- /obj/item/fish_feed)
- crate_name = "aquarium kit crate"
diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm
index fa63529b795..03d8cffd036 100644
--- a/code/modules/cargo/packs/costumes_toys.dm
+++ b/code/modules/cargo/packs/costumes_toys.dm
@@ -73,7 +73,7 @@
var/the_toy
for(var/i in 1 to 5)
if(prob(50))
- the_toy = pickweight(GLOB.arcade_prize_pool)
+ the_toy = pick_weight(GLOB.arcade_prize_pool)
else
the_toy = pick(subtypesof(/obj/item/toy/plush))
new the_toy(C)
@@ -84,21 +84,14 @@
/datum/supply_pack/costumes_toys/costume_original
name = "Original Costume Crate"
- desc = "Reenact Shakespearean plays with this assortment of outfits. Contains eight different costumes!"
+ desc = "Reenact Solarian plays with this assortment of outfits. Contains eight different costumes!"
cost = 1000
contains = list(/obj/item/clothing/head/snowman,
/obj/item/clothing/suit/snowman,
- /obj/item/clothing/head/chicken,
- /obj/item/clothing/suit/chickensuit,
/obj/item/clothing/mask/gas/monkeymask,
- /obj/item/clothing/suit/monkeysuit,
/obj/item/clothing/head/cardborg,
/obj/item/clothing/suit/cardborg,
- /obj/item/clothing/head/xenos,
- /obj/item/clothing/suit/xenos,
- /obj/item/clothing/suit/hooded/ian_costume,
- /obj/item/clothing/suit/hooded/carp_costume,
- /obj/item/clothing/suit/hooded/bee_costume)
+ /obj/item/clothing/suit/hooded/carp_costume)
crate_name = "original costume crate"
crate_type = /obj/structure/closet/crate/wooden
@@ -110,32 +103,21 @@
/datum/supply_pack/costumes_toys/mafia/fill(obj/structure/closet/crate/C)
for(var/i in 1 to 4)
- new /obj/effect/spawner/lootdrop/mafia_outfit(C)
+ new /obj/effect/spawner/random/clothing/mafia_outfit(C)
new /obj/item/virgin_mary(C)
if(prob(30)) //Not all mafioso have mustaches, some people also find this item annoying.
new /obj/item/clothing/mask/fakemoustache/italian(C)
if(prob(10)) //A little extra sugar every now and then to shake things up.
- new /obj/item/kitchen/knife/switchblade(C)
+ new /obj/item/melee/knife/switchblade(C)
/datum/supply_pack/costumes_toys/mech_suits
- name = "Mech Pilot's Suit Crate"
+ name = "Exosuit Pilot's Suit Crate"
desc = "Suits for piloting big robots. Contains all three colors!"
cost = 1500 //state-of-the-art technology doesn't come cheap
contains = list(/obj/item/clothing/under/costume/mech_suit,
/obj/item/clothing/under/costume/mech_suit/white,
/obj/item/clothing/under/costume/mech_suit/blue)
- crate_name = "mech pilot's suit crate"
- crate_type = /obj/structure/closet/crate/wooden
-
-/datum/supply_pack/costumes_toys/wizard
- name = "Wizard Costume Crate"
- desc = "Pretend to join the Wizard Federation with this full wizard outfit! As required by interstellar law, the seller reminds potential buyers that the Wizard Federation is not real and cannot hurt you."
- cost = 2000
- contains = list(/obj/item/staff,
- /obj/item/clothing/suit/wizrobe/fake,
- /obj/item/clothing/shoes/sandal,
- /obj/item/clothing/head/wizard/fake)
- crate_name = "wizard costume crate"
+ crate_name = "exosuit pilot's suit crate"
crate_type = /obj/structure/closet/crate/wooden
/datum/supply_pack/costumes_toys/formalwear
@@ -154,7 +136,6 @@
/obj/item/clothing/neck/tie/blue,
/obj/item/clothing/neck/tie/red,
/obj/item/clothing/neck/tie/black,
- /obj/item/clothing/head/bowler,
/obj/item/clothing/head/fedora,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/head/beret,
@@ -170,6 +151,7 @@
/obj/item/lipstick/random)
crate_name = "formalwear crate"
crate_type = /obj/structure/closet/crate/wooden
+ faction = /datum/faction/solgov
// this is technically armor but you aren't buying it for that. it's a joke pack so it goes here
/datum/supply_pack/costumes_toys/justiceinbound
@@ -177,7 +159,7 @@
desc = "This is it. The Bee's Knees. The Creme of the Crop. The Pick of the Litter. The best of the best of the best. The Crown Jewel of Nanotrasen. The Alpha and the Omega of security headwear. Guaranteed to strike fear into the hearts of each and every criminal unfortunate enough to hear its screeching wail bore into their soul. Also comes with a security gasmask."
cost = 6000 //justice comes at a price. An expensive, noisy price.
contains = list(/obj/item/clothing/head/helmet/justice,
- /obj/item/clothing/mask/gas/sechailer)
+ /obj/item/clothing/mask/gas)
crate_name = "security clothing crate"
/datum/supply_pack/costumes_toys/collectable_hats
@@ -185,7 +167,6 @@
desc = "Flaunt your status with three unique, highly-collectable hats!"
cost = 20000
contains = list(/obj/item/clothing/head/collectable/chef,
- /obj/item/clothing/head/collectable/paper,
/obj/item/clothing/head/collectable/tophat,
/obj/item/clothing/head/collectable/captain,
/obj/item/clothing/head/collectable/beret,
@@ -193,18 +174,11 @@
/obj/item/clothing/head/collectable/flatcap,
/obj/item/clothing/head/collectable/pirate,
/obj/item/clothing/head/collectable/kitty,
- /obj/item/clothing/head/collectable/rabbitears,
/obj/item/clothing/head/collectable/wizard,
/obj/item/clothing/head/collectable/hardhat,
- /obj/item/clothing/head/collectable/HoS,
- /obj/item/clothing/head/collectable/HoP,
/obj/item/clothing/head/collectable/thunderdome,
/obj/item/clothing/head/collectable/swat,
- /obj/item/clothing/head/collectable/slime,
- /obj/item/clothing/head/collectable/police,
- /obj/item/clothing/head/collectable/slime,
- /obj/item/clothing/head/collectable/xenom,
- /obj/item/clothing/head/collectable/petehat)
+ /obj/item/clothing/head/collectable/police)
crate_name = "collectable hats crate"
crate_type = /obj/structure/closet/crate/wooden
diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm
index 3627633bcb7..41401dbce47 100644
--- a/code/modules/cargo/packs/emergency.dm
+++ b/code/modules/cargo/packs/emergency.dm
@@ -8,25 +8,25 @@
/datum/supply_pack/emergency/internals
name = "Internals Crate"
- desc = "Two gas masks, two breathing masks, and four empty oxygen tanks of varying size. Oxygen canister sold separately."
- cost = 500
- contains = list(/obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
+ desc = "Contains four breathing masks, three advanced emergency oxygen tanks and one large oxygen tank. Oxygen canister sold separately."
+ cost = 100
+ contains = list(/obj/item/clothing/mask/breath,
+ /obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
/obj/item/clothing/mask/breath,
- /obj/item/tank/internals/emergency_oxygen/empty,
- /obj/item/tank/internals/emergency_oxygen/empty,
- /obj/item/tank/internals/oxygen/empty,
- /obj/item/tank/internals/oxygen/empty)
+ /obj/item/tank/internals/emergency_oxygen/engi,
+ /obj/item/tank/internals/emergency_oxygen/engi,
+ /obj/item/tank/internals/emergency_oxygen/engi,
+ /obj/item/tank/internals/oxygen)
crate_name = "internals crate"
/datum/supply_pack/emergency/plasmaman_tank
- name = "Plasmaman Tank Kit"
- desc = "Contains two empty plasmaman belt tanks, for when you just can't bear to refill a normal tank with plasma. Plasma canisters sold separately. Warranty void if filled with flammable gas."
- cost = 500
- contains = list(/obj/item/tank/internals/plasmaman/belt/empty,
- /obj/item/tank/internals/plasmaman/belt/empty)
- crate_name = "plasmaman tank kit"
+ name = "Plasmaman Internals Crate"
+ desc = "Contains two plasmaman belt tanks, for when you just can't bear to refill a normal tank with plasma. Plasma canisters sold separately."
+ cost = 100
+ contains = list(/obj/item/tank/internals/plasmaman/belt/full,
+ /obj/item/tank/internals/plasmaman/belt/full)
+ crate_name = "plasmaman internals crate"
/datum/supply_pack/emergency/plasmaman_suit
name = "Plasmaman Suit Kit"
diff --git a/code/modules/cargo/packs/exploration.dm b/code/modules/cargo/packs/exploration.dm
index 504b3b4bdbb..3a02f59c9b7 100644
--- a/code/modules/cargo/packs/exploration.dm
+++ b/code/modules/cargo/packs/exploration.dm
@@ -2,19 +2,15 @@
group = "Exploration"
crate_type = /obj/structure/closet/crate/wooden
-/*
- Basic survival kits for worlds.
-*/
+/* Exploration Gear */
/datum/supply_pack/exploration/lava
name = "Lava Exploration Kit"
- desc = "Contains two pickaxes, 60 lavaproof rods, and goggles to protect eyes from the heat"
- cost = 1500
+ desc = "Contains 60 lavaproof rods, two pocket extinguishers and goggles to protect yourself from the heat."
+ cost = 500
contains = list(
- /obj/item/pickaxe/mini,
- /obj/item/pickaxe/mini,
- /obj/item/clothing/glasses/heat,
- /obj/item/clothing/glasses/heat,
+ /obj/item/extinguisher/mini,
+ /obj/item/extinguisher/mini,
/obj/item/clothing/glasses/heat,
/obj/item/clothing/glasses/heat,
/obj/item/stack/rods/lava/thirty,
@@ -24,68 +20,88 @@
/datum/supply_pack/exploration/ice
name = "Ice Exploration Kit"
- desc = "Contains two pickaxes, winter clothes, and goggles to protect eyes from the cold"
- cost = 1500
+ desc = "Contains 2 sets of winter clothes and ice hiking boots, along with goggles to protect eyes from the cold."
+ cost = 500
contains = list(
- /obj/item/pickaxe/mini,
- /obj/item/pickaxe/mini,
- /obj/item/clothing/glasses/cold,
- /obj/item/clothing/glasses/cold,
/obj/item/clothing/glasses/cold,
/obj/item/clothing/glasses/cold,
- /obj/item/clothing/shoes/winterboots,
- /obj/item/clothing/shoes/winterboots,
- /obj/item/clothing/shoes/winterboots,
- /obj/item/clothing/shoes/winterboots,
+ /obj/item/clothing/suit/hooded/wintercoat,
+ /obj/item/clothing/suit/hooded/wintercoat,
+ /obj/item/clothing/shoes/winterboots/ice_boots,
+ /obj/item/clothing/shoes/winterboots/ice_boots,
)
crate_name = "Ice Exploration Kit"
-/datum/supply_pack/exploration/jungle
- name = "Jungle Exploration Kit"
- desc = "Contains hatchets, picks, and antivenom, great for dense jungles!"
- cost = 750
+
+/*
+ General Exploration Gear
+*/
+
+/datum/supply_pack/exploration/lavaproof_rods
+ name ="Lavaproof Rods Crate"
+ desc = "Contains 60 lavaproof rods for safely traversing molten pits."
+ cost = 200
contains = list(
- /obj/item/pickaxe/mini,
- /obj/item/pickaxe/mini,
- /obj/item/storage/pill_bottle/charcoal,
- /obj/item/storage/pill_bottle/charcoal,
- /obj/item/hatchet,
- )
- crate_name = "Jungle Exploration Kit"
+ /obj/item/stack/rods/lava/thirty,
+ /obj/item/stack/rods/lava/thirty,
+ )
+ crate_name = "Lavaproof Rod Crate"
-/datum/supply_pack/exploration/beach
- name = "Beach Kit"
- desc = "Shorts, picks, and (low quality) sunglasses, perfect for the beach!"
+/datum/supply_pack/exploration/capsules
+ name = "Bluespace Shelter Capsule"
+ desc = "Contains a Bluespace Shelter Capsule, for instant shelter in rough situations."
cost = 500
contains = list(
- /obj/item/pickaxe/mini,
- /obj/item/pickaxe/mini,
- /obj/item/clothing/under/shorts/black,
- /obj/item/clothing/under/shorts/blue,
- /obj/item/clothing/under/shorts/green,
- /obj/item/clothing/under/shorts/grey,
- /obj/item/clothing/under/shorts/purple,
- /obj/item/clothing/under/shorts/red,
- /obj/item/clothing/glasses/cheapsuns,
- /obj/item/clothing/glasses/cheapsuns,
- /obj/item/clothing/glasses/cheapsuns,
- /obj/item/clothing/glasses/cheapsuns,
- /obj/item/clothing/glasses/cheapsuns,
- /obj/item/clothing/glasses/cheapsuns,
+ /obj/item/survivalcapsule
)
- crate_name = "Beach Kit"
-/*
- Heavy Duty Exploration Gear
-*/
+/datum/supply_pack/exploration/binocular
+ name = "Binoculars"
+ desc = "Contains one pair of binoculars for surveying terrain."
+ cost = 200
+ contains = list(
+ /obj/item/binoculars
+ )
-/datum/supply_pack/exploration/capsules
- name = "Bluespace Shelter Capsules"
- desc = "A trio of Bluespace Shelter Capsules, for instant shelter in rough situations."
- cost = 3000
+/datum/supply_pack/exploration/anom_neutralizer
+ name = "Anomaly Neutralizer"
+ desc = "Contains a single use anomaly neutralizer for stabilizing hazardous anomalies."
+ cost = 250
+ contains = list(
+ /obj/item/anomaly_neutralizer
+ )
+
+/datum/supply_pack/exploration/mineral_scanner
+ name = "Underground Mineral Scanner"
+ desc = "Contains an underground mineral scanner for locating veins of ore beneath the earth. Deep core laser drill for extracting said ores not included."
+ cost = 250
contains = list(
- /obj/item/survivalcapsule,
- /obj/item/survivalcapsule,
- /obj/item/survivalcapsule,
+ /obj/item/pinpointer/mineral
)
+/datum/supply_pack/exploration/gps
+ name = "GPS"
+ desc = "Contains a GPS device, useful for keeping track of yourself and others."
+ cost = 100
+ contains = list(
+ /obj/item/gps
+ )
+
+/datum/supply_pack/exploration/flares
+ name = "Flare Supply Pack"
+ desc = "Contains 4 boxes of flares (28 total)! Great for lighting things up."
+ cost = 100
+ contains = list(
+ /obj/item/storage/box/flares,
+ /obj/item/storage/box/flares,
+ /obj/item/storage/box/flares,
+ /obj/item/storage/box/flares,
+ )
+
+/datum/supply_pack/exploration/nvg
+ name = "Night Vision Goggles"
+ desc = "Contains a singular pair of Night Vision Goggles, for all your spelunking and military LARP occasions."
+ cost = 1000
+ contains = list(
+ /obj/item/clothing/glasses/night
+ )
diff --git a/code/modules/cargo/packs/fishing.dm b/code/modules/cargo/packs/fishing.dm
new file mode 100644
index 00000000000..7f1a8c279bc
--- /dev/null
+++ b/code/modules/cargo/packs/fishing.dm
@@ -0,0 +1,68 @@
+/datum/supply_pack/fish
+ group = "Fishing Essentials"
+
+
+/datum/supply_pack/fish/fishingkit
+ name = "Fishing Starter Kit"
+ desc = "The bare necessities to get out there and catch some fish, all in one convenient box!"
+ cost = 500
+ contains = list(/obj/item/storage/toolbox/fishing,
+ /obj/item/book/fish_catalog,
+ /obj/item/reagent_containers/food/drinks/beer,
+ /obj/item/reagent_containers/food/drinks/beer)
+ crate_name = "fishing starter crate"
+ crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/fish/fishstasis
+ name = "Fish Stasis Kit Supply Crate"
+ desc = "Contains four stasis cases meant to keep fish alive during transportation."
+ cost = 1000
+ contains = list(/obj/item/storage/fish_case,
+ /obj/item/storage/fish_case,
+ /obj/item/storage/fish_case,
+ /obj/item/storage/fish_case)
+ crate_name = "stasis case crate"
+
+/datum/supply_pack/fish/premiumworms
+ name = "High Quality Worm Pack"
+ desc = "A selection of the system's finest worms, guaranteed to lure in only the largest of fish."
+ cost = 1000
+ contains = list(/obj/item/bait_can/worm/premium,
+ /obj/item/bait_can/worm/premium,
+ /obj/item/bait_can/worm/premium,
+ /obj/item/bait_can/worm/premium)
+ crate_name = "premium worm crate"
+
+/datum/supply_pack/fish/masterworkpole
+ name = "Custom Made Masterwork Fishing Rod"
+ desc = "Fishing rod forged after grueling hours of labor by a master rodsmith, truly a work of fishing art. Required to catch size 2 fish."
+ cost = 5000
+ contains = list(/obj/item/fishing_rod/master)
+ crate_name = "masterwork fishing rod case"
+ crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/fish/fishinghooks
+ name = "Fishing Hook Variety Pack"
+ desc = "A variety of fishing hooks to allow for more specialized fishing."
+ cost = 1000
+ contains = list(/obj/item/storage/box/fishing_hooks)
+ crate_name = "fishing hook crate"
+ crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/fish/fishinglines
+ name = "Fishing Line Pack"
+ desc = "Contains the necessary fishing lines for catching more exotic fish."
+ cost = 1000
+ contains = list(/obj/item/storage/box/fishing_lines,
+ /obj/item/storage/box/fishing_lines) //Comes with two boxes on account of these being more necessary than the hooks
+ crate_name = "fishing line crate"
+ crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/fish/aquarium
+ name = "Aquarium Construction Kit"
+ desc = "Why seek rare fish if not to show them off? This all-in-one aquarium kit's all you'll ever need to keep a stable population of fish onboard your ship! (Building materials not included, Aquatech Ltd. is a limited liability company and not responsible for any fish related mishaps)"
+ cost = 2000
+ contains = list(/obj/item/aquarium_kit,
+ /obj/item/storage/box/aquarium_props,
+ /obj/item/fish_feed)
+ crate_name = "aquarium kit crate"
diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm
index 7abc0188f9d..1661e4a6637 100644
--- a/code/modules/cargo/packs/food.dm
+++ b/code/modules/cargo/packs/food.dm
@@ -8,7 +8,7 @@
/datum/supply_pack/food/donkpockets
name = "Donk Pocket Variety Crate"
desc = "Featuring a line up of Donk Co.'s most popular pastry!"
- cost = 2000
+ cost = 500
contains = list(/obj/item/storage/box/donkpockets/donkpocketspicy,
/obj/item/storage/box/donkpockets/donkpocketteriyaki,
/obj/item/storage/box/donkpockets/donkpocketpizza,
@@ -16,6 +16,7 @@
/obj/item/storage/box/donkpockets/donkpockethonk)
crate_name = "donk pocket crate"
crate_type = /obj/structure/closet/crate/freezer
+ faction = /datum/faction/syndicate
/datum/supply_pack/food/donkpockets/fill(obj/structure/closet/crate/C)
for(var/i in 1 to 3)
@@ -25,7 +26,7 @@
/datum/supply_pack/food/pizza
name = "Pizza Crate"
desc = "Best prices on this side of the galaxy. All deliveries are guaranteed to be 99.5% anomaly-free!"
- cost = 6000 // Best prices this side of the galaxy.
+ cost = 750// Best prices this side of the galaxy.
contains = list(/obj/item/pizzabox/margherita,
/obj/item/pizzabox/mushroom,
/obj/item/pizzabox/meat,
@@ -42,6 +43,19 @@
fourfiveeight.boxtag = P.boxtag
qdel(P)
+/datum/supply_pack/food/ration
+ name = "Ration Crate"
+ desc = "6 standard issue rations. For your inner jarhead."
+ cost = 500
+ contains = list(/obj/effect/spawner/random/food_or_drink/ration,
+ /obj/effect/spawner/random/food_or_drink/ration,
+ /obj/effect/spawner/random/food_or_drink/ration,
+ /obj/effect/spawner/random/food_or_drink/ration,
+ /obj/effect/spawner/random/food_or_drink/ration,
+ /obj/effect/spawner/random/food_or_drink/ration)
+ crate_name = "ration crate"
+ crate_type = /obj/structure/closet/crate
+
/*
Ingredients
*/
@@ -49,13 +63,13 @@
/datum/supply_pack/food/ingredients_basic
name = "Basic Ingredients Crate"
desc = "Get things cooking with this crate full of useful ingredients! Contains a dozen eggs, two slabs of meat, some flour, some rice, a bottle of milk, a bottle of soymilk, and a bag of sugar."
- cost = 1000
- contains = list(/obj/item/reagent_containers/food/condiment/flour,
- /obj/item/reagent_containers/food/condiment/flour,
- /obj/item/reagent_containers/food/condiment/rice,
- /obj/item/reagent_containers/food/condiment/milk,
- /obj/item/reagent_containers/food/condiment/soymilk,
- /obj/item/reagent_containers/food/condiment/sugar,
+ cost = 300
+ contains = list(/obj/item/reagent_containers/condiment/flour,
+ /obj/item/reagent_containers/condiment/flour,
+ /obj/item/reagent_containers/condiment/rice,
+ /obj/item/reagent_containers/condiment/milk,
+ /obj/item/reagent_containers/condiment/soymilk,
+ /obj/item/reagent_containers/condiment/sugar,
/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/meat/slab
@@ -63,24 +77,25 @@
crate_name = "food crate"
crate_type = /obj/structure/closet/crate/freezer
-/datum/supply_pack/food/ingredients_specialized
- name = "Advanced Cooking Crate"
- desc = "For the discerning chef. Contains a bottle of enzyme, a salt shaker, a pepper mill, a bottle of ketchup, a bottle of hot sauce, and a bottle of cream."
- cost = 2000
- contains = list(/obj/item/reagent_containers/food/condiment/enzyme,
- /obj/item/reagent_containers/food/condiment/saltshaker,
- /obj/item/reagent_containers/food/condiment/peppermill,
- /obj/item/reagent_containers/food/condiment/ketchup,
- /obj/item/reagent_containers/food/condiment/hotsauce,
- /obj/item/reagent_containers/food/drinks/bottle/cream
+/datum/supply_pack/food/ingredients_condiments
+ name = "Condiments Crate"
+ desc = "A variety of garnishes for topping off your dish with a little extra pizzaz. Contains a bottle of enzyme, a salt shaker, a pepper mill, a bottle of ketchup, a bottle of hot sauce, a bottle of BBQ sauce, and a bottle of cream."
+ cost = 250
+ contains = list(/obj/item/reagent_containers/condiment/enzyme,
+ /obj/item/reagent_containers/condiment/saltshaker,
+ /obj/item/reagent_containers/condiment/peppermill,
+ /obj/item/reagent_containers/condiment/ketchup,
+ /obj/item/reagent_containers/condiment/hotsauce,
+ /obj/item/reagent_containers/food/drinks/bottle/cream,
+ /obj/item/reagent_containers/condiment/bbqsauce
)
crate_name = "condiments crate"
crate_type = /obj/structure/closet/crate/freezer
/datum/supply_pack/food/ingredients_randomized
name = "Exotic Meat Crate"
- desc = "The best cuts in the whole galaxy. Probably."
- cost = 1000
+ desc = "The best cuts in the whole sector. Probably."
+ cost = 500
contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime,
/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
/obj/item/reagent_containers/food/snacks/meat/slab/bear,
@@ -102,8 +117,8 @@
/datum/supply_pack/food/ingredients_randomized/meat
name = "Standard Meat Crate"
- desc = "Less interesting cuts of meat, but filling nonetheless."
- cost = 1500
+ desc = "Less interesting, yet filling cuts of meat."
+ cost = 300
contains = list(/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/meat/slab/chicken,
/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat,
@@ -115,8 +130,8 @@
/datum/supply_pack/food/ingredients_randomized/vegetables
name = "Vegetables Crate"
- desc = "Grown in vats."
- cost = 1300
+ desc = "Grown in the finest hydroponic vats."
+ cost = 250
contains = list(/obj/item/reagent_containers/food/snacks/grown/chili,
/obj/item/reagent_containers/food/snacks/grown/corn,
/obj/item/reagent_containers/food/snacks/grown/tomato,
@@ -132,7 +147,7 @@
/datum/supply_pack/food/ingredients_randomized/fruits
name = "Fruit Crate"
desc = "Rich of vitamins, may contain oranges."
- cost = 1500
+ cost = 250
contains = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lime,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
/obj/item/reagent_containers/food/snacks/grown/citrus/lemon,
@@ -147,7 +162,7 @@
/datum/supply_pack/food/ingredients_randomized/grains
name = "Grains Crate"
desc = "A crate full of various grains. How interesting."
- cost = 1000
+ cost = 250
contains = list(/obj/item/reagent_containers/food/snacks/grown/wheat,
/obj/item/reagent_containers/food/snacks/grown/wheat,
/obj/item/reagent_containers/food/snacks/grown/wheat, //Weighted to be more common
@@ -162,11 +177,11 @@
/datum/supply_pack/food/ingredients_randomized/bread
name = "Bread Crate"
desc = "A crate full of various breads. Bready to either be eaten or made into delicious meals."
- cost = 1000
- contains = list(/obj/item/reagent_containers/food/snacks/store/bread/plain,
- /obj/item/reagent_containers/food/snacks/breadslice/plain,
- /obj/item/reagent_containers/food/snacks/breadslice/plain,
- /obj/item/reagent_containers/food/snacks/breadslice/plain, //Weighted to be more common
+ cost = 300
+ contains = list(/obj/item/food/bread/plain,
+ /obj/item/food/breadslice/plain,
+ /obj/item/food/breadslice/plain,
+ /obj/item/food/breadslice/plain, //Weighted to be more common
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/reagent_containers/food/snacks/tortilla,
/obj/item/reagent_containers/food/snacks/pizzabread
@@ -174,6 +189,17 @@
crate_name = "food crate"
crate_type = /obj/structure/closet/crate/freezer
+/datum/supply_pack/food/sugar
+ name = "Sugar Crate"
+ desc = "A crate with a few bags of sugar. Good for cake shops and amateur chemists."
+ cost = 500
+ contains = list(/obj/item/reagent_containers/condiment/sugar,
+ /obj/item/reagent_containers/condiment/sugar,
+ /obj/item/reagent_containers/condiment/sugar
+ )
+ crate_name = "sugar crate"
+ crate_type = /obj/structure/closet/crate
+
/*
Cooking
*/
@@ -181,17 +207,16 @@
/datum/supply_pack/food/grill
name = "Grilling Starter Kit"
desc = "Sometimes the stresses of the world are too much to bear. Some times, for God's sake, you just want to grill. This crate is for those times."
- cost = 5000
+ cost = 1000
contains = list(/obj/item/stack/sheet/mineral/coal/five,
- /obj/machinery/grill/unwrenched,
- /obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy)
+ /obj/machinery/grill/unwrenched)
crate_name = "grilling starter kit crate"
crate_type = /obj/structure/closet/crate/large
/datum/supply_pack/food/grillfuel
name = "Grilling Fuel Kit"
desc = "Contains propane and propane accessories. (Note: doesn't contain any actual propane.)"
- cost = 2000
+ cost = 250
contains = list(/obj/item/stack/sheet/mineral/coal/ten)
crate_name = "grilling fuel kit crate"
@@ -202,7 +227,7 @@
/datum/supply_pack/food/hydrotank
name = "Hydroponics Backpack Crate"
desc = "Bring on the flood with this high-capacity backpack crate. Contains 500 units of life-giving H2O."
- cost = 1000
+ cost = 750
contains = list(/obj/item/watertank)
crate_name = "hydroponics backpack crate"
crate_type = /obj/structure/closet/crate/hydroponics
@@ -210,7 +235,7 @@
/datum/supply_pack/food/gardening
name = "Gardening Crate"
desc = "Supplies for growing a great garden! Contains two bottles of ammonia, two Plant-B-Gone spray bottles, a hatchet, cultivator, plant analyzer, as well as a pair of leather gloves and a botanist's apron."
- cost = 1500
+ cost = 500
contains = list(/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/glass/bottle/ammonia,
@@ -224,10 +249,23 @@
crate_name = "gardening crate"
crate_type = /obj/structure/closet/crate/hydroponics
+/datum/supply_pack/food/ethanol
+ name = "Ethanol Crate"
+ desc = "Five small bottles of ethanol for the aspiring botanist or amateur chemist."
+ cost = 750
+ contains = list(/obj/item/reagent_containers/glass/bottle/ethanol,
+ /obj/item/reagent_containers/glass/bottle/ethanol,
+ /obj/item/reagent_containers/glass/bottle/ethanol,
+ /obj/item/reagent_containers/glass/bottle/ethanol,
+ /obj/item/reagent_containers/glass/bottle/ethanol
+ )
+ crate_name = "gardening crate"
+ crate_type = /obj/structure/closet/crate/hydroponics
+
/datum/supply_pack/food/weedcontrol
name = "Weed Control Crate"
desc = "Contains a scythe, gasmask, and two anti-weed defoliant grenades, for when your garden grows out of control."
- cost = 1500
+ cost = 750
contains = list(/obj/item/scythe,
/obj/item/clothing/mask/gas,
/obj/item/grenade/chem_grenade/antiweed,
@@ -238,7 +276,7 @@
/datum/supply_pack/food/seeds
name = "Seeds Crate"
desc = "Big things have small beginnings. Contains fourteen different seeds."
- cost = 2000
+ cost = 750
contains = list(/obj/item/seeds/chili,
/obj/item/seeds/cotton,
/obj/item/seeds/berry,
@@ -259,7 +297,7 @@
/datum/supply_pack/food/exoticseeds
name = "Exotic Seeds Crate"
desc = "Any entrepreneuring botanist's dream. Contains eleven different seeds, including two mystery seeds!"
- cost = 3000
+ cost = 1000
contains = list(/obj/item/seeds/nettle,
/obj/item/seeds/plump,
/obj/item/seeds/liberty,
@@ -281,7 +319,7 @@
/datum/supply_pack/food/beekeeping_suits
name = "Beekeeper Suit Crate"
desc = "Bee business booming? Better be benevolent and boost botany by bestowing bi-Beekeeper-suits! Contains two beekeeper suits and matching headwear."
- cost = 2000
+ cost = 1000
contains = list(/obj/item/clothing/head/beekeeper_head,
/obj/item/clothing/suit/beekeeper_suit,
/obj/item/clothing/head/beekeeper_head,
@@ -292,7 +330,7 @@
/datum/supply_pack/food/beekeeping_fullkit
name = "Beekeeping Starter Crate"
desc = "BEES BEES BEES. Contains three honey frames, a beekeeper suit and helmet, flyswatter, bee house, and, of course, a pure-bred Nanotrasen-Standardized Queen Bee!"
- cost = 3000
+ cost = 2000
contains = list(/obj/structure/beebox/unwrenched,
/obj/item/honey_frame,
/obj/item/honey_frame,
@@ -303,17 +341,3 @@
/obj/item/melee/flyswatter)
crate_name = "beekeeping starter crate"
crate_type = /obj/structure/closet/crate/hydroponics
-
-/datum/supply_pack/food/ration
- name = "Ration Crate"
- desc = "6 standerd issue rations."
- cost = 2000
- contains = list(/obj/effect/spawner/lootdrop/ration,
- /obj/effect/spawner/lootdrop/ration,
- /obj/effect/spawner/lootdrop/ration,
- /obj/effect/spawner/lootdrop/ration,
- /obj/effect/spawner/lootdrop/ration,
- /obj/effect/spawner/lootdrop/ration)
- crate_name = "ration crate"
- crate_type = /obj/structure/closet/crate
-
diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm
index 297949344de..e9e95f9fbb7 100644
--- a/code/modules/cargo/packs/gun.dm
+++ b/code/modules/cargo/packs/gun.dm
@@ -1,6 +1,7 @@
/datum/supply_pack/gun
group = "Guns"
crate_type = /obj/structure/closet/crate/secure/weapon
+ faction_discount = 10
/*
Pistols
@@ -10,7 +11,7 @@
name = "Disposable Gun Crate"
desc = "In some sectors, these disposable pistols are the only firearms that can be legally sold for less than 200cr. That price is still far too high."
cost = 300
- contains = list(/obj/item/storage/pistolcase/disposable)
+ contains = list(/obj/item/storage/guncase/pistol/disposable)
crate_name = "disposable gun crate"
/datum/supply_pack/gun/disposablebulk
@@ -40,26 +41,92 @@
name = ".38 Derringer Crate"
desc = "A cheap, concealable pistol manufactured by the reputable Hunter's Pride. At least it's better than a disposable pistol. Chambered in .38 rounds."
cost = 350
- contains = list(/obj/item/storage/pistolcase/derringer)
+ contains = list(/obj/item/storage/guncase/pistol/derringer)
crate_name = "derringer crate"
+ faction = /datum/faction/srm
+
+/datum/supply_pack/gun/m17
+ name = "M17 pistol Crate"
+ desc = "A cheap target shooting pistol manufactured by Serene Outdoors. Chambered in .22lr"
+ cost = 400
+ contains = list(/obj/item/storage/guncase/pistol/m17)
+ crate_name = "pistol crate"
/datum/supply_pack/gun/commanders
name = "Commander Pistol Crate"
- desc = "Contains a modified Candor 'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
+ desc = "Contains a double stacked Commander pistol, produced by Nanotrasen along with Vigilitas Interstellar and is chambered in 9mm."
cost = 750
- contains = list(/obj/item/storage/pistolcase/commander)
+ contains = list(/obj/item/storage/guncase/pistol/commander)
+ faction = /datum/faction/nt
+ faction_discount = 20
+
+/datum/supply_pack/gun/ringneck
+ name = "Ringneck Pistol Crate"
+ desc = "Contains a civilian variant of the Ringneck pistol, produced by Scarborough Arms and chambered in 10mm."
+ cost = 1000
+ contains = list(/obj/item/storage/guncase/pistol/ringneck)
+ faction = /datum/faction/syndicate/scarborough_arms
-/datum/supply_pack/gun/makarovs
- name = "Stechkin Pistol Crate"
- desc = "Contains a concealable stechkin pistol, produced by Scarborough Arms and chambered in 10mm."
+/datum/supply_pack/gun/cm23
+ name = "CM-23 Pistol Crate"
+ desc = "Contains a 10mm CM-23 Pistol, standard issue of the Colonial Minutemen."
cost = 1000
- contains = list(/obj/item/storage/pistolcase/stechkin)
+ contains = list(/obj/item/storage/guncase/pistol/cm23)
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/cm70
+ name = "CM-70 Machinepistol Crate"
+ desc = "Contains a 9mm machinepistol produced proudly within Lanchester City. Colonial Minuteman issue only."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/pistol/cm70)
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/commissioner
+ name = "Commissioner Pistol Crate"
+ desc = "Contains a modified Commander pistol, adjusted to fit the IRMG's standards and painted in the brown and gold of all IRMG firearms."
+ cost = 750
+ contains = list(/obj/item/storage/guncase/commissioner)
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
/datum/supply_pack/gun/candors
name = "Candor Pistol Crate"
desc = "Contains a Candor pistol, the trusty sidearm of any spacer. Produced by Hephaestus Industries and chambered in .45 ACP."
cost = 1000
- contains = list(/obj/item/storage/pistolcase/candor)
+ contains = list(/obj/item/storage/guncase/pistol/candor)
+ faction = /datum/faction/srm
+
+/datum/supply_pack/gun/asp
+ name = "BC-81 'Asp' Crate"
+ desc = "Contains a compact armor-piercing sidearm, chambered in 5.7mm"
+ cost = 1250
+ contains = list(/obj/item/storage/guncase/pistol/asp)
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/pistolec
+ name = "Pistole 'C' Crate"
+ desc = "Contains a compact solarian-produced sidearm, chambered in 5.56mm HITP. Not to be confused with 5.56x42 CLIP."
+ cost = 1000
+ contains = list(/obj/item/storage/guncase/pistol/pistolec)
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/pistolec
+ name = "Model 'H' Gauss Pistol Crate"
+ desc = "Contains a compact solarian-produced gauss pistol, chambered in ferromagnetic slugs. Remember to sign your necessary forms upon arrival."
+ cost = 2000
+ contains = list(/obj/item/storage/guncase/pistol/modelh)
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
/datum/supply_pack/gun/candorsnew
name = "Candor Pistol Crate"
@@ -71,19 +138,22 @@
name = "HP Firebrand Pepperbox Revolver Crate"
desc = "Contains a concealable pepperbox revolver manufactured by Hunter's Pride and chambered in .357."
cost = 1250
- contains = list(/obj/item/storage/pistolcase/firebrand)
+ contains = list(/obj/item/storage/guncase/pistol/firebrand)
+ faction = /datum/faction/srm
/datum/supply_pack/gun/detrevolver
name = "Detective Revolver Crate"
desc = "Contains a concealable revolver favored by Solarian systems, chambered in .38."
cost = 600
- contains = list(/obj/item/storage/pistolcase/detective)
+ contains = list(/obj/item/storage/guncase/pistol/detective)
+ faction = /datum/faction/srm
/datum/supply_pack/gun/shadowrevolver
name = "Shadow Revolver Crate"
desc = "Contains a concealable Shadow revolver, chambered in .44 Roumain."
cost = 1000
- contains = list(/obj/item/storage/pistolcase/shadow)
+ contains = list(/obj/item/storage/guncase/pistol/shadow)
+ faction = /datum/faction/srm
/datum/supply_pack/gun/cobra20
name = "Cobra-20 SMG Crate"
@@ -92,6 +162,41 @@
contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
crate_name = "SMG crate"
+/datum/supply_pack/gun/viperrevolver
+ name = "Viper-23 Revolver Crate"
+ desc = "Contains a civilian variant of the Viper revolver, chambered in .357 magnum."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/pistol/viper)
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 5
+
+/datum/supply_pack/gun/a357
+ name = "R-23 'Viper' Revolver Crate"
+ desc = "Contains a double-action military variant of the Viper revolver, chambered in .357 magnum."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/pistol/a357)
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/ashhand
+ name = "Ashhand Hunting Revolver Crate"
+ desc = "Contains a single-action .45-70 hunting revolver manufactured by Hunter's Pride for use against the biggest game."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/pistol/ashhand)
+ faction = /datum/faction/srm
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/cm357
+ name = "CM-357 Automag Pistol Crate"
+ desc = "Contains a magazine-fed .357 handgun, produced for the CMM-BARD division and available for requisition in small numbers to the Minutemen."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/pistol/cm357)
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
/*
Energy
*/
@@ -100,45 +205,87 @@
name = "Laser Gun Crate"
desc = "Contains a lethal, high-energy laser gun."
cost = 1000
- contains = list(/obj/item/storage/pistolcase/laser)
+ contains = list(/obj/item/storage/guncase/energy/laser)
crate_name = "laser crate"
+ faction = /datum/faction/nt
/datum/supply_pack/gun/mini_energy
name = "Mini Energy Gun Crate"
desc = "Contains a small, versatile energy gun, capable of firing both nonlethal and lethal blasts, but with a limited power cell."
cost = 500
- contains = list(/obj/item/storage/pistolcase/miniegun)
+ contains = list(/obj/item/storage/guncase/pistol/miniegun)
crate_name = "laser crate"
+ faction_discount = 20
+ faction = /datum/faction/nt
/datum/supply_pack/gun/energy
name = "Energy Gun Crate"
desc = "Contains a versatile energy gun, capable of firing both nonlethal and lethal blasts of light."
cost = 1250
- contains = list(/obj/item/storage/pistolcase/egun)
+ contains = list(/obj/item/storage/guncase/energy/egun)
crate_name = "energy gun crate"
crate_type = /obj/structure/closet/crate/secure/plasma
+ faction = /datum/faction/nt
+
+/datum/supply_pack/gun/scatterlaser
+ name = "Scatter Laser Crate"
+ desc = "Contains a multi-function scatter energy gun, capable of firing armour penetrating slugs, and devastating scattered laser bolts."
+ cost = 1250
+ contains = list(/obj/item/gun/energy/laser/scatter)
+ crate_name = "scatter laser crate"
/datum/supply_pack/gun/ion
name = "Ion Rifle Crate"
desc = "Contains a single Mk.I Ion Projector, a special anti-tank rifle designed to disable electronic threats at range."
cost = 10000
- contains = list(/obj/item/storage/pistolcase/iongun)
+ contains = list(/obj/item/storage/guncase/energy/iongun)
crate_name = "ion rifle crate"
crate_type = /obj/structure/closet/crate/secure/plasma
+ faction = /datum/faction/nt
/datum/supply_pack/gun/laser/kalix/pistol
name = "Etherbor SG-8 Beam Pistol Crate"
desc = "Contains a single SG-8 Beam Pistol, a civilian-grade sidearm developed in Epsilon Eridani, manufactured by Etherbor Industries."
cost = 1000
- contains = list(/obj/item/storage/pistolcase/kalixpistol)
+ contains = list(/obj/item/storage/guncase/pistol/kalixpistol)
crate_name = "beam pistol crate"
+ faction = /datum/faction/pgf
/datum/supply_pack/gun/laser/kalix
name = "Etherbor BG-12 Beam Rifle Crate"
desc = "Contains a single BG-12 Beam Rifle, a civilian-grade semi-automatic developed in Epsilon Eridani, manufactured by Etherbor Industries."
cost = 3000
- contains = list(/obj/item/storage/guncase/kalixrifle)
+ contains = list(/obj/item/storage/guncase/energy/kalixrifle)
crate_name = "beam rifle crate"
+ faction = /datum/faction/pgf
+
+/datum/supply_pack/gun/laser/bg16
+ name = "Etherbor BG-16 Beam Rifle Crate"
+ desc = "Contains a single BG-16 Beam Rifle, a military-grade automatic developed in the PGF and manufactured by Etherbor Industries for use within the Marine Corps."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/energy/bg16)
+ crate_name = "beam rifle crate"
+ faction = /datum/faction/pgf
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/energy/disabler
+ name = "Disabler Crate"
+ desc = "One stamina-draining disabler weapon, for use in non-lethal pacification."
+ cost = 1000
+ contains = list(/obj/item/gun/energy/disabler)
+ crate_name = "disabler crate"
+ faction = /datum/faction/nt
+
+/datum/supply_pack/gun/energy/taser
+ name = "Hybrid Taser Crate"
+ desc = "Contains one disabler-taser hybrid weapon."
+ cost = 1250
+ contains = list(/obj/item/gun/energy/e_gun/advtaser)
+ crate_name = "hybrid taser crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
/*
Shotguns
@@ -149,32 +296,226 @@
desc = "For when you need to deal with 2 drunkards the old-fashioned way. Contains a double-barreled shotgun, favored by Bartenders. Warranty voided if sawed off."
cost = 1000
contains = list(/obj/item/storage/guncase/doublebarrel)
- crate_name = "shotguns crate"
+ crate_name = "shotgun crate"
+ faction = /datum/faction/srm
+
+/datum/supply_pack/gun/conflagration
+ name = "Conflagration Lever Action Shotgun Crate"
+ desc = "For when you need to deal with 6 hooligans and look good doing it. Contains one lever-action shotgun, with a 6 round capacity."
+ cost = 1500
+ contains = list(/obj/item/storage/guncase/conflagration)
+ crate_name = "shotgun crate"
+ faction = /datum/faction/srm
/datum/supply_pack/gun/hellfire_shotgun
name = "Hellfire Shotgun Crate"
desc = "For when you need to deal with 8 hooligans. Contains a pump shotgun, with a 8-round capacity."
cost = 2000
- contains = list(/obj/item/gun/ballistic/shotgun/hellfire)
+ contains = list(/obj/item/storage/guncase/hellfire)
crate_name = "shotgun crate"
+ faction = /datum/faction/srm
/datum/supply_pack/gun/brimstone_shotgun
name = "Brimstone Shotgun Crate"
desc = "For when you need to deal with 5 hooligans, and QUICKLY. Contains a slamfire shotgun, with a 5-round capacity. Warranty voided if sawed off."
cost = 2000
- contains = list(/obj/item/gun/ballistic/shotgun/brimstone)
+ contains = list(/obj/item/storage/guncase/brimstone)
+ crate_name = "shotgun crate"
+ faction = /datum/faction/srm
+
+/datum/supply_pack/gun/buckmaster
+ name = "Buckmaster Shotgun Crate"
+ desc = "For when you need to deal with 8 hooligans and can't be arsed to pump. Contains a semi-auto shotgun with an 8 round tube."
+ contains = list(/obj/item/storage/guncase/buckmaster)
+ cost = 3000
crate_name = "shotgun crate"
+/datum/supply_pack/gun/bulldog
+ name = "Bulldog Shotgun Crate"
+ desc = "An automatic shotgun chambered in 12ga produced by Scarborough Arms for exclusive use by licensed buyers. Comes with 8-round box magazines."
+ contains = list(/obj/item/storage/guncase/bulldog)
+ cost = 4000
+ crate_name = "shotgun crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/mastiff
+ name = "Mastiff Shotgun Crate"
+ desc = "An automatic shotgun modified for exclusive use by the IRMG and chambered in 12ga. Comes with 8-round box magazines."
+ contains = list(/obj/item/storage/guncase/mastiff)
+ cost = 4000
+ crate_name = "shotgun crate"
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/cm15
+ name = "CM-15 Shotgun Crate"
+ desc = "A combat shotgun produced by Lanchester Arms Co. for the Colonial Minuteman and CMM-BARD for use in CQC operations. Chambered in 12ga and equipped with 8-round box magazines."
+ contains = list(/obj/item/storage/guncase/cm15)
+ cost = 4000
+ crate_name = "shotgun crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/ultima
+ name = "E-SG 500 Energy Shotgun Crate"
+ desc = "Contains an energy-based shotgun equipped with dual kill/disable modes, ideal for short range. The on-board computer is notoriously unreliable. For NT employee use only."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/energy/ultima)
+ crate_name = "shotgun crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/*
+ SMGs
+*/
+
+/datum/supply_pack/gun/cobra20
+ name = "Cobra-20 SMG Crate"
+ desc = "Contains a civilian variant of the Cobra SMG, manufactured by Scaraborough Arms and chambered in .45"
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/cobra)
+ crate_name = "SMG crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 10
+
+/datum/supply_pack/gun/vector
+ name = "Vector SMG Crate"
+ desc = "Contains a Vector PDW produced by Sharplite Defense and chambered in 9mm."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/vector)
+ crate_name = "SMG crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/mongrel
+ name = "SKM-44v Mongrel SMG Crate"
+ desc = "Contains a shortened variant of the SKM rechambered to 10mm and painted in the brown-and-gold of Inteq."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/mongrel)
+ crate_name = "SMG crate"
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/wt550
+ name = "WT-550 PDW Crate"
+ desc = "Contains a high-powered, automatic personal defense weapon chambered in 4.6x30mm."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/wt550)
+ crate_name = "PDW crate"
+ faction_discount = 10
+ faction = /datum/faction/nt
+
+/datum/supply_pack/gun/saber
+ name = "SABR Prototype SMG Crate"
+ desc = "Contains a compact 9mm automatic SMG produced by NT Ballistics. For NT employee use only."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/saber)
+ crate_name = "SMG crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/etar
+ name = "E-TAR Dual-Mode Energy SMG Crate"
+ desc = "Contains a compact energy-based PDW platform, ideal for suppressing threats at mid-range. For NT employee use only."
+ cost = 2000
+ contains = list(/obj/item/storage/guncase/energy/etar)
+ crate_name = "SMG crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/firestorm
+ name = "Firestorm SMG Crate"
+ desc = "Contains a Hunter's Pride SMG, intended for internal use by hunters and chambered in .45"
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/firestorm)
+ crate_name = "SMG crate"
+ faction = /datum/faction/srm
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/rattlesnake
+ name = "Rattlesnake Machinepistol Crate"
+ desc = "Contains an automatic machinepistol produced by Scarborough Arms, chambered in 9mm."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/rattlesnake)
+ crate_name = "Machinepistol crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/kingsnake
+ name = "Kingsnake Machinepistol Crate"
+ desc = "Contains an automatic machinepistol chambered in 9mm, painted in the brown-and-gold of Inteq."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/kingsnake)
+ crate_name = "Machinepistol crate"
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/cm5
+ name = "CM-5 SMG Crate"
+ desc = "Contains a CM-5 automatic SMG, produced proudly within Lanchester City. Colonial Minuteman issue only."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/cm5)
+ crate_name = "SMG crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/sidewinder
+ name = "Sidewinder SMG Crate"
+ desc = "Contains a Sidewinder PDW produced by Scarborough Arms and chambered in 5.7mm for armor-piercing capabilities."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/sidewinder)
+ crate_name = "SMG crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
/*
Rifles
*/
+/datum/supply_pack/gun/m12
+ name = "Sporter Rifle Crate"
+ desc = "Contains a recently manufactured Model 12 \"Sporter\", Serene Outdoors' premier small game rifle. Chambered in .22lr"
+ contains = list(/obj/item/storage/guncase/m12)
+ cost = 500
+ crate_name = "rifle crate"
+
+/datum/supply_pack/gun/m15
+ name = "Super Sporter Rifle Crate"
+ desc = "Contains a recently manufactured Model 15 \"Super Sporter\", Serene Outdoors' premier hunting rifle. Chambered in 5.56 CLIP"
+ contains = list(/obj/item/storage/guncase/m15)
+ cost = 2500
+ crate_name = "rifle crate"
+
/datum/supply_pack/gun/winchester
name = "Flaming Arrow Lever Action Rifle Crate"
desc = "Contains an antiquated lever action rifle intended for hunting wildlife. Chambered in .38 rounds."
cost = 750
contains = list(/obj/item/storage/guncase/winchester)
crate_name = "rifle crate"
+ faction = /datum/faction/srm
+ faction_discount = 20
+
+/datum/supply_pack/gun/absolution
+ name = "Absolution Lever Action Rifle Crate"
+ desc = "Contains a powerful lever-action rifle for hunting larger wildlife. Chambered in .357."
+ cost = 2000
+ contains = list(/obj/item/storage/guncase/absolution)
+ crate_name = "shotguns crate"
+ faction = /datum/faction/srm
/datum/supply_pack/gun/illestren
name = "Illestren Rifle Crate"
@@ -182,13 +523,15 @@
cost = 1250
contains = list(/obj/item/storage/guncase/illestren)
crate_name = "rifle crate"
+ faction = /datum/faction/srm
/datum/supply_pack/gun/beacon
- name = "Contender Break Action Rifle Crate"
+ name = "Beacon Break Action Rifle Crate"
desc = "Contains a single shot break action rifle to hunt wildlife that annoys you in particular. Chambered in devastating .45-70 rounds. Warranty voided if sawed off."
- cost = 2250
+ cost = 1000
contains = list(/obj/item/storage/guncase/beacon)
crate_name = "rifle crate"
+ faction = /datum/faction/srm
/datum/supply_pack/gun/scout
name = "Scout Sniper Rifle Crate"
@@ -224,3 +567,240 @@
cost = 5000
contains = list(/obj/item/storage/guncase/skm)
crate_name = "auto rifle crate"
+
+/datum/supply_pack/gun/inteq_skm
+ name = "SKM-44 Rifle Crate"
+ desc = "Contains a SKM painted in the brown-and-gold of Inteq, chambered in 7.62x40mm CLIP. "
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/skm_inteq)
+ crate_name = "auto rifle crate"
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/gar
+ name = "Solarian 'GAR' Automatic Rifle"
+ desc = "A modern solarian military rifle, chambered in ferromagnetic lances. Not for export."
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/gar)
+ crate_name = "auto rifle crate"
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/hades
+ name = "SL AL-655 'Hades' energy rifle"
+ desc = "Contains a high-energy, automatic laser rifle. For NT employee use only."
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/hades)
+ crate_name = "laser crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/hydra
+ name = "SMR-80 'Hydra' Automatic Rifle Crate"
+ desc = "Contains a high-powered automatic rifle produced by Scarborough Arms and chambered in 5.56 CLIP. This one is a standard variant."
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/hydra)
+ crate_name = "rifle crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/cm82
+ name = "CM-82 Standard Issue Rifle"
+ desc = "Contains a high-powered rifle chambered in 5.56 CLIP, standard issue of the Colonial Minutemen."
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/cm82)
+ crate_name = "rifle crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/cm24
+ name = "CM-24 Surplus Stockpile Rifle"
+ desc = "Contains a higher-powered rifle chambered in 7.62x40 CLIP based on the SKM-24 platform, formerly the main service rifle of the CMM. This one has been pulled from reservist stockpiles."
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/cm82)
+ crate_name = "rifle crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/* Heavy */
+
+/datum/supply_pack/gun/cm40
+ name = "CM-40 Squad Automatic Weapon"
+ desc = "Contains a CM-40 Squad Automatic Weapon, a CLIP-produced LMG for Minuteman usage in situations that require heavy firepower. For Minuteman use only."
+ cost = 6000
+ contains = list(/obj/item/storage/guncase/cm40)
+ crate_name = "LMG crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/saw80
+ name = "SAW-80 Squad Automatic Weapon"
+ desc = "Contains one of the rarely-produced SAW-80 Squad Automatic Weapon platforms, exclusively for licensed buyers. Remember, short controlled bursts!"
+ cost = 7000
+ contains = list(/obj/item/storage/guncase/saw80)
+ crate_name = "LMG crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/* Marksman Rifles */
+
+/datum/supply_pack/gun/cmf4
+ name = "CM-F4 Designated Marksman Rifle"
+ desc = "Contains a high-powered marksman rifle chambered in .308. For Colonial Minuteman issue only."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/cmf4)
+ crate_name = "dmr crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/ssg04
+ name = "SsG-04 Designated Marksman Rifle"
+ desc = "Contains a high-powered marksman rifle chambered in .308. Painted in the brown-and-gold of Inteq."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/ssg04)
+ crate_name = "dmr crate"
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/sbr80
+ name = "SBR-80 'Hydra' Designated Marksman Rifle Crate"
+ desc = "Contains a high-powered marksman rifle chambered in 5.56 CLIP and produced by Scarborough Arms. A modification of the ever-popular SMR-80 platform."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/sbr80)
+ crate_name = "dmr crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/vickland
+ name = "Vickland Battle Rifle"
+ desc = "Contains a high-powered semi-automatic battle rifle chambered in .308 and produced by Hunter's Pride. Fed via stripper clips with a 10 round capacity."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/vickland)
+ crate_name = "dmr crate"
+ faction = /datum/faction/srm
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/gauss
+ name = "Prototype Gauss Rifle"
+ desc = "Contains a high-powered prototype armor-piercing gauss rifle, operable with ferromagnetic pellets. For NT employee use only."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/gauss)
+ crate_name = "dmr crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/claris
+ name = "Claris Gauss Rifle"
+ desc = "Contains a high-powered armor-piercing gauss rifle, loaded directly via ferromagnetic pellet speedloaders."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/claris)
+ crate_name = "dmr crate"
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/boomslang90
+ name = "Boomslang-90 Designated Marksman Rifle Crate"
+ desc = "Contains a civilian variant of the Boomslang Sniper rifle- modified with a 2x scope, rather than a sniper scope. Chambered in the powerful 6.5x57mm CLIP."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/boomslang)
+ crate_name = "dmr crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/gun/boomslang10
+ name = "Boomslang-10 Sniper Rifle Crate"
+ desc = "Contains a military variant of the Boomslang Sniper rifle equipped with an 8x sniper scope, for licenesed buyers only. Chambered in the powerful 6.5x57mm CLIP."
+ cost = 4500
+ contains = list(/obj/item/storage/guncase/boomslangmilitary)
+ crate_name = "marksman rifle crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/f90
+ name = "CM-F90 Sniper Rifle Crate"
+ desc = "Contains a military sniper rifle equipped with an 8x sniper scope, for Minuteman use only. Chambered in the powerful 6.5x57mm CLIP."
+ cost = 4500
+ contains = list(/obj/item/storage/guncase/cmf90)
+ crate_name = "marksman rifle crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/scout
+ name = "Scout Sniper Rifle Crate"
+ desc = "Contains a traditional scoped rifle to hunt wildlife and big game from a respectful distance. Chambered in powerful .300 Magnum."
+ cost = 4000
+ contains = list(/obj/item/storage/guncase/scout)
+ crate_name = "sniper rifle crate"
+ faction = /datum/faction/srm
+
+/datum/supply_pack/gun/ssg669
+ name = "SSG-669C Sniper Rifle Crate"
+ desc = "Contains a traditional scoped rifle to hunt wildlife and big game from a respectful distance. Chambered in powerful .300 Magnum."
+ cost = 4000
+ contains = list(/obj/item/storage/guncase/ssg669)
+ crate_name = "sniper rifle crate"
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
+
+/* Attachments */
+
+/datum/supply_pack/gun/attachment/rail_light
+ name = "Tactical Rail Light Crate"
+ desc = "Contains a single rail light to be mounted on a firearm."
+ cost = 100
+ contains = list(/obj/item/attachment/rail_light)
+ crate_name = "rail light crate"
+
+/datum/supply_pack/gun/attachment/laser_sight
+ name = "Laser Sight Crate"
+ desc = "Contains a single rail light to be mounted on a firearm."
+ cost = 250
+ contains = list(/obj/item/attachment/laser_sight)
+ crate_name = "laser sight crate"
+
+/datum/supply_pack/gun/attachment/bayonet
+ name = "Bayonet Crate"
+ desc = "Contains a single bayonet to be mounted on a firearm."
+ cost = 250
+ contains = list(/obj/item/attachment/bayonet)
+ crate_name = "bayonet crate"
+
+/datum/supply_pack/gun/attachment/ebayonet
+ name = "Energy Bayonet Crate"
+ desc = "Contains a single energy bayonet to be mounted on a firearm, exclusive for Scarborough Firearms."
+ cost = 500
+ contains = list(/obj/item/attachment/energy_bayonet)
+ crate_name = "bayonet crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/attachment/silencer
+ name = "Suppressor Crate"
+ desc = "Contains a single suppressor to be mounted on a firearm."
+ cost = 250
+ contains = list(/obj/item/attachment/silencer)
+ crate_name = "suppressor crate"
+
+/datum/supply_pack/gun/attachment/sling
+ name = "Shoulder Sling Crate"
+ desc = "Contains a single shoulder sling to be mounted on a firearm for easy carrying without armor holsters. Only compatible with longarms."
+ cost = 250
+ contains = list(/obj/item/attachment/sling)
+ crate_name = "shoulder sling crate"
diff --git a/code/modules/cargo/packs/machinery.dm b/code/modules/cargo/packs/machinery.dm
index f25e4818329..e5d78e863f1 100644
--- a/code/modules/cargo/packs/machinery.dm
+++ b/code/modules/cargo/packs/machinery.dm
@@ -168,30 +168,6 @@
crate_name = "holofield generator crate"
crate_type = /obj/structure/closet/crate/engineering
-/datum/supply_pack/machinery/blackmarket_telepad
- name = "Black Market LTSRBT"
- desc = "Need a faster and better way of transporting your illegal goods from and to the sector? Fear not, the Long-To-Short-Range-Bluespace-Transceiver (LTSRBT for short) is here to help. Contains a LTSRBT circuit, two bluespace crystals, and one ansible."
- cost = 1000
- contains = list(
- /obj/item/circuitboard/machine/ltsrbt,
- /obj/item/stack/ore/bluespace_crystal/artificial,
- /obj/item/stack/ore/bluespace_crystal/artificial,
- /obj/item/stock_parts/subspace/ansible
- )
- crate_type = /obj/structure/closet/crate/science
-
-/datum/supply_pack/machinery/shuttle_in_a_box
- name = "Shuttle in a Box"
- desc = "The bare minimum amount of machine and computer boards required to create a working spacecraft."
- cost = 8000
- contains = list(
- /obj/item/circuitboard/computer/shuttle/helm,
- /obj/item/circuitboard/machine/shuttle/smes,
- /obj/item/circuitboard/machine/shuttle/engine/electric,
- /obj/item/shuttle_creator
- )
- crate_name = "Shuttle in a Box"
-
/datum/supply_pack/machinery/ion_thruster
name = "Ion Thruster Crate"
desc = "A crate containing an ion thruster and its precharger's electronics. For when you need a little extra thrust."
diff --git a/code/modules/cargo/packs/magazines.dm b/code/modules/cargo/packs/magazines.dm
new file mode 100644
index 00000000000..301f771f79b
--- /dev/null
+++ b/code/modules/cargo/packs/magazines.dm
@@ -0,0 +1,337 @@
+/datum/supply_pack/magazine
+ group = "Magazines"
+ crate_type = /obj/structure/closet/crate/secure/gear
+ crate_name = "magazine crate"
+ faction_discount = 0
+
+
+/* VI */
+
+/datum/supply_pack/magazine/co9mm_mag
+ name = "9mm Commander Magazine Crate"
+ desc = "Contains a 9mm magazine for the standard-issue Commander pistol, with a capacity of twelve rounds."
+ contains = list(/obj/item/ammo_box/magazine/co9mm/empty)
+ cost = 150
+ faction = /datum/faction/nt
+
+/datum/supply_pack/magazine/smgm9mm_mag
+ name = "9mm SMG Magazine Crate"
+ desc = "Contains a 9mm magazine for the Vector and Saber SMGs, with a capacity of thirty rounds."
+ contains = list(/obj/item/ammo_box/magazine/smgm9mm/empty)
+ cost = 300
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+
+/* Hunter's Pride */
+
+/datum/supply_pack/magazine/c38_mag
+ name = ".38 Speedloader Crate"
+ desc = "Contains a .38 speedloader for revolvers, containing six rounds."
+ contains = list(/obj/item/ammo_box/c38/empty)
+ cost = 100
+ faction_discount = 20
+ faction = /datum/faction/srm
+
+/datum/supply_pack/magazine/m45_mag
+ name = ".45 ACP Candor Magazine Crate"
+ desc = "Contains a .45 ACP magazine for the Candor pistol, with a capacity of eight rounds."
+ contains = list(/obj/item/ammo_box/magazine/m45/empty)
+ cost = 100
+ faction = /datum/faction/srm
+
+/datum/supply_pack/magazine/a44roum_speedloader
+ name = ".44 Roumain Speedloader Crate"
+ desc = "Contains a .44 Roumain speedloader for the HP Montagne, with a capacity of six rounds."
+ contains = list(/obj/item/ammo_box/a44roum_speedloader/empty)
+ cost = 250
+ faction = /datum/faction/srm
+
+/datum/supply_pack/magazine/firestorm_mag
+ name = "Firestorm Magazine Crate"
+ desc = "Contains a 28-round magazine for the Hunter's Pride Firestorm SMG."
+ contains = list(/obj/item/ammo_box/magazine/c45_firestorm_mag/empty)
+ cost = 300
+ faction = /datum/faction/srm
+
+
+/* Serene Sporting */
+
+/datum/supply_pack/magazine/m17_mag
+ name = "Micro Target Magazine Crate"
+ desc = "Contains a .22lr magazine for the Micro Target pistol, with a capacity of ten rounds."
+ contains = list(/obj/item/ammo_box/magazine/m17/empty)
+ cost = 100
+
+/datum/supply_pack/magazine/m12_mag
+ name = "Sporter Magazine Crate"
+ desc = "Contains a .22lr magazine for the Sporter Rifle, with a capacity of 25 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m12_sporter/empty)
+ cost = 200
+
+/datum/supply_pack/magazine/m15_mag
+ name = "Super Sporter Magazine Crate"
+ desc = "Contains a 5.56 CLIP magazine for the Super Sporter Rifle, with a capacity of 20 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m15/empty)
+ cost = 300
+
+/* Scarbie */
+
+/datum/supply_pack/magazine/himehabu_mag
+ name = "Himehabu Magazine Crate"
+ desc = "Contains a .22lr magazine for the Himehabu pistol, with a capacity of ten rounds."
+ contains = list(/obj/item/ammo_box/magazine/m22lr_himehabu/empty)
+ cost = 100
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/asp_mag
+ name = "Asp Magazine Crate"
+ desc = "Contains a 5.7x39mm magazine for the Asp pistol, with a capacity of 12 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m57_39_asp/empty)
+ cost = 250
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/m10mm_mag
+ name = "Ringneck Magazine Crate"
+ desc = "Contains a 10mm magazine for the Ringneck pistol, with a capacity of eight rounds."
+ contains = list(/obj/item/ammo_box/magazine/m10mm_ringneck/empty)
+ cost = 150
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/m9mm_rattlesnake
+ name = "Rattlesnake Magazine Crate"
+ desc = "Contains a 9mm magazine for the Rattlesnake machine pistol, with a capacity of 18 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m9mm_rattlesnake/empty)
+ cost = 300
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/a357_mag
+ name = ".357 Speedloader Crate"
+ desc = "Contains a .357 speedloader for revolvers, with a capacity of six rounds."
+ contains = list(/obj/item/ammo_box/a357/empty)
+ cost = 250
+ faction_discount = 20
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/sidewinder_mag
+ name = "Sidewinder Magazine Crate"
+ desc = "Contains a 30 round magazine for the Sidewinder SMG."
+ contains = list(/obj/item/ammo_box/magazine/m57_39_sidewinder/empty)
+ cost = 300
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/c45_cobra_mag
+ name = "Cobra Magazine Crate"
+ desc = "Contains a .45 magazine for the Cobra-20, with a capacity of 24 rounds."
+ cost = 300
+ contains = list(/obj/item/ammo_box/magazine/m45_cobra/empty)
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/short_hydra_mag
+ name = "SBR-80 DMR Short Magazine Crate"
+ desc = "Contains a 5.56x42mm CLIP made specially for the SBR-80 Designated Marksman Rifle, with a capacity of 20 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/small/empty)
+ cost = 400
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/hydra_mag
+ name = "SMR-80 Rifle Magazine Crate"
+ desc = "Contains a 5.56x42mm CLIP for the SMR-80 assault rifle, with a capacity of 30 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/empty)
+ cost = 500
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/saw_mag
+ name = "SAW-80 Magazine Crate"
+ desc = "Contains a 5.56x42mm CLIP magazine for the SAW-80 Squad Automatic Weapon, with a capacity of sixty rounds. Count your shots, they run out fast."
+ contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/extended/empty)
+ cost = 750
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/magazine/boomslang_mag
+ name = "Boomslang-90 Magazine Crate"
+ desc = "Contains a 6.5 CLIP magazine for the Boomslang rifle platform, with a capacity of five rounds."
+ contains = list(/obj/item/ammo_box/magazine/boomslang/short/empty)
+ cost = 750
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/* CM Lancaster */
+
+/datum/supply_pack/magazine/cm23_mag
+ name = "CM-23 Magazine Crate"
+ desc = "Contains a 10mm magazine for the CM-23 handgun with a capacity of 10 rounds."
+ contains = list(/obj/item/ammo_box/magazine/cm23/empty)
+ cost = 150
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm70_mag
+ name = "CM-70 Magazine Crate"
+ desc = "Contains a 9mm magazine for the CM-70 machinepistol."
+ contains = list(/obj/item/ammo_box/magazine/m9mm_cm70/empty)
+ cost = 350
+ faction = /datum/faction/clip
+ faction_discount = 20
+
+/datum/supply_pack/magazine/cm357_mag
+ name = "CM-357 Magazine Crate"
+ desc = "Contains a .357 magazine for the CM-357 automag pistol with a capacity of 7 rounds."
+ contains = list(/obj/item/ammo_box/magazine/cm357/empty)
+ cost = 250
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm5_mag
+ name = "CM-5 Magazine Crate"
+ desc = "Contains a 9mm magazine for the CM-5 SMG with a capacity of 30 rounds."
+ contains = list(/obj/item/ammo_box/magazine/cm5_9mm/empty)
+ cost = 300
+ faction = /datum/faction/clip
+ faction_discount = 20
+
+/datum/supply_pack/magazine/cm82_mag
+ name = "CM-82 Magazine Crate"
+ desc = "Contains a 5.56mm magazine for the CM-82 rifle, with a capacity of thirty rounds."
+ contains = list(/obj/item/ammo_box/magazine/p16/empty)
+ cost = 500
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/skm_ammo
+ name = "SKM Magazine Crate"
+ desc = "Contains a 7.62x40mm magazine for the SKM rifles, with a capacity of twenty rounds."
+ contains = list(/obj/item/ammo_box/magazine/skm_762_40/empty)
+ cost = 500
+
+/datum/supply_pack/magazine/f4_mag
+ name = "F4 Magazine Crate"
+ desc = "Contains a .308 magazine for SsG-04 and CM-F4 platform rifles, with a capacity of ten rounds."
+ contains = list(/obj/item/ammo_box/magazine/f4_308/empty)
+ cost = 500
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/f90
+ name = "CM-F90 Magazine Crate"
+ desc = "Contains a 5-round 6.5mm magazine for use with the CM-F90 sniper rifle."
+ contains = list(/obj/item/ammo_box/magazine/f90/empty)
+ cost = 750
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm15
+ name = "CM-15 Magazine Crate"
+ desc = "Contains an 8-round 12ga magazine for the CM-15 Automatic Shotgun."
+ contains = list(/obj/item/ammo_box/magazine/cm15_12g/empty)
+ cost = 750
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm40
+ name = "CM-40 Magazine Crate"
+ desc = "Contains an 80-round 7.62x40mm CLIP box for the CM-40 Squad Automatic Weapon. Consider designating an ammo bearer."
+ contains = list(/obj/item/ammo_box/magazine/cm40_762_40_box/empty)
+ cost = 1000
+ faction = /datum/faction/clip
+
+/* NT */
+
+/datum/supply_pack/magazine/wt550_mag
+ name = "WT-550 Auto Rifle Magazine Crate"
+ desc = "Contains a 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads."
+ cost = 300
+ contains = list(/obj/item/ammo_box/magazine/wt550m9/empty)
+ faction = /datum/faction/nt
+
+/* Solgov */
+
+/datum/supply_pack/magazine/mag_556mm
+ name = "5.56 Pistole C Magazine Crate"
+ desc = "Contains a 5.56mm magazine for the Pistole C, with a capacity of twelve rounds."
+ contains = list(/obj/item/ammo_box/magazine/pistol556mm/empty)
+ cost = 150
+ faction = /datum/faction/solgov
+
+/datum/supply_pack/magazine/fms_mag
+ name = "Ferromagnetic Slug Magazine Crate"
+ desc = "Contains a ferromagnetic slug magazine for the Model H pistol, with a capacity of ten rounds."
+ contains = list(/obj/item/ammo_box/magazine/modelh/empty)
+ cost = 350
+ faction = /datum/faction/solgov
+
+/datum/supply_pack/magazine/gar_ammo
+ name = "GAR Ferromagnetic Lance Magazine Crate"
+ desc = "Contains a ferromagnetic lance magazine for the GAR rifle, with a capacity of thirty two rounds."
+ contains = list(/obj/item/ammo_box/magazine/gar/empty)
+ cost = 500
+ faction = /datum/faction/solgov
+
+/datum/supply_pack/magazine/claris_ammo
+ name = "Claris Ferromagnetic Pellet Speedloader Crate"
+ desc = "Contains a ferromagnetic pellet speedloader for the Claris rifle, with a capacity of twenty two rounds."
+ contains = list(/obj/item/ammo_box/amagpellet_claris/empty)
+ cost = 400
+ faction = /datum/faction/solgov
+
+/* Inteq */
+
+/datum/supply_pack/magazine/mongrel_mag
+ name = "Mongrel Magazine Crate"
+ desc = "Contains a 10mm magazine for the SKM-44v 'Mongrel' SMG, with a capacity of twenty-four rounds."
+ contains = list(/obj/item/ammo_box/magazine/smgm10mm/empty)
+ cost = 300
+ faction = /datum/faction/inteq
+
+/* Shotguns */
+
+/datum/supply_pack/magazine/bulldog
+ name = "Bulldog Magazine Crate"
+ desc = "Contains an 8-round 12ga box magazine for the Bulldog weapons platform."
+ contains = list(/obj/item/ammo_box/magazine/m12g_bulldog/empty)
+ cost = 750
+ faction = /datum/faction/syndicate/scarborough_arms
+
+
+/* energy weapons */
+
+/datum/supply_pack/magazine/guncell
+ name = "Weapon Cell Crate"
+ desc = "Contains a weapon cell, compatible with laser guns."
+ contains = list(/obj/item/stock_parts/cell/gun)
+ faction = /datum/faction/nt
+ cost = 500
+
+/datum/supply_pack/magazine/solgovcell
+ name = "SolCon Weapon Cell Crate"
+ desc = "Contains a Solarian weapon cell, compatible with Solarian gauss weaponry."
+ contains = list(/obj/item/stock_parts/cell/gun/solgov)
+ cost = 500
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/magazine/upgradedguncell
+ name = "Upgraded Weapon Cell Crate"
+ desc = "Contains an upgraded weapon cell, compatible with laser guns. For NT use only."
+ contains = list(/obj/item/stock_parts/cell/gun/upgraded)
+ cost = 1000
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/* etherbor */
+
+/datum/supply_pack/magazine/guncell/kalix
+ name = "Etherbor Cell Crate"
+ desc = "Contains an Etherbor weapon cell, compatible with Etherbor armaments with a slightly higher capacity."
+ contains = list(/obj/item/stock_parts/cell/gun/kalix)
+ cost = 600
+ faction = /datum/faction/pgf
+
+/datum/supply_pack/magazine/guncell/pgf
+ name = "Etherbor Cell Crate"
+ desc = "Contains a military-grade Etherbor weapon cell produced for the PGFMC, compatible with Etherbor armaments with a significantly higher capacity."
+ contains = list(/obj/item/stock_parts/cell/gun/pgf)
+ cost = 1000
+ faction = /datum/faction/pgf
+ faction_discount = 0
+ faction_locked = TRUE
+
+/* Expand once the energy weapons have been actually expanded upon */
diff --git a/code/modules/cargo/packs/material.dm b/code/modules/cargo/packs/material.dm
index ee0f00e42d9..356856535b7 100644
--- a/code/modules/cargo/packs/material.dm
+++ b/code/modules/cargo/packs/material.dm
@@ -1,5 +1,7 @@
/datum/supply_pack/material
group = "Materials & Sheets"
+ faction = /datum/faction/nt/ns_logi
+ faction_discount = 20
/*
Basic construction materials
@@ -40,7 +42,7 @@
/datum/supply_pack/material/uranium20
name = "20 Uranium Sheets"
- desc = "Green rock make thog puke red."
+ desc = "Twenty sheets of mildly radioactive uranium. Lead gloves for safe handling not included."
cost = 2000
contains = list(/obj/item/stack/sheet/mineral/uranium/twenty)
crate_name = "uranium sheets crate"
@@ -52,21 +54,21 @@
/datum/supply_pack/material/titanium20
name = "20 Titanium Sheets"
- desc = "Used for making big boy tanks and tools."
+ desc = "Twenty sheets of durable titanium. Great for heavy machinery."
cost = 3000
contains = list(/obj/item/stack/sheet/mineral/titanium/twenty)
crate_name = "titanium sheets crate"
/datum/supply_pack/material/gold20
name = "20 Gold Sheets"
- desc = "Shiny."
+ desc = "Twenty sheets of gold. There was a time when this would've been more expensive."
cost = 4000
contains = list(/obj/item/stack/sheet/mineral/gold/twenty)
crate_name = "gold sheets crate"
/datum/supply_pack/material/silver20
name = "20 Silver Sheets"
- desc = "Somewhat less shiny."
+ desc = "Twenty sheets of silver. How quaint."
cost = 3000
contains = list(/obj/item/stack/sheet/mineral/silver/twenty)
crate_name = "silver sheets crate"
@@ -110,3 +112,9 @@
contains = list(/obj/item/stack/sheet/mineral/wood/fifty)
crate_name = "wood planks crate"
+/datum/supply_pack/material/concrete_mix
+ name = "Concrete Bag"
+ desc = "Feeling lazy? Need a structure and quick? Use F.O.O.D.'s near-instant concrete mix! Just add water."
+ cost = 500
+ contains = list(/obj/item/reagent_containers/glass/concrete_bag)
+ crate_name = "Concrete Mix"
diff --git a/code/modules/cargo/packs/mechs.dm b/code/modules/cargo/packs/mechs.dm
index 937126a8636..2a6e6b337eb 100644
--- a/code/modules/cargo/packs/mechs.dm
+++ b/code/modules/cargo/packs/mechs.dm
@@ -1,5 +1,5 @@
/datum/supply_pack/mech
- group = "Mech and Exosuit Construction"
+ group = "Exosuit Construction"
crate_type = /obj/structure/closet/crate/large
@@ -97,12 +97,12 @@ Mech Equipment
*/
/datum/supply_pack/mech/equipment
- name = "Mech equipment crate"
+ name = "Exosuit equipment crate"
crate_type = /obj/structure/closet/crate/secure/gear
- crate_name = "mech equipment"
+ crate_name = "exosuit equipment"
/datum/supply_pack/mech/equipment/drill
- name = "Mech drill kit"
+ name = "Exosuit drill kit"
desc = "Contains one mechanized drill for heavy duty digging."
cost = 500
contains = list(
@@ -110,39 +110,47 @@ Mech Equipment
)
/datum/supply_pack/mech/equipment/diamond_drill
- name = "Mech diamond drill kit"
+ name = "Exosuit diamond drill kit"
desc = "Contains mechanized diamond drill, for the enterprising prospector!"
cost = 750
contains = list(
/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
)
+/datum/supply_pack/mech/equipment/salvage_saw
+ name = "Exosuit Salvage Saw"
+ desc = "Contains an upsized angle grinder for an Exosuit, for all your larger salvage problems."
+ cost = 2000
+ contains = list(
+ /obj/item/mecha_parts/mecha_equipment/salvage_saw
+ )
+
/datum/supply_pack/mech/equipment/scanner
- name = "Mech scanner kit"
- desc = "An electronic mining scanner, graded to interface with a mech."
+ name = "Exosuit scanner kit"
+ desc = "An electronic mining scanner, graded to interface with an exosuit."
cost = 350
contains = list(
/obj/item/mecha_parts/mecha_equipment/mining_scanner
)
/datum/supply_pack/mech/equipment/plasma_gen
- name = "Mech generator kit"
- desc = "A plasma-fueled generator for a mech, ideal for long operations."
+ name = "Exosuit generator kit"
+ desc = "A plasma-fueled generator for an exosuit, ideal for long operations."
cost = 1000
contains = list(
/obj/item/mecha_parts/mecha_equipment/generator
)
/datum/supply_pack/mech/equipment/nuclear_gen
- name = "Mech nuclear generator kit"
- desc = "Contains a uranium-fueled generator for a mech, ideal for polluting the environment."
+ name = "Exosuit nuclear generator kit"
+ desc = "Contains a uranium-fueled generator for an exosuit, ideal for polluting the environment."
cost = 1250
contains = list(
/obj/item/mecha_parts/mecha_equipment/generator/nuclear
)
/datum/supply_pack/mech/equipment/tesla_energy_relay
- name = "Mech tesla relay kit"
+ name = "Exosuit tesla relay kit"
desc = "Contains an advanced exosuit module which draws power from nearby APCs."
cost = 1750
contains = list(
@@ -150,7 +158,7 @@ Mech Equipment
)
/datum/supply_pack/mech/equipment/clamp
- name = "Mech clamp kit"
+ name = "Exosuit clamp kit"
desc = "Contains a clamp designed for mechanized freight hauling."
cost = 350
contains = list(
@@ -158,7 +166,7 @@ Mech Equipment
)
/datum/supply_pack/mech/equipment/extinguisher
- name = "Mech extinguisher kit"
+ name = "Exosuit extinguisher kit"
desc = "Contains a heavy duty fire extinguisher, for heavy duty firefighting."
cost = 250
contains = list(
@@ -166,7 +174,7 @@ Mech Equipment
)
/datum/supply_pack/mech/equipment/cable_layer
- name = "Mech RCL Kit"
+ name = "Exosuit RCL Kit"
desc = "Contains a \"rapid cable layer\" for laying down long lengths of wire."
cost = 250
contains = list(
@@ -174,7 +182,7 @@ Mech Equipment
)
/datum/supply_pack/mech/equipment/mech_sleeper
- name = "Mech Mounted Sleeper Kit"
+ name = "Exosuit Mounted Sleeper Kit"
desc = "Contains a mounted sleeper device, used for retrieving and stabilizing patients."
cost = 1000
contains = list(
@@ -182,20 +190,28 @@ Mech Equipment
)
/datum/supply_pack/mech/equipment/beam_gun
- name = "Mech Beam Gun Kit"
+ name = "Exosuit Beam Gun Kit"
desc = "Contains an advanced mounted medical beamgun, capable of alleviating wounds to targets."
cost = 7000
contains = list(
/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam
)
/datum/supply_pack/mech/equipment/rcs
- name = "Mech RCS kit"
+ name = "Exosuit RCS kit"
desc = "A gas fueled RCS pack, ideal for mechanized space operation."
cost = 800
contains = list(
/obj/item/mecha_parts/mecha_equipment/thrusters/gas
)
+/datum/supply_pack/mech/equipment/ionthrust
+ name = "Exosuit Ion thruster kit"
+ desc = "An electrical powered thruster pack, perfect for exosuits without a functional way to refill more tradional RCS thrusters."
+ cost = 2000
+ contains = list(
+ /obj/item/mecha_parts/mecha_equipment/thrusters/ion
+ )
+
/datum/supply_pack/mech/equipment/ripley_upgrade
name = "APLU upgrade kit"
desc = "Contains an APLU MK II upgrade kit. The upgrade will replace the cockpit with a spaceworthy canopy, but the added weight makes it slower."
@@ -205,7 +221,7 @@ Mech Equipment
)
/datum/supply_pack/mech/equipment/melee_armor_booster
- name = "Mech CCW armor kit"
+ name = "Exosuit CCW armor kit"
desc = "A \"close combat weaponry\" module designed to deflect melee attacks."
cost = 750
contains = list(
@@ -213,25 +229,34 @@ Mech Equipment
)
/datum/supply_pack/mech/equipment/projectile_armor_booster
- name = "Mech projectile armor kit"
+ name = "Exosuit projectile armor kit"
desc = "A protective exosuit module designed to deflect ranged attacks."
cost = 1000
contains = list(
/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
)
+/datum/supply_pack/mech/equipment/recharger
+ name = "Exosuit Recharger kit"
+ desc = "Two boards for an exosuit recharger and recharger console. For the stylish exosuit bay."
+ cost = 400
+ contains = list(
+ /obj/item/circuitboard/computer/mech_bay_power_console,
+ /obj/item/circuitboard/machine/mech_recharger
+ )
+
/*
weapons
*/
/datum/supply_pack/mech/weapon
- name = "Mech weapons crate"
+ name = "Exosuit weapons crate"
crate_type = /obj/structure/closet/crate/secure/weapon
- crate_name = "mech weapon crate"
+ crate_name = "exosuit weapon crate"
/datum/supply_pack/mech/weapon/pka
- name = "Mech Mounted Proto-Kinetic Accelerator kit"
- desc = "A ranged mining attachment for any mech."
+ name = "Exosuit-Mounted Proto-Kinetic Accelerator kit"
+ desc = "A ranged mining attachment for any exosuit."
cost = 750
contains = list(
/obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun
@@ -262,7 +287,7 @@ weapons
)
/datum/supply_pack/mech/weapon/scattershot
- name = "LBX AC 10 kit"
+ name = "LBX-10 kit"
desc = "Contains a \"Scattershot\" gun to mount on combat exosuits."
cost = 1750
contains = list(
@@ -270,7 +295,7 @@ weapons
)
/datum/supply_pack/mech/weapon/lmg
- name = "Ultra AC 2 kit"
+ name = "UMG-2 kit"
desc = "Contains a mounted gun which fires in three round bursts."
cost = 2250
contains = list(
@@ -290,21 +315,21 @@ ammo
*/
/datum/supply_pack/mech/ammo
- name = "Mech ammo crate"
+ name = "Exosuit ammo crate"
crate_type = /obj/structure/closet/crate/secure/gear
- crate_name = "mech ammo crate"
+ crate_name = "exosuit ammo crate"
/datum/supply_pack/mech/ammo/scattershot_ammo
- name = "LBX AC 10 ammo box"
- desc = "Contains a fourty-round box of upscaled buckshot, to be loaded directly in a mounted LBX AC 10."
+ name = "LBX-10 ammo box"
+ desc = "Contains a fourty-round box of upscaled buckshot, to be loaded directly in a mounted LBX-10."
cost = 500
contains = list(
/obj/item/mecha_ammo/scattershot
)
/datum/supply_pack/mech/ammo/lmg_ammo
- name = "Ultra AC 2 ammo box"
- desc = "Contains a three hundred-round box of heavy ammunition for the Ultra AC 2."
+ name = "UMG-2 ammo box"
+ desc = "Contains a three hundred-round box of heavy ammunition for the UMG-2."
cost = 750
contains = list(
/obj/item/mecha_ammo/lmg
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index 08b57693713..4d63d5c9cb6 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -9,42 +9,42 @@
/datum/supply_pack/medical/firstaid_single
name = "First Aid Kit Single-Pack"
desc = "Contains one first aid kit for healing most types of wounds."
- cost = 750
+ cost = 400
small_item = TRUE
contains = list(/obj/item/storage/firstaid/regular)
/datum/supply_pack/medical/firstaidbruises_single
name = "Bruise Treatment Kit Single-Pack"
desc = "Contains one first aid kit focused on healing bruises and broken bones."
- cost = 1250
+ cost = 700
small_item = TRUE
contains = list(/obj/item/storage/firstaid/brute)
/datum/supply_pack/medical/firstaidburns_single
name = "Burn Treatment Kit Single-Pack"
desc = "Contains one first aid kit focused on healing severe burns."
- cost = 1250
+ cost = 700
small_item = TRUE
contains = list(/obj/item/storage/firstaid/fire)
/datum/supply_pack/medical/firstaidoxygen_single
name = "Oxygen Deprivation Kit Single-Pack"
desc = "Contains one first aid kit focused on helping oxygen deprivation victims."
- cost = 1250
+ cost = 500
small_item = TRUE
contains = list(/obj/item/storage/firstaid/o2)
/datum/supply_pack/medical/firstaidtoxins_single
name = "Toxin Treatment Kit Single-Pack"
desc = "Contains one first aid kit focused on healing damage dealt by heavy toxins."
- cost = 1250
+ cost = 500
small_item = TRUE
contains = list(/obj/item/storage/firstaid/toxin)
/datum/supply_pack/medical/firstaid_rad_single
name = "Radiation Treatment Kit Single-Pack"
desc = "Contains one first aid kit focused on reducing the damage done by radiation."
- cost = 1000
+ cost = 500
small_item = TRUE
contains = list(/obj/item/storage/firstaid/radiation)
@@ -52,6 +52,23 @@
Tools
*/
+/datum/supply_pack/medical/painkillers
+ name = "Painkiller Supply Crate"
+ desc = "Contains a supply of painkillers. Great for stopping headaches, feeling broken bones, and screaming people!"
+ cost = 1000
+ contains = list(
+ /obj/item/reagent_containers/glass/bottle/morphine,
+ /obj/item/reagent_containers/glass/bottle/morphine,
+ /obj/item/reagent_containers/glass/bottle/morphine,
+ )
+ faction = /datum/faction/syndicate/suns
+ faction_discount = 25
+
+/datum/supply_pack/medical/painkillers/fill(obj/structure/closet/crate/cargo_crate)
+ . = ..()
+ if(prob(5))
+ new /obj/item/reagent_containers/glass/bottle/painkiller_booze(cargo_crate)
+
/datum/supply_pack/medical/iv_drip
name = "IV Drip Crate"
desc = "Contains a single IV drip for administering blood to patients."
@@ -68,12 +85,25 @@
/datum/supply_pack/medical/surgery
name = "Surgical Supplies Crate"
- desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical duffelbag, Sterilizine spray and collapsible roller bed."
+ desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical case, Sterilizine spray and collapsible roller bed."
cost = 3000
- contains = list(/obj/item/storage/backpack/duffelbag/med/surgery,
+ contains = list(/obj/item/storage/case/surgery,
/obj/item/reagent_containers/medigel/sterilizine,
/obj/item/roller)
crate_name = "surgical supplies crate"
+ faction = /datum/faction/syndicate/suns
+ faction_discount = 50 //this shouldnt be 3k but if it is...
+
+
+/datum/supply_pack/medical/anesthetic
+ name = "Anesthetics Crate"
+ desc = "Contains a standard anesthetics tank, for standard surgical procedures."
+ cost = 500
+ contains = list(/obj/item/clothing/mask/breath/medical,
+ /obj/item/tank/internals/anesthetic)
+ crate_name = "anesthetics crate"
+ faction = /datum/faction/syndicate/suns
+ faction_discount = 25
/*
Bundles and supplies
@@ -96,6 +126,8 @@
/obj/item/reagent_containers/blood/synthetic)
crate_name = "blood freezer"
crate_type = /obj/structure/closet/crate/freezer
+ faction = /datum/faction/syndicate/suns
+ faction_discount = 25
/datum/supply_pack/medical/surplus
name = "Medical Surplus Crate"
@@ -123,34 +155,14 @@
/obj/item/reagent_containers/pill/neurine,
/obj/item/vending_refill/medical)
crate_name = "medical surplus crate"
+ faction = /datum/faction/syndicate/suns
+ faction_discount = 25
/datum/supply_pack/medical/surplus/fill(obj/structure/closet/crate/C)
for(var/i in 1 to 7)
var/item = pick(contains)
new item(C)
-/datum/supply_pack/medical/virus
- name = "Virus Crate"
- desc = "Contains twelve different bottles, containing several viral samples for virology research. Also includes seven beakers and syringes. Balled-up jeans not included."
- cost = 3500
- contains = list(/obj/item/reagent_containers/glass/bottle/flu_virion,
- /obj/item/reagent_containers/glass/bottle/cold,
- /obj/item/reagent_containers/glass/bottle/random_virus,
- /obj/item/reagent_containers/glass/bottle/random_virus,
- /obj/item/reagent_containers/glass/bottle/random_virus,
- /obj/item/reagent_containers/glass/bottle/random_virus,
- /obj/item/reagent_containers/glass/bottle/fake_gbs,
- /obj/item/reagent_containers/glass/bottle/magnitis,
- /obj/item/reagent_containers/glass/bottle/pierrot_throat,
- /obj/item/reagent_containers/glass/bottle/brainrot,
- /obj/item/reagent_containers/glass/bottle/anxiety,
- /obj/item/reagent_containers/glass/bottle/beesease,
- /obj/item/storage/box/syringes,
- /obj/item/storage/box/beakers,
- /obj/item/reagent_containers/glass/bottle/mutagen)
- crate_name = "virus crate"
- crate_type = /obj/structure/closet/crate/medical
-
/datum/supply_pack/medical/salglucanister
name = "Heavy-Duty Saline Canister"
desc = "Contains a bulk supply of saline-glucose condensed into a single canister that should last a long time, with a large pump to fill containers with. Direct injection of saline should be left to medical professionals as the pump is capable of overdosing patients."
diff --git a/code/modules/cargo/packs/sec_supply.dm b/code/modules/cargo/packs/sec_supply.dm
index 8ff09a5dc38..9e18adec485 100644
--- a/code/modules/cargo/packs/sec_supply.dm
+++ b/code/modules/cargo/packs/sec_supply.dm
@@ -5,6 +5,12 @@
/*
Standard supplies
*/
+/datum/supply_pack/sec_supply/holster
+ name = "Shoulder Holster Crate"
+ desc = "Contains a shoulder holster, capable of holding a single pistol or revolver and your ammo."
+ cost = 600
+ contains = list(/obj/item/clothing/accessory/holster)
+ crate_name = "holster crate"
/datum/supply_pack/sec_supply/chemimp
name = "Chemical Implants Crate"
@@ -30,6 +36,13 @@
cost = 2000
crate_name = "security barriers crate"
+/datum/supply_pack/sec_supply/empty_sandbags
+ name = "Empty Sandbags"
+ desc = "Contains one box of seven empty sandbags for deployable cover in the field. Sand not included."
+ contains = list(/obj/item/storage/box/emptysandbags)
+ cost = 150
+ crate_name = "sandbag crate"
+
/datum/supply_pack/sec_supply/wall_flash
name = "Wall-Mounted Flash Crate"
desc = "Contains four wall-mounted flashes."
@@ -65,25 +78,49 @@
name = "Survival Knives Crate"
desc = "Contains three sharpened survival knives. Each knife guaranteed to fit snugly inside any galactic-standard boot."
cost = 500
- contains = list(/obj/item/kitchen/knife/combat/survival,
- /obj/item/kitchen/knife/combat/survival,
- /obj/item/kitchen/knife/combat/survival)
+ contains = list(/obj/item/melee/knife/survival,
+ /obj/item/melee/knife/survival,
+ /obj/item/melee/knife/survival)
crate_name = "combat knife crate"
-/datum/supply_pack/sec_supply/fire
- name = "Incendiary Weapons Crate"
- desc = "Burn, baby burn. Contains three incendiary grenades and three prebuilt flamethrowers."
- cost = 5000
- contains = list(
- /obj/item/flamethrower/full,
- /obj/item/flamethrower/full,
- /obj/item/flamethrower/full,
- /obj/item/grenade/chem_grenade/incendiary,
- /obj/item/grenade/chem_grenade/incendiary,
- /obj/item/grenade/chem_grenade/incendiary,
- )
- crate_name = "incendiary weapons crate"
+/datum/supply_pack/sec_supply/machete
+ name = "Stampted Steel Machete Crate"
+ desc = "Contains five mass produced machetes. A perfect choice for crews on a budget."
+ cost = 500
+ contains = list(/obj/item/melee/sword/mass,
+ /obj/item/melee/sword/mass)
+ crate_name = "combat knife crate"
+
+/datum/supply_pack/sec_supply/flamethrower
+ name = "Flamethrower Crate"
+ desc = "Contains one flamethrower. Point the nozzle away from anything important."
+ cost = 1250
+ contains = list(/obj/item/flamethrower/full)
+ crate_name = "flamethrower crate"
+ crate_type = /obj/structure/closet/crate/secure/weapon
+
+ faction = /datum/faction/syndicate/ngr
+ faction_discount = 20
+
+/datum/supply_pack/sec_supply/incendiary_grenade
+ name = "Incendiary Grenade Crate"
+ desc = "Contains one incendiary grenade. Better not let it go off in your hands."
+ cost = 750
+ contains = list(/obj/item/grenade/chem_grenade/incendiary)
+ crate_name = "incendiary grenade crate"
crate_type = /obj/structure/closet/crate/secure/plasma
+ faction = /datum/faction/syndicate/ngr
+ faction_discount = 20
+
+/datum/supply_pack/sec_supply/halberd
+ name = "Energy Halberd Crate"
+ desc = "Contains one Solarian Energy Halberd, for issue to your local Sonnensoldner battalion."
+ cost = 1500
+ contains = list(/obj/item/energyhalberd)
+ crate_name = "energy halberd crate"
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
/*
Stamina / PVP weapons (intentionally overpriced due to odd balance position of stamina weapons)
@@ -105,35 +142,39 @@
/datum/supply_pack/sec_supply/baton
name = "Stun Batons Crate"
- desc = "Arm the Civil Protection Forces with three stun batons. Batteries included."
- cost = 9000
- contains = list(/obj/item/melee/baton/loaded,
- /obj/item/melee/baton/loaded,
- /obj/item/melee/baton/loaded)
+ desc = "Arm your vessel security with a stun baton. Batteries included."
+ cost = 3000
+ contains = list(/obj/item/melee/baton/loaded)
crate_name = "stun baton crate"
-/datum/supply_pack/sec_supply/disabler
- name = "Disabler Crate"
- desc = "Three stamina-draining disabler weapons."
- cost = 9000
- contains = list(/obj/item/gun/energy/disabler,
- /obj/item/gun/energy/disabler,
- /obj/item/gun/energy/disabler)
- crate_name = "disabler crate"
-
/datum/supply_pack/sec_supply/dragnet
name = "DRAGnet Crate"
- desc = "Contains three \"Dynamic Rapid-Apprehension of the Guilty\" netting devices, a recent breakthrough in law enforcement prisoner management technology."
- cost = 10000
- contains = list(/obj/item/gun/energy/e_gun/dragnet,
- /obj/item/gun/energy/e_gun/dragnet,
- /obj/item/gun/energy/e_gun/dragnet)
+ desc = "Contains one \"Dynamic Rapid-Apprehension of the Guilty\" netting device, a recent breakthrough in law enforcement prisoner management technology."
+ cost = 2000
+ contains = list(/obj/item/gun/energy/e_gun/dragnet)
crate_name = "\improper DRAGnet crate"
-/datum/supply_pack/sec_supply/taser
- name = "Hybrid Taser Crate"
- desc = "Two disabler-taser hybrid weapons."
- cost = 12000
- contains = list(/obj/item/gun/energy/e_gun/advtaser,
- /obj/item/gun/energy/e_gun/advtaser)
- crate_name = "hybrid taser crate"
+/datum/supply_pack/sec_supply/claymore
+ name = "C-10 Claymore Crate"
+ desc = "Four motion-activated directional mines, perfect for ambushing enemy infantry. Still debatably legal to sell!"
+ cost = 3000
+ contains = list(/obj/item/paper/fluff/claymore,
+ /obj/item/mine/directional/claymore,
+ /obj/item/mine/directional/claymore,
+ /obj/item/mine/directional/claymore,
+ /obj/item/mine/directional/claymore)
+ crate_name = "C-10 Claymore crate"
+
+/obj/item/paper/fluff/claymore
+ name = "PRODUCT USAGE GUIDE"
+ desc = "A dusty memo stamped with the Scarborough Arms logo."
+ default_raw_text = "ASSEMBLY:
\
+ -Deploy mounting legs and emplace device. Front should be placed in direction of enemy egress, no more then three meters from intended target area.
\
+ -INFORM ALLIES OF PLACEMENT LOCATION.
\
+ -Wait for arming sequence to complete.
\
+ -Enjoy hands-free area denial, courtesy of Scarborough Arms.
\
+ DISASSEMBLY & STORAGE:
\
+ -Insert screwdriver into arming pin access and turn 180 degrees. There will be considerable resistance. DO NOT Step onto or in front of device.
\
+ -When pressure releases, reach below device and lift via underside in one clean motion. Mounting legs will automatically retract.
\
+ -The device is now safe to handle.
\
+ -Safely stow device in secure, moisture-free location, away from fire and blunt force. "
diff --git a/code/modules/cargo/packs/spacesuit_armor.dm b/code/modules/cargo/packs/spacesuit_armor.dm
index 8346ea00b06..d0b1da6be6d 100644
--- a/code/modules/cargo/packs/spacesuit_armor.dm
+++ b/code/modules/cargo/packs/spacesuit_armor.dm
@@ -16,7 +16,7 @@
/datum/supply_pack/spacesuit_armor/pilot_spacesuit
name = "Pilot Space Suit Crate"
- desc = "One pilot space suit, for improved mobility in mechs."
+ desc = "One pilot space suit, for improved mobility in exosuits."
cost = 750
contains = list(/obj/item/clothing/suit/space/pilot,
/obj/item/clothing/head/helmet/space/pilot/random)
@@ -24,7 +24,7 @@
/datum/supply_pack/spacesuit_armor/mining_hardsuits_indie
name = "Mining Hardsuit Crate"
- desc = "One independent branded mining hardsuit for when explorer suits just dont cut it."
+ desc = "One independent-manufactured mining hardsuit, for when explorer suits just dont cut it."
cost = 1500
contains = list(/obj/item/clothing/suit/space/hardsuit/mining/independent)
crate_name = "mining hardsuit crate"
@@ -37,6 +37,7 @@
contains = list(/obj/item/clothing/suit/space/hardsuit/medical)
crate_name = "medical hardsuit crate"
crate_type = /obj/structure/closet/crate/medical
+ faction = /datum/faction/nt
/datum/supply_pack/spacesuit_armor/mining_hardsuit_heavy
name = "Heavy Mining Hardsuit Crate"
@@ -46,6 +47,7 @@
/obj/item/clothing/shoes/bhop)
crate_name = "heavy mining hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/plasma
+ faction = /datum/faction/nt
/datum/supply_pack/spacesuit_armor/sec_hardsuit_bundle
name = "Security Hardsuit Crate"
@@ -54,6 +56,7 @@
contains = list(/obj/item/clothing/suit/space/hardsuit/security/independent)
crate_name = "security hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/gear
+ faction = /datum/faction/nt
/datum/supply_pack/spacesuit_armor/sci_hardsuit
name = "Science Hardsuit Crate"
@@ -62,6 +65,7 @@
contains = list(/obj/item/clothing/suit/space/hardsuit/rd)
crate_name = "science hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/science
+ faction = /datum/faction/nt
/datum/supply_pack/spacesuit_armor/engi_spacesuit_bundle
name = "Engineering Space Suit Crate"
@@ -79,16 +83,7 @@
contains = list(/obj/item/clothing/suit/space/hardsuit/engine/atmos)
crate_name = "atmospherics hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/engineering
-
-/datum/supply_pack/spacesuit_armor/swat
- name = "SWAT Crate"
- desc = "Contains one fullbody set of tough, fireproof, pressurized suit designed in a joint effort by IS-ERI and Nanotrasen. The set contains a suit, helmet, and combat belt."
- cost = 3500
- contains = list(/obj/item/clothing/head/helmet/swat/nanotrasen,
- /obj/item/clothing/suit/space/swat,
- /obj/item/storage/belt/military/assault)
- crate_name = "swat crate"
- crate_type = /obj/structure/closet/crate/secure/gear
+ faction = /datum/faction/nt
/*
Non-spaceworthy (armor)
@@ -117,7 +112,8 @@
desc = "Contains one full set of bulletproof armor, guaranteed to reduce a bullet's stopping power by half but with limited protection against melee weaponry."
cost = 1750
contains = list(/obj/item/clothing/suit/armor/vest/bulletproof,
- /obj/item/clothing/head/helmet/bulletproof)
+ /obj/item/clothing/head/helmet/bulletproof,
+ /obj/item/clothing/glasses/sunglasses/ballistic)
crate_name = "bulletproof armor crate"
crate_type = /obj/structure/closet/crate/secure/plasma
@@ -128,3 +124,21 @@
contains = list(/obj/item/clothing/suit/armor/laserproof)
crate_name = "reflector vest crate"
crate_type = /obj/structure/closet/crate/secure/plasma
+
+/datum/supply_pack/spacesuit_armor/marine_armor
+ name = "Tactical Armor Crate"
+ desc = "One set of well-rounded tactical armor. While it does not protect the limbs, the vest is fairly durable. The set includes a helmet and vest."
+ cost = 1500
+ contains = list(/obj/item/clothing/suit/armor/vest/marine,
+ /obj/item/clothing/head/helmet/bulletproof/x11)
+ crate_name = "armor crate"
+ crate_type = /obj/structure/closet/crate/secure/plasma
+
+/datum/supply_pack/spacesuit_armor/medium_marine_armor
+ name = "Medium Tactical Armor Crate"
+ desc = "One set of well-rounded medium tactical body armor. Plates are attached to the vest and cover the limbs. The set includes a helmet and chestpiece."
+ cost = 3000
+ contains = list(/obj/item/clothing/suit/armor/vest/marine/medium,
+ /obj/item/clothing/head/helmet/bulletproof/x11)
+ crate_name = "armor crate"
+ crate_type = /obj/structure/closet/crate/secure/plasma
diff --git a/code/modules/cargo/packs/tools.dm b/code/modules/cargo/packs/tools.dm
index 6b43448a5d8..857477bcf92 100644
--- a/code/modules/cargo/packs/tools.dm
+++ b/code/modules/cargo/packs/tools.dm
@@ -25,7 +25,7 @@
contains = list(/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox/mechanical,
/obj/item/clothing/head/welding)
- cost = 500
+ cost = 200
crate_name = "toolbox crate"
/datum/supply_pack/tools/engigear
@@ -39,13 +39,19 @@
/obj/item/clothing/glasses/meson/engine)
crate_name = "engineering gear crate"
+/datum/supply_pack/tools/assbelt
+ name = "Assault Belt"
+ desc = "Contains an assault belt, with not one, not two, but six pockets."
+ cost = 500
+ contains = list(/obj/item/storage/belt/military/assault)
+ crate_name = "assault belt crate"
+
/datum/supply_pack/tools/cellcharger
name = "Cell Charger Crate"
desc = "Contains a cell charger, able to charge all sorts of power cells."
- cost = 4000
+ cost = 1000
contains = list(/obj/machinery/cell_charger)
-
/datum/supply_pack/tools/rped
name = "RPED crate"
desc = "Tired of deconstructing all of your machines just to replace the power cells? This device has you covered. Actual parts not included."
@@ -69,12 +75,11 @@
/datum/supply_pack/tools/jackhammer
name = "Jackhammer Crate"
- desc = "Contains a jackhammer, ideal for breaking rocks and breaking hull."
+ desc = "Contains a jackhammer, ideal for breaking rocks."
cost = 1750
contains = list(/obj/item/pickaxe/drill/jackhammer)
crate_name = "jackhammer crate"
-
/datum/supply_pack/tools/metalfoam
name = "Metal Foam Grenade Crate"
desc = "Seal up those pesky hull breaches with 7 metal foam grenades."
@@ -92,18 +97,40 @@
/datum/supply_pack/tools/jetpack
name = "Jetpack Crate"
desc = "For when you need to go fast in space."
- cost = 2000
+ cost = 750
contains = list(/obj/item/tank/jetpack/carbondioxide)
crate_name = "jetpack crate"
crate_type = /obj/structure/closet/crate/secure/plasma
-/datum/supply_pack/tools/transfer_valve
- name = "Tank Transfer Valves Crate"
- desc = "The key ingredient for making a lot of people very angry very fast. Contains a tank transfer valve."
- cost = 3000
- contains = list(/obj/item/transfer_valve)
- crate_name = "tank transfer valve crate"
- crate_type = /obj/structure/closet/crate/secure/science
+/datum/supply_pack/tools/jetpack/harness
+ name = "Jetpack Harness Crate"
+ desc = "A compact jetpack harness for those who don't wish to be weighed down by larger traditional jetpacks."
+ cost = 1500
+ contains = list(/obj/item/tank/jetpack/oxygen/harness)
+
+/datum/supply_pack/tools/anglegrinder
+ name = "Angle Grinder"
+ desc = "Contains one angle grinder pack, a tool used for quick structure deconstruction and salvaging"
+ cost = 1500
+ contains = list(
+ /obj/item/gear_pack/anglegrinder,
+ /obj/item/radio/headset/alt
+ )
+ crate_name = "angle grinder crate"
+
+/datum/supply_pack/tools/electric_welder
+ name = "Electric Welder"
+ desc = "Contains a single electric welder, useful for many applications. No fuel required!"
+ cost = 850
+ contains = list(/obj/item/weldingtool/electric)
+ crate_name = "electric welder crate"
+
+/datum/supply_pack/tools/plasmacutter
+ name = "Plasmacutter Crate"
+ desc = "Contains a plasmacutter, capable of rapidly breaking down hull."
+ cost = 2500
+ contains = list(/obj/item/gun/energy/plasmacutter)
+ crate_name = "plasmacutter crate"
/*
Liquid tanks
@@ -140,3 +167,14 @@
contains = list(/obj/structure/reagent_dispensers/foamtank)
crate_name = "foam tank crate"
crate_type = /obj/structure/closet/crate/large
+
+/datum/supply_pack/tools/radfoamtank
+ name = "Radiation Foam Tank Crate"
+ desc = "Contains a tank of anti-radiation foam. Pressurized sprayer included!"
+ cost = 1500
+ contains = list(
+ /obj/item/watertank/anti_rad,
+ /obj/structure/reagent_dispensers/foamtank/antirad
+ )
+ crate_name = "foam tank crate"
+ crate_type = /obj/structure/closet/crate/large
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index ab737b1ceb7..b9c30f48402 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -452,8 +452,11 @@
glow_effect.fadeAway(delays[POD_OPENING])
glow_effect = null
+/obj/structure/closet/supplypod/deconstruct(disassembled)
+ . = ..()
+ open_pod(src, broken = disassembled) //Lets dump our contents by opening up
+
/obj/structure/closet/supplypod/Destroy()
- open_pod(src, broken = TRUE) //Lets dump our contents by opening up
deleteRubble()
endGlow()
return ..()
diff --git a/code/modules/cargo/supplypod_beacon.dm b/code/modules/cargo/supplypod_beacon.dm
index 11fd10229e5..b9c41a29e11 100644
--- a/code/modules/cargo/supplypod_beacon.dm
+++ b/code/modules/cargo/supplypod_beacon.dm
@@ -7,7 +7,7 @@
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
- var/obj/machinery/computer/cargo/express/express_console
+ var/obj/machinery/computer/cargo/cargo_console
var/linked = FALSE
var/ready = FALSE
var/launched = FALSE
@@ -49,39 +49,39 @@
/obj/item/supplypod_beacon/examine(user)
. = ..()
- if(!express_console)
+ if(!cargo_console)
. += "[src] is not currently linked to an Express Supply console."
else
. += "Alt-click to unlink it from the Express Supply console."
/obj/item/supplypod_beacon/Destroy()
- if(express_console)
- express_console.beacon = null
+ if(cargo_console)
+ cargo_console.beacon = null
return ..()
/obj/item/supplypod_beacon/proc/unlink_console()
- if(express_console)
- express_console.beacon = null
- express_console = null
+ if(cargo_console)
+ cargo_console.beacon = null
+ cargo_console = null
update_status(SP_UNLINK)
update_status(SP_UNREADY)
-/obj/item/supplypod_beacon/proc/link_console(obj/machinery/computer/cargo/express/C, mob/living/user)
+/obj/item/supplypod_beacon/proc/link_console(obj/machinery/computer/cargo/C, mob/living/user)
if (C.beacon)//if new console has a beacon, then...
C.beacon.unlink_console()//unlink the old beacon from new console
- if (express_console)//if this beacon has an express console
- express_console.beacon = null//remove the connection the expressconsole has from beacons
- express_console = C//set the linked console var to the console
- express_console.beacon = src//out with the old in with the news
+ if (cargo_console)//if this beacon has an express console
+ cargo_console.beacon = null//remove the connection the expressconsole has from beacons
+ cargo_console = C//set the linked console var to the console
+ cargo_console.beacon = src//out with the old in with the news
update_status(SP_LINKED)
- if (express_console.use_beacon)
+ if (cargo_console.use_beacon)
update_status(SP_READY)
to_chat(user, "[src] linked to [C].")
/obj/item/supplypod_beacon/AltClick(mob/user)
if (!user.canUseTopic(src, !issilicon(user)))
return
- if (express_console)
+ if (cargo_console)
unlink_console()
else
to_chat(user, "There is no linked console.")
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 64e2476b400..b985ead4aca 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -190,7 +190,7 @@
var/next_move_dir_sub
/// If the client is currently under the restrictions of the interview system
- var/interviewee = FALSE
+ var/interviewee = TRUE
/// Used by SSserver_maint to detect if a client is newly AFK.
var/last_seen_afk = 0
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 87a33b0c989..5f1c211412c 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -277,6 +277,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
prefs.last_id = computer_id //these are gonna be used for banning
fps = prefs.clientfps == 0 ? 60 : prefs.clientfps //WS Edit - Client FPS Tweak
+ donator = GLOB.donators[ckey] || new /datum/donator(src)
+
if(fexists(roundend_report_file()))
add_verb(src, /client/proc/show_previous_roundend_report)
@@ -933,8 +935,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
..()
/client/proc/add_verbs_from_config()
- if (interviewee)
+ if(interviewee)
return
+ if(donator.is_donator)
+ add_verb(src, /client/proc/do_donator_redemption)
+ add_verb(src, /client/proc/do_donator_wcir)
if(CONFIG_GET(flag/see_own_notes))
add_verb(src, /client/proc/self_notes)
if(CONFIG_GET(flag/use_exp_tracking))
@@ -1167,3 +1172,13 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if("Set-Tab")
stat_tab = payload["tab"]
SSstatpanels.immediate_send_stat_data(src)
+
+///Gives someone hearted status for OOC, from behavior commendations
+/client/proc/adjust_heart(duration = 24 HOURS)
+ var/new_duration = world.realtime + duration
+ if(prefs.hearted_until > new_duration)
+ return
+ to_chat(src, "Someone awarded you a heart!")
+ prefs.hearted_until = new_duration
+ prefs.hearted = TRUE
+ prefs.save_preferences()
diff --git a/code/modules/client/loadout/_loadout.dm b/code/modules/client/loadout/_loadout.dm
index a0e5d6cab3c..44c1cff4ffa 100644
--- a/code/modules/client/loadout/_loadout.dm
+++ b/code/modules/client/loadout/_loadout.dm
@@ -20,11 +20,11 @@ GLOBAL_LIST_EMPTY(gear_datums)
if(G == initial(G.subtype_path))
continue
- if(!use_name)
- WARNING("Loadout - Missing display name: [G]")
+ if(!use_name && initial(G.path))
+ WARNING("Loadout gear [G] is missing display name")
continue
if(!initial(G.path) && use_category != "OOC") //OOC category does not contain actual items
- WARNING("Loadout - Missing path definition: [G]")
+ WARNING("Loadout gear [G] is missing path definition")
continue
if(!GLOB.loadout_categories[use_category])
diff --git a/code/modules/client/loadout/loadout_accessories.dm b/code/modules/client/loadout/loadout_accessories.dm
index 9c996baf4a9..e5b68bc00f6 100644
--- a/code/modules/client/loadout/loadout_accessories.dm
+++ b/code/modules/client/loadout/loadout_accessories.dm
@@ -131,7 +131,39 @@
display_name = "tie, recolorable"
path = /obj/item/clothing/neck/tie
+//Gloves
+
+/datum/gear/accessory/gloves
+ subtype_path = /datum/gear/accessory/gloves
+ slot = ITEM_SLOT_GLOVES
+
+/datum/gear/accessory/gloves/black
+ display_name = "gloves, black"
+ description = "Standard hand coverings for everyday use."
+ path = /obj/item/clothing/gloves/color/black
+
+/datum/gear/accessory/gloves/white
+ display_name = "gloves, white"
+ description = "Standard hand coverings for everyday use."
+ path = /obj/item/clothing/gloves/color/white
+
+/datum/gear/accessory/gloves/brown
+ display_name = "gloves, brown"
+ description = "Standard hand coverings for everyday use."
+ path = /obj/item/clothing/gloves/color/brown
+
+/datum/gear/accessory/gloves/fingerless
+ display_name = "gloves, fingerless"
+ description = "Radical hand coverings for everyday use."
+ path = /obj/item/clothing/gloves/fingerless
+
+/datum/gear/accessory/gloves/evening
+ display_name = "gloves, evening"
+ description = "Excessively fancy elbow-length gloves."
+ path = /obj/item/clothing/gloves/color/evening
+
//Bone
+
/datum/gear/accessory/fangnecklace
display_name = "wolf fang necklace"
path = /obj/item/clothing/neck/fangnecklace
@@ -141,6 +173,39 @@
path = /obj/item/clothing/accessory/bonearmlet
slot = null
+//Masks
+
+/datum/gear/accessory/mask
+ subtype_path = /datum/gear/accessory/mask
+ slot = ITEM_SLOT_MASK
+
+/datum/gear/accessory/mask/bandana
+ subtype_path = /datum/gear/accessory/mask/bandana
+
+/datum/gear/accessory/mask/bandana/red
+ display_name = "bandana, red"
+ path = /obj/item/clothing/mask/bandana/red
+
+/datum/gear/accessory/mask/bandana/skull
+ display_name = "bandana, skull"
+ path = /obj/item/clothing/mask/bandana/skull
+
+/datum/gear/accessory/mask/bandana/black
+ display_name = "bandana, black"
+ path = /obj/item/clothing/mask/bandana/black
+
+/datum/gear/accessory/mask/bandana/blue
+ display_name = "bandana, blue"
+ path = /obj/item/clothing/mask/bandana/blue
+
+/datum/gear/accessory/mask/surgical
+ display_name = "surgical mask"
+ path = /obj/item/clothing/mask/surgical
+
+/datum/gear/accessory/mask/balaclava
+ display_name = "balaclava"
+ path = /obj/item/clothing/mask/balaclava
+
//Misc
/datum/gear/accessory/waistcoat
@@ -153,10 +218,10 @@
path = /obj/item/clothing/neck/stethoscope
allowed_roles = list("Medical Doctor", "Chief Medical Officer")
-/datum/gear/accessory/collar
- display_name = "pet collar"
- description = "Only the truly insane would wear this around their neck."
- path = /obj/item/clothing/neck/petcollar
+/datum/gear/accessory/headphones
+ display_name = "headphones"
+ slot = ITEM_SLOT_EARS
+ path = /obj/item/instrument/piano_synth/headphones
/datum/gear/accessory/gloves
display_name = "plain gloves"
@@ -194,3 +259,7 @@
display_name = "face with tears of joy mask"
path = /obj/item/clothing/mask/joy
slot = ITEM_SLOT_MASK
+
+/datum/gear/accessory/pocketprotector
+ display_name = "pocket protector"
+ path = /obj/item/clothing/accessory/pocketprotector
diff --git a/code/modules/client/loadout/loadout_eyewear.dm b/code/modules/client/loadout/loadout_eyewear.dm
index 99e868ad085..b6962a8dc34 100644
--- a/code/modules/client/loadout/loadout_eyewear.dm
+++ b/code/modules/client/loadout/loadout_eyewear.dm
@@ -29,10 +29,6 @@
display_name = "eyepatch"
path = /obj/item/clothing/glasses/eyepatch
-/datum/gear/eyewear/monocle
- display_name = "monocle"
- path = /obj/item/clothing/glasses/monocle
-
/datum/gear/eyewear/cheapsuns
display_name = "cheap sunglasses"
path = /obj/item/clothing/glasses/cheapsuns
@@ -46,7 +42,10 @@
description = "A blindfold you can still see through."
path = /obj/item/clothing/glasses/trickblindfold
-
+/datum/gear/eyewear/doubleeyepatch
+ display_name = "double eyepatch"
+ description = "Two eyepatches at once! Effectively a blindfold, though."
+ path = /obj/item/clothing/glasses/blindfold/eyepatch
/datum/gear/eyewear/glasses/cold
display_name = "cold goggles"
diff --git a/code/modules/client/loadout/loadout_footwear.dm b/code/modules/client/loadout/loadout_footwear.dm
index dd4632f9bc3..3e65cd9ed5d 100644
--- a/code/modules/client/loadout/loadout_footwear.dm
+++ b/code/modules/client/loadout/loadout_footwear.dm
@@ -64,3 +64,17 @@
/datum/gear/footwear/color/white
display_name = "white shoes"
path = /obj/item/clothing/shoes/sneakers/white
+
+//Cowboy boots
+
+/datum/gear/footwear/cowboy
+ display_name = "cowboy boots, brown"
+ path = /obj/item/clothing/shoes/cowboy
+
+/datum/gear/footwear/cowboy/black
+ display_name = "cowboy boots, black"
+ path = /obj/item/clothing/shoes/cowboy/black
+
+/datum/gear/footwear/cowboy/white
+ display_name = "cowboy boots, white"
+ path = /obj/item/clothing/shoes/cowboy/white
diff --git a/code/modules/client/loadout/loadout_general.dm b/code/modules/client/loadout/loadout_general.dm
index 6277a8a3a60..712500f9fd6 100644
--- a/code/modules/client/loadout/loadout_general.dm
+++ b/code/modules/client/loadout/loadout_general.dm
@@ -14,10 +14,6 @@
display_name = "lipstick, red"
path = /obj/item/lipstick
-/datum/gear/balaclava
- display_name = "balaclava"
- path = /obj/item/clothing/mask/balaclava
-
/datum/gear/vape
display_name = "vape"
path = /obj/item/clothing/mask/vape
@@ -26,10 +22,6 @@
display_name = "e-cigar"
path = /obj/item/clothing/mask/vape/cigar
-/datum/gear/bandana
- display_name = "bandana, red"
- path = /obj/item/clothing/mask/bandana/red
-
/datum/gear/flask
display_name = "flask"
path = /obj/item/reagent_containers/food/drinks/flask
@@ -58,12 +50,17 @@
display_name = "toy, deck of cards"
path = /obj/item/toy/cards/deck
+/datum/gear/kotahi
+ display_name = "toy, deck of KOTAHI cards"
+ path = /obj/item/toy/cards/deck/kotahi
+
/datum/gear/eightball
display_name = "toy, magic eight ball"
path = /obj/item/toy/eightball
/datum/gear/pai
display_name = "personal AI device"
+ description = "A synthetic friend that fits in your pocket."
path = /obj/item/paicard
/datum/gear/tablet
@@ -86,6 +83,10 @@
display_name = "pen, four-color"
path = /obj/item/pen/fourcolor
+/datum/gear/fountainpen
+ display_name = "pen, fountain"
+ path = /obj/item/pen/fountain
+
/datum/gear/paperbin
display_name = "paper bin"
path = /obj/item/paper_bin
@@ -127,7 +128,6 @@
display_name = "toy, rilena tali plushie"
path = /obj/item/toy/plush/tali
-// Shiptest edit
/datum/gear/amongus
display_name = "toy, suspicious pill plushie"
path = /obj/item/toy/plush/among
@@ -150,8 +150,6 @@
display_name = "table bell, brass"
path = /obj/item/table_bell/brass
-// End Shiptest
-
/datum/gear/flashlight
display_name = "tool, flashlight"
path = /obj/item/flashlight
@@ -160,19 +158,11 @@
display_name = "tool, emergency crowbar"
path = /obj/item/crowbar/red
-/datum/gear/balloon
- display_name = "toy, balloon"
- path = /obj/item/toy/balloon
-
-/datum/gear/balloon/ian
- display_name = "toy, ian balloon"
- path = /obj/item/toy/balloon/corgi
-
-/datum/gear/surgical_mask
- display_name = "surgical mask"
- path = /obj/item/clothing/mask/surgical
-
/datum/gear/rilena_poster
display_name = "poster, rilena"
path = /obj/item/poster/random_rilena
description = "A random poster of the RILENA series."
+
+/datum/gear/camera
+ display_name = "polaroid camera"
+ path = /obj/item/camera
diff --git a/code/modules/client/loadout/loadout_hat.dm b/code/modules/client/loadout/loadout_hat.dm
index 28c57fa4762..729257735b9 100644
--- a/code/modules/client/loadout/loadout_hat.dm
+++ b/code/modules/client/loadout/loadout_hat.dm
@@ -27,6 +27,10 @@
display_name = "beret, red"
path = /obj/item/clothing/head/beret
+/datum/gear/hat/beret/black
+ display_name = "beret, black"
+ path = /obj/item/clothing/head/beret/black
+
/datum/gear/hat/beret/departmental
display_name = "beret, departmental"
path = /obj/item/clothing/head/beret/grey
@@ -74,6 +78,77 @@
path = /obj/item/clothing/head/beret/eng/hazard
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer")
+//Soft caps
+
+/datum/gear/hat/softcap
+ subtype_path = /datum/gear/hat/softcap
+
+/datum/gear/hat/softcap/red
+ display_name = "cap, red"
+ path = /obj/item/clothing/head/soft/red
+
+/datum/gear/hat/softcap/blue
+ display_name = "cap, blue"
+ path = /obj/item/clothing/head/soft/blue
+
+/datum/gear/hat/softcap/grey
+ display_name = "cap, grey"
+ path = /obj/item/clothing/head/soft/grey
+
+/datum/gear/hat/softcap/white
+ display_name = "cap, white"
+ path = /obj/item/clothing/head/soft/mime
+
+/datum/gear/hat/softcap/black
+ display_name = "cap, black"
+ path = /obj/item/clothing/head/soft/black
+
+/datum/gear/hat/utility_black
+ display_name = "utility cover, black"
+ path = /obj/item/clothing/head/soft/utility_black
+
+/datum/gear/hat/utility_olive
+ display_name = "utility cover, olive"
+ path = /obj/item/clothing/head/soft/utility_olive
+
+/datum/gear/hat/utility_beige
+ display_name = "utility cover, beige"
+ path = /obj/item/clothing/head/soft/utility_beige
+
+/datum/gear/hat/utility_navy
+ display_name = "utility cover, navy"
+ path = /obj/item/clothing/head/soft/utility_navy
+
+
+//Beanies
+
+/datum/gear/hat/beanie
+ display_name = "beanie, white"
+ path = /obj/item/clothing/head/beanie
+
+/datum/gear/hat/beanie/black
+ display_name = "beanie, black"
+ path = /obj/item/clothing/head/beanie/black
+
+/datum/gear/hat/beanie/red
+ display_name = "beanie, red"
+ path = /obj/item/clothing/head/beanie/red
+
+/datum/gear/hat/beanie/green
+ display_name = "beanie, green"
+ path = /obj/item/clothing/head/beanie/green
+
+/datum/gear/hat/beanie/purple
+ display_name = "beanie, purple"
+ path = /obj/item/clothing/head/beanie/purple
+
+/datum/gear/hat/beanie/blue
+ display_name = "beanie, blue"
+ path = /obj/item/clothing/head/beanie/darkblue
+
+/datum/gear/hat/beanie/orange
+ display_name = "beanie, orange"
+ path = /obj/item/clothing/head/beanie/orange
//Misc
/datum/gear/hat/that
@@ -81,21 +156,21 @@
path = /obj/item/clothing/head/that
/datum/gear/hat/fedora
- display_name = "fedora"
+ display_name = "fedora, black"
path = /obj/item/clothing/head/fedora
+/datum/gear/hat/fedora/white
+ display_name = "fedora, white"
+ path = /obj/item/clothing/head/fedora/white
+
+/datum/gear/hat/fedora/beige
+ display_name = "fedora, beige"
+ path = /obj/item/clothing/head/fedora/beige
+
/datum/gear/hat/flatcap
display_name = "flatcap"
path = /obj/item/clothing/head/flatcap
-/datum/gear/hat/beanie
- display_name = "beanie"
- path = /obj/item/clothing/head/beanie
-
-/datum/gear/hat/tinfoil
- display_name = "tinfoil hat"
- path = /obj/item/clothing/head/foilhat
-
/datum/gear/hat/wig
display_name = "wig"
path = /obj/item/clothing/head/wig
@@ -125,3 +200,7 @@
/datum/gear/hat/trapper
display_name = "trapper hat"
path = /obj/item/clothing/head/trapper
+
+/datum/gear/hat/flowers
+ display_name = "plastic flower, pickable"
+ path = /obj/item/clothing/head/plastic_flower
diff --git a/code/modules/client/loadout/loadout_suit.dm b/code/modules/client/loadout/loadout_suit.dm
index 718e474be98..5ad3518e167 100644
--- a/code/modules/client/loadout/loadout_suit.dm
+++ b/code/modules/client/loadout/loadout_suit.dm
@@ -23,10 +23,6 @@
display_name = "leather jacket"
path = /obj/item/clothing/suit/jacket/leather
-/datum/gear/suit/jacket/leather/overcoat
- display_name = "leather overcoat"
- path = /obj/item/clothing/suit/jacket/leather/overcoat
-
/datum/gear/suit/jacket/leather/duster
display_name = "leather duster"
path = /obj/item/clothing/suit/jacket/leather/duster
@@ -59,8 +55,6 @@
display_name = "suit jacket, charcoal"
path = /obj/item/clothing/suit/toggle/lawyer/charcoal
-/datum/gear/suit/jacket/navy //why is this blank? i dont know
-
/datum/gear/suit/jacket/hoodie_black
display_name = "hoodie, black"
path = /obj/item/clothing/suit/hooded/hoodie/black
@@ -85,6 +79,10 @@
display_name = "hoodie, T4L1"
path = /obj/item/clothing/suit/hooded/hoodie/rilena
+/datum/gear/suit/jacket/hoodie_baw
+ display_name = "hoodie, black w grey hood"
+ path = /obj/item/clothing/suit/hooded/hoodie/blackwa
+
/datum/gear/suit/jacket/highvis
display_name = "industrial jacket"
path = /obj/item/clothing/suit/toggle/industrial
@@ -93,11 +91,23 @@
display_name = "hazard jacket"
path = /obj/item/clothing/suit/toggle/hazard
-//Misc
-/datum/gear/suit/grponcho
- display_name = "poncho, green"
- path = /obj/item/clothing/suit/poncho/green
+//Suspenders
+/datum/gear/suit/suspenders
+ subtype_path = /datum/gear/suit/suspenders
+
+/datum/gear/suit/suspenders/red
+ display_name = "suspenders, red"
+ path = /obj/item/clothing/suit/toggle/suspenders
+/datum/gear/suit/suspenders/blue
+ display_name = "suspenders, blue"
+ path = /obj/item/clothing/suit/toggle/suspenders/blue
+
+/datum/gear/suit/suspenders/gray
+ display_name = "suspenders, gray"
+ path = /obj/item/clothing/suit/toggle/suspenders/gray
+
+//Misc
/datum/gear/suit/overalls
display_name = "overalls"
path = /obj/item/clothing/suit/apron/overalls
@@ -107,7 +117,7 @@
path = /obj/item/clothing/suit/toggle/labcoat
/datum/gear/suit/raincoat
- display_name = "Cybersun labcoat"
+ display_name = "translucent labcoat"
description = "Designer lab safety equipment. You're pretty sure this is just a raincoat."
path = /obj/item/clothing/suit/toggle/labcoat/raincoat
@@ -119,3 +129,11 @@
display_name = "floral shirt"
description = "From grills to guns, this shirt's seen it all."
path = /obj/item/clothing/suit/hawaiian
+
+/datum/gear/suit/hazardvest
+ display_name = "hazard vest"
+ path = /obj/item/clothing/suit/hazardvest
+
+/datum/gear/suit/longcoat
+ display_name = "longcoat"
+ path = /obj/item/clothing/suit/longcoat
diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm
index 616c4308b43..a042ab35307 100644
--- a/code/modules/client/loadout/loadout_uniform.dm
+++ b/code/modules/client/loadout/loadout_uniform.dm
@@ -53,10 +53,6 @@
display_name = "jumpsuit, random"
path = /obj/item/clothing/under/color/random //literally useless if grey assistants is off
-/datum/gear/uniform/color/rainbow
- display_name = "jumpsuit, rainbow"
- path = /obj/item/clothing/under/color/rainbow
-
//Shorts
/datum/gear/uniform/athshortsred
@@ -160,10 +156,6 @@
display_name = "suit, charcoal"
path = /obj/item/clothing/under/suit/charcoal
-/datum/gear/uniform/suit/galaxy
- display_name = "suit, galaxy"
- path = /obj/item/clothing/under/rank/civilian/lawyer/galaxy
-
/datum/gear/uniform/suit/white_skirt
display_name = "suitskirt, white shirt"
path = /obj/item/clothing/under/suit/black/skirt
@@ -184,46 +176,115 @@
display_name = "suit, checkered"
path = /obj/item/clothing/under/suit/checkered
+/datum/gear/uniform/suit/detective
+ display_name = "suit, hardworn"
+ path = /obj/item/clothing/under/rank/security/detective
+
+/datum/gear/uniform/suit/detective/skirt
+ display_name = "suitskirt, hardworn"
+ path = /obj/item/clothing/under/rank/security/detective/skirt
+
+/datum/gear/uniform/suit/detective/grey
+ display_name = "suit, noir"
+ path = /obj/item/clothing/under/rank/security/detective/grey
+
+/datum/gear/uniform/suit/detective/grey/skirt
+ display_name = "suitskirt, noir"
+ path = /obj/item/clothing/under/rank/security/detective/grey/skirt
+
// Dresses
/datum/gear/uniform/dress
subtype_path = /datum/gear/uniform/dress
/datum/gear/uniform/dress/sailor
- display_name = "sailor dress"
+ display_name = "dress, sailor"
path = /obj/item/clothing/under/dress/sailor
/datum/gear/uniform/dress/striped
- display_name = "striped dress"
+ display_name = "dress, striped"
path = /obj/item/clothing/under/dress/striped
/datum/gear/uniform/dress/redeveninggown
- display_name = "red evening gown"
+ display_name = "dress, red evening gown"
path = /obj/item/clothing/under/dress/redeveninggown
/datum/gear/uniform/dress/blacktango
- display_name = "black tango dress"
+ display_name = "dress, black tango"
path = /obj/item/clothing/under/dress/blacktango
+/datum/gear/uniform/dress/one_shoulder_dress
+
+ display_name = "dress, one shoulder"
+ path = /obj/item/clothing/under/dress/one_shoulder
+
+/datum/gear/uniform/dress/iko_ikssoal
+
+ display_name = "dress, iko-ikssoal"
+ path = /obj/item/clothing/under/dress/iko_ikssoal
+
+/datum/gear/uniform/dress/whitedress
+
+ display_name = "dress, white"
+ path = /obj/item/clothing/under/dress/white_dress
+
+/datum/gear/uniform/dress/sundress
+ display_name = "dress, sundress"
+ path = /obj/item/clothing/under/dress/sundress
+
+/datum/gear/uniform/dress/rilena
+ display_name = "dress, Ri cosplay"
+ path = /obj/item/clothing/under/dress/rilena
+
/datum/gear/uniform/dress/purpleskirt
- display_name = "purple skirt"
- path = /obj/item/clothing/under/dress/skirt/purple
+ display_name = "skirt, purple"
+ path = /obj/item/clothing/under/dress/skirt/color/purple
/datum/gear/uniform/dress/blueskirt
- display_name = "blue skirt"
- path = /obj/item/clothing/under/dress/skirt/blue
+ display_name = "skirt, blue"
+ path = /obj/item/clothing/under/dress/skirt/color/blue
/datum/gear/uniform/dress/redskirt
- display_name = "red skirt"
- path = /obj/item/clothing/under/dress/skirt/red
+ display_name = "skirt, red"
+ path = /obj/item/clothing/under/dress/skirt/color/red
+
+/datum/gear/uniform/dress/whiteskirt
+
+ display_name = "skirt, white"
+ path = /obj/item/clothing/under/dress/skirt/color/white
/datum/gear/uniform/dress/blackskirt
- display_name = "black skirt"
- path = /obj/item/clothing/under/dress/skirt
- description = "Actually, it's a black blouse with a salmon skirt. But it's not called that."
+ display_name = "skirt, black"
+ path = /obj/item/clothing/under/dress/skirt/color
-/datum/gear/uniform/dress/sundress
- display_name = "sundress"
- path = /obj/item/clothing/under/dress/sundress
+/datum/gear/uniform/dress/black_pinafore
+
+ display_name = "pinafore, black"
+ path = /obj/item/clothing/under/dress/skirt/pinafore
+
+/datum/gear/uniform/dress/maroon_pinafore
+
+ display_name = "pinafore, maroon"
+ path = /obj/item/clothing/under/dress/skirt/pinafore/maroon
+
+/datum/gear/uniform/dress/cerulean_pinafore
+
+ display_name = "pinafore, cerulean"
+ path = /obj/item/clothing/under/dress/skirt/pinafore/cerulean
+
+/datum/gear/uniform/dress/red_plaid_pinafore
+
+ display_name = "pinafore, red plaid"
+ path = /obj/item/clothing/under/dress/skirt/pinafore/plaid
+
+/datum/gear/uniform/dress/green_plaid_pinafore
+
+ display_name = "pinafore, green plaid"
+ path = /obj/item/clothing/under/dress/skirt/pinafore/plaid/green
+
+/datum/gear/uniform/dress/brown_plaid_pinafore
+
+ display_name = "pinafore, brown plaid"
+ path = /obj/item/clothing/under/dress/skirt/pinafore/plaid/brown
/datum/gear/uniform/suit/dress_suit
display_name = "dress-suit, navy"
@@ -232,12 +293,3 @@
/datum/gear/uniform/suit/dress_suit/skirt
display_name = "dress-suitskirt, navy"
path = /obj/item/clothing/under/suit/dresssuit/skirt
-
-/datum/gear/uniform/dress/rilena
- display_name = "red dress, Ri cosplay"
- path = /obj/item/clothing/under/dress/rilena
-
-//Premium
-/datum/gear/uniform/tacticool
- display_name = "tacticool turtleneck"
- path = /obj/item/clothing/under/syndicate/tacticool
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 7b07d68de0f..1e438a276f1 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
//doohickeys for savefiles
var/path
var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used
- var/max_save_slots = 20
+ var/max_save_slots = 30
//non-preference stuff
var/muted = 0
@@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/ooccolor = "#c43b23"
var/asaycolor = "#ff4500" //This won't change the color for current admins, only incoming ones.
/// If we spawn an ERT as an admin and choose to spawn as the briefing officer, we'll be given this outfit
- var/brief_outfit = /datum/outfit/centcom/commander
+ var/brief_outfit = /datum/outfit/job/nanotrasen/captain
var/enable_tips = TRUE
var/tip_delay = 500 //tip delay in milliseconds
@@ -229,6 +229,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
///The outfit we currently want to preview on our character
var/datum/outfit/job/selected_outfit
+ ///Someone thought we were nice! We get a little heart in OOC until we join the server past the below time (we can keep it until the end of the round otherwise)
+ var/hearted
+ ///
+ var/hearted_until
+
+
+
/datum/preferences/New(client/C)
parent = C
@@ -241,7 +248,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
load_path(C.ckey)
unlock_content = C.IsByondMember()
if(unlock_content)
- max_save_slots = 30
+ max_save_slots = 50
var/loaded_preferences_successfully = load_preferences()
if(loaded_preferences_successfully)
if(load_character())
@@ -932,7 +939,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
mutant_category = 0
// end generic adjective
- if("wings" in pref_species.default_features && GLOB.r_wings_list.len >1)
+ if(("wings" in pref_species.default_features) && GLOB.r_wings_list.len >1)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
@@ -1174,6 +1181,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(unlock_content || check_rights_for(user.client, R_ADMIN) || custom_ooc)
dat += "OOC Color:Change "
+ if(hearted_until)
+ dat += "Clear OOC Commend Heart "
+
dat += "
"
if(user.client.holder)
@@ -1192,7 +1202,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Hide Prayers:[(chat_toggles & CHAT_PRAYER)?"Shown":"Hidden"] "
dat += "Split Admin Tabs:[(toggles & SPLIT_ADMIN_TABS)?"Enabled":"Disabled"] "
dat += "Fast MC Refresh:[(toggles & FAST_MC_REFRESH)?"Enabled":"Disabled"] "
- dat += "Ignore Being Summoned as Cult Ghost:[(toggles & ADMIN_IGNORE_CULT_GHOST)?"Don't Allow Being Summoned":"Allow Being Summoned"] "
dat += "Briefing Officer Outfit:[brief_outfit] "
if(CONFIG_GET(flag/allow_admin_asaycolor))
dat += " "
@@ -1474,7 +1483,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
balance -= initial(quirk_type.value)
switch(change_type)
if("species")
- if((quirk_name in SSquirks.species_blacklist) && (pref_species.id in SSquirks.species_blacklist[quirk_name]))
+ if((quirk_name in SSquirks.species_blacklist) && (target_species.id in SSquirks.species_blacklist[quirk_name]))
all_quirks_new -= quirk_name
balance += initial(quirk_type.value)
if("mood")
@@ -2373,8 +2382,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
toggles ^= DEADMIN_POSITION_SECURITY
if("toggle_deadmin_silicon")
toggles ^= DEADMIN_POSITION_SILICON
- if("toggle_ignore_cult_ghost")
- toggles ^= ADMIN_IGNORE_CULT_GHOST
if("be_special")
var/be_special_type = href_list["be_special_type"]
@@ -2513,6 +2520,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(current_tab == 2)
show_loadout = TRUE
+ if("clear_heart")
+ hearted = FALSE
+ hearted_until = null
+ to_chat(user, "OOC Commendation Heart disabled")
+ save_preferences()
+
+
ShowChoices(user)
return 1
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 17a64288ec1..2b21871a465 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -208,15 +208,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
READ_FILE(S["pda_color"], pda_color)
READ_FILE(S["whois_visible"], whois_visible)
- // Custom hotkeys
- READ_FILE(S["key_bindings"], key_bindings)
- check_keybindings()
-
READ_FILE(S["show_credits"], show_credits)
//favorite outfits
READ_FILE(S["favorite_outfits"], favorite_outfits)
-
var/list/parsed_favs = list()
for(var/typetext in favorite_outfits)
var/datum/outfit/path = text2path(typetext)
@@ -224,6 +219,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
parsed_favs += path
favorite_outfits = uniqueList(parsed_favs)
+ // OOC commendations
+ READ_FILE(S["hearted_until"], hearted_until)
+ if(hearted_until > world.realtime)
+ hearted = TRUE
+
+ // Custom hotkeys
+ READ_FILE(S["key_bindings"], key_bindings)
+ check_keybindings()
+
//try to fix any outdated data if necessary
if(needs_update >= 0)
var/bacpath = "[path].updatebac" //todo: if the savefile version is higher then the server, check the backup, and give the player a prompt to load the backup
@@ -352,6 +356,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["key_bindings"], key_bindings)
WRITE_FILE(S["favorite_outfits"], favorite_outfits)
WRITE_FILE(S["whois_visible"], whois_visible)
+ WRITE_FILE(S["hearted_until"], (hearted_until > world.realtime ? hearted_until : null))
return TRUE
/datum/preferences/proc/load_character(slot)
@@ -463,9 +468,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
READ_FILE(S["equipped_gear"], equipped_gear)
if(config) //This should *probably* always be there, but just in case.
if(length(equipped_gear) > CONFIG_GET(number/max_loadout_items))
- to_chat(parent, "Loadout maximum items exceeded in loaded slot, Your loadout has been cleared! You had [length(equipped_gear)]/[CONFIG_GET(number/max_loadout_items)] equipped items!")
+ to_chat(parent, span_userdanger("Loadout maximum items exceeded in loaded slot, Your loadout has been cleared! You had [length(equipped_gear)]/[CONFIG_GET(number/max_loadout_items)] equipped items!"))
equipped_gear = list()
- WRITE_FILE(S["equipped_gear"] , equipped_gear)
+ WRITE_FILE(S["equipped_gear"], equipped_gear)
+
+ for(var/gear in equipped_gear)
+ if(!(gear in GLOB.gear_datums))
+ to_chat(parent, span_warning("Removing nonvalid loadout item [gear] from loadout"))
+ equipped_gear -= gear //be GONE
+ WRITE_FILE(S["equipped_gear"], equipped_gear)
READ_FILE(S["feature_human_tail"], features["tail_human"])
READ_FILE(S["feature_human_ears"], features["ears"])
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index ea626f397e5..fb2ade22a6d 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -61,6 +61,9 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
keyname = "[icon2html('icons/member_content.dmi', world, "blag")][keyname]"
if(prefs.custom_ooc)
keyname = "[keyname]"
+ if(prefs.hearted)
+ var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
+ keyname = "[sheet.icon_tag("emoji-heart")][keyname]"
//The linkify span classes and linkify=TRUE below make ooc text get clickable chat href links if you pass in something resembling a url
for(var/client/C in GLOB.clients)
if(C.prefs.chat_toggles & CHAT_OOC)
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index f5c37b18997..7fb618f34dd 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -12,10 +12,12 @@
// Damn our lack of abstract interfeces
if (istype(target, /obj/item/clothing/head/chameleon/drone))
var/obj/item/clothing/head/chameleon/drone/X = target
- X.chameleon_action.random_look(owner)
+ var/datum/action/item_action/chameleon/change/chameleon_action_x = locate() in X.actions
+ chameleon_action_x.random_look(owner)
if (istype(target, /obj/item/clothing/mask/chameleon/drone))
var/obj/item/clothing/mask/chameleon/drone/Z = target
- Z.chameleon_action.random_look(owner)
+ var/datum/action/item_action/chameleon/change/chameleon_action_z = locate() in Z.actions
+ chameleon_action_z.random_look(owner)
return 1
@@ -133,7 +135,8 @@
if(helmet_type)
var/obj/item/clothing/head/chameleon/hat = H.head
- hat.chameleon_action.update_look(user, helmet_type)
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in hat.actions
+ chameleon_action.update_look(user, helmet_type)
// ID card sechud
if(outfit.job_icon)
@@ -320,11 +323,9 @@
can_adjust = FALSE
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/under/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/under
chameleon_action.chameleon_name = "Jumpsuit"
chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank, /obj/item/clothing/under/changeling), only_root_path = TRUE)
@@ -334,10 +335,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/under/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/suit/chameleon
@@ -351,11 +354,9 @@
resistance_flags = NONE
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/suit/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/suit
chameleon_action.chameleon_name = "Suit"
chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/suit/armor/abductor, /obj/item/clothing/suit/changeling), only_root_path = TRUE)
@@ -365,10 +366,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/suit/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/glasses/chameleon
@@ -379,11 +382,9 @@
resistance_flags = NONE
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/glasses/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/glasses
chameleon_action.chameleon_name = "Glasses"
chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/glasses/changeling, only_root_path = TRUE)
@@ -393,10 +394,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/glasses/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/gloves/chameleon
@@ -408,11 +411,9 @@
resistance_flags = NONE
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/gloves/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/gloves
chameleon_action.chameleon_name = "Gloves"
chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/gloves, /obj/item/clothing/gloves/color, /obj/item/clothing/gloves/changeling), only_root_path = TRUE)
@@ -422,10 +423,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/gloves/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/head/chameleon
@@ -436,11 +439,9 @@
resistance_flags = NONE
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/head/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/head
chameleon_action.chameleon_name = "Hat"
chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/head/changeling, only_root_path = TRUE)
@@ -450,10 +451,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/head/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/head/chameleon/drone
@@ -465,6 +468,7 @@
/obj/item/clothing/head/chameleon/drone/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.random_look()
var/datum/action/item_action/chameleon/drone/togglehatmask/togglehatmask_action = new(src)
togglehatmask_action.UpdateButtonIcon()
@@ -486,11 +490,9 @@
var/voice_change = 1 ///This determines if the voice changer is on or off.
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/mask/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/mask
chameleon_action.chameleon_name = "Mask"
chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/mask/changeling, only_root_path = TRUE)
@@ -500,10 +502,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/mask/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/mask/chameleon/attack_self(mob/user)
@@ -519,6 +523,7 @@
/obj/item/clothing/mask/chameleon/drone/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.random_look()
var/datum/action/item_action/chameleon/drone/togglehatmask/togglehatmask_action = new(src)
togglehatmask_action.UpdateButtonIcon()
@@ -537,11 +542,9 @@
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/shoes/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/shoes
chameleon_action.chameleon_name = "Shoes"
chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/shoes/changeling, only_root_path = TRUE)
@@ -551,6 +554,7 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/shoes/chameleon/noslip
@@ -562,15 +566,15 @@
/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/storage/backpack/chameleon
name = "backpack"
- var/datum/action/item_action/chameleon/change/chameleon_action
/obj/item/storage/backpack/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/storage/backpack
chameleon_action.chameleon_name = "Backpack"
chameleon_action.initialize_disguises()
@@ -579,21 +583,22 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/storage/backpack/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/storage/belt/chameleon
name = "toolbelt"
desc = "Holds tools."
- var/datum/action/item_action/chameleon/change/chameleon_action
/obj/item/storage/belt/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/storage/belt
chameleon_action.chameleon_name = "Belt"
chameleon_action.initialize_disguises()
@@ -607,19 +612,17 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/storage/belt/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
-/obj/item/radio/headset/chameleon
- name = "radio headset"
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/radio/headset/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/radio/headset
chameleon_action.chameleon_name = "Headset"
chameleon_action.initialize_disguises()
@@ -628,19 +631,17 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/radio/headset/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
-/obj/item/pda/chameleon
- name = "PDA"
- var/datum/action/item_action/chameleon/change/pda/chameleon_action
-
/obj/item/pda/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/pda
chameleon_action.chameleon_name = "PDA"
chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/pda/heads, /obj/item/pda/ai, /obj/item/pda/ai/pai), only_root_path = TRUE)
@@ -650,24 +651,24 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/pda/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
-/obj/item/stamp/chameleon
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/stamp/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/stamp
chameleon_action.chameleon_name = "Stamp"
chameleon_action.initialize_disguises()
/obj/item/stamp/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/neck/chameleon
@@ -677,12 +678,9 @@
resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-/obj/item/clothing/neck/chameleon
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/neck/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/neck
chameleon_action.chameleon_name = "Neck Accessory"
chameleon_action.initialize_disguises()
@@ -691,8 +689,10 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/neck/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 166f437dc3a..c07c52a57e8 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -29,9 +29,9 @@
var/can_be_bloody = TRUE
- //Var modification - PLEASE be careful with this I know who you are and where you live
- var/list/user_vars_to_edit //VARNAME = VARVALUE eg: "name" = "butts"
- var/list/user_vars_remembered //Auto built by the above + dropped() + equipped()
+ //set during equip_to_slot, removed when taking off.
+ //here lies some of the most batshit insane reference code I've ever seen. Look it up in the commit history
+ var/datum/weakref/wearer
var/pocket_storage_component_path
@@ -42,6 +42,13 @@
/// If this can be eaten by a moth
var/moth_edible = TRUE
+ // Not used yet
+ /// Trait modification, lazylist of traits to add/take away, on equipment/drop in the correct slot
+ var/list/clothing_traits
+
+ ///sets the icon path of the onmob blood overlay created by this object. syntax is "[var]blood"
+ var/blood_overlay_type = "uniform"
+
/obj/item/clothing/Initialize()
if((clothing_flags & VOICEBOX_TOGGLABLE))
actions_types += /datum/action/item_action/toggle_voice_box
@@ -103,31 +110,58 @@
return TRUE
return ..()
-/obj/item/clothing/Destroy()
- user_vars_remembered = null //Oh god somebody put REFERENCES in here? not to worry, we'll clean it up
- return ..()
-
/obj/item/clothing/dropped(mob/user)
..()
if(!istype(user))
return
- if(LAZYLEN(user_vars_remembered))
- for(var/variable in user_vars_remembered)
- if(variable in user.vars)
- if(user.vars[variable] == user_vars_to_edit[variable]) //Is it still what we set it to? (if not we best not change it)
- user.vars[variable] = user_vars_remembered[variable]
- user_vars_remembered = initial(user_vars_remembered) // Effectively this sets it to null.
+ for(var/trait in clothing_traits)
+ REMOVE_CLOTHING_TRAIT(user, trait)
+ if(wearer?.resolve())
+ wearer = null
/obj/item/clothing/equipped(mob/user, slot)
..()
if (!istype(user))
return
if(slot_flags & slot) //Was equipped to a valid slot for this item?
- if (LAZYLEN(user_vars_to_edit))
- for(var/variable in user_vars_to_edit)
- if(variable in user.vars)
- LAZYSET(user_vars_remembered, variable, user.vars[variable])
- user.vv_edit_var(variable, user_vars_to_edit[variable])
+ for(var/trait in clothing_traits)
+ ADD_CLOTHING_TRAIT(user, trait)
+ if(!wearer?.resolve())
+ wearer = WEAKREF(user)
+
+/**
+ * Inserts a trait (or multiple traits) into the clothing traits list
+ *
+ * If worn, then we will also give the wearer the trait as if equipped
+ *
+ * This is so you can add clothing traits without worrying about needing to equip or unequip them to gain effects
+ */
+/obj/item/clothing/proc/attach_clothing_traits(trait_or_traits)
+ if(!islist(trait_or_traits))
+ trait_or_traits = list(trait_or_traits)
+
+ LAZYOR(clothing_traits, trait_or_traits)
+ var/mob/wearer = loc
+ if(istype(wearer) && (wearer.get_slot_by_item(src) & slot_flags))
+ for(var/new_trait in trait_or_traits)
+ ADD_CLOTHING_TRAIT(wearer, new_trait)
+
+/**
+ * Removes a trait (or multiple traits) from the clothing traits list
+ *
+ * If worn, then we will also remove the trait from the wearer as if unequipped
+ *
+ * This is so you can add clothing traits without worrying about needing to equip or unequip them to gain effects
+ */
+/obj/item/clothing/proc/detach_clothing_traits(trait_or_traits)
+ if(!islist(trait_or_traits))
+ trait_or_traits = list(trait_or_traits)
+
+ LAZYREMOVE(clothing_traits, trait_or_traits)
+ var/mob/wearer = loc
+ if(istype(wearer))
+ for(var/new_trait in trait_or_traits)
+ REMOVE_CLOTHING_TRAIT(wearer, new_trait)
/obj/item/clothing/examine(mob/user)
. = ..()
@@ -382,11 +416,19 @@
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
else
- if(attached_accessory)
- remove_accessory(user)
+ if(attached_accessory && ispath(attached_accessory.pocket_storage_component_path) && loc == user)
+ attached_accessory.attack_hand(user)
+ return
else
rolldown()
+/obj/item/clothing/under/CtrlClick(mob/user)
+ if(..())
+ return 1
+ if(attached_accessory)
+ remove_accessory(user)
+
+
/obj/item/clothing/under/verb/jumpsuit_adjust()
set name = "Adjust Jumpsuit Style"
set category = null
@@ -472,3 +514,17 @@
deconstruct(FALSE)
else
..()
+
+///sets up the proper bloody overlay for a clothing object, using species data
+/obj/item/clothing/proc/setup_blood_overlay()
+ var/overlay_file = 'icons/effects/blood.dmi'
+
+ var/mob/living/carbon/human/wearing = wearer?.resolve()
+ var/custom_overlay_icon = wearing?.dna.species.custom_overlay_icon
+ if(custom_overlay_icon)
+ overlay_file = custom_overlay_icon
+
+ var/mutable_appearance/bloody_clothing = mutable_appearance(overlay_file, "[blood_overlay_type]blood")
+ bloody_clothing.color = get_blood_dna_color(return_blood_DNA())
+
+ return bloody_clothing
diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm
index ce87ea624d7..cdb3dcfce75 100644
--- a/code/modules/clothing/factions/clip.dm
+++ b/code/modules/clothing/factions/clip.dm
@@ -140,10 +140,10 @@
icon_state = "clip_trenchcoat"
item_state = "trenchcoat_solgov"
- body_parts_covered = CHEST|LEGS|ARMS
+ body_parts_covered = CHEST|GROIN
armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
- cold_protection = CHEST|LEGS|ARMS
- heat_protection = CHEST|LEGS|ARMS
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ heat_protection = CHEST|GROIN|LEGS|ARMS
supports_variations = DIGITIGRADE_VARIATION_SAME_ICON_FILE
@@ -156,7 +156,7 @@
icon_state = "clip_captaincoat"
item_state = "clip_captaincoat"
- body_parts_covered = CHEST|LEGS|ARMS
+ body_parts_covered = CHEST
armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
cold_protection = CHEST|LEGS|ARMS
heat_protection = CHEST|LEGS|ARMS
@@ -215,7 +215,7 @@
armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 60, "fire" = 50, "acid" = 80)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/clip_spotter
- allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
resistance_flags = null
slowdown = 1
@@ -240,7 +240,7 @@
//hats
/obj/item/clothing/head/clip
name = "\improper CLIP Minutemen service cap"
- desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. While usually given to recruits and volunteers, it's sometimes used by occasionally by some Minutemen."
+ desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. While usually given to recruits and new volunteers, it's used occasionally by some Minutemen."
icon = 'icons/obj/clothing/faction/clip/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
vox_override_icon = 'icons/mob/clothing/faction/clip/vox.dmi'
@@ -330,6 +330,8 @@
icon_state = "clip_m10_correspondant"
item_state = "clip_m10_correspondant"
+ supports_variations = VOX_VARIATION
+
/obj/item/clothing/head/helmet/riot/clip
name = "\improper Minutemen riot helmet"
desc = "Designed to protect against close range attacks. Mainly used by the CMM-BARD against hostile xenofauna, it also sees prolific use on some Minutemen member worlds."
@@ -382,6 +384,14 @@
supports_variations = SNOUTED_VARIATION
+/obj/item/clothing/mask/balaclava/combat
+ name = "combat balaclava"
+ desc = "A surprisingly advanced balaclava. While it doesn't muffle your voice, it has a mouthpiece for internals. Comfy to boot!"
+ icon_state = "combat_balaclava"
+ item_state = "combat_balaclava"
+ alternate_worn_layer = BODY_LAYER
+ flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
+
//gloves
/obj/item/clothing/gloves/color/latex/nitrile/clip
@@ -415,36 +425,46 @@
supports_variations = VOX_VARIATION
-/obj/item/storage/belt/military/clip/p16/PopulateContents()
+/obj/item/storage/belt/military/clip/cm82/PopulateContents()
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/p16(src)
new /obj/item/grenade/frag(src)
-/obj/item/storage/belt/military/clip/gal/PopulateContents()
+/obj/item/storage/belt/military/clip/f4/PopulateContents()
for(var/i in 1 to 4)
- new /obj/item/ammo_box/magazine/gal(src)
+ new /obj/item/ammo_box/magazine/f4_308(src)
new /obj/item/grenade/frag(src)
/obj/item/storage/belt/military/clip/cm5/PopulateContents()
for(var/i in 1 to 4)
- new /obj/item/ammo_box/magazine/smgm9mm(src)
+ new /obj/item/ammo_box/magazine/cm5_9mm(src)
new /obj/item/grenade/frag(src)
/obj/item/storage/belt/military/clip/cm15/PopulateContents()
for(var/i in 1 to 5)
- new /obj/item/ammo_box/magazine/cm15_mag(src)
+ new /obj/item/ammo_box/magazine/cm15_12g(src)
new /obj/item/grenade/frag(src)
-/obj/item/storage/belt/military/clip/e50/PopulateContents()
+/obj/item/storage/belt/military/clip/cm15_inc/PopulateContents()
for(var/i in 1 to 5)
+ new /obj/item/ammo_box/magazine/cm15_12g/incendiary(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/military/clip/e50/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/storage/belt/military/clip/e50/PopulateContents()
+ for(var/i in 1 to 3)
new /obj/item/stock_parts/cell/gun/large(src)
new /obj/item/grenade/frag(src)
- new /obj/item/screwdriver/nuke(src)
+ new /obj/item/screwdriver(src)
/obj/item/storage/belt/military/clip/engi/PopulateContents()
new /obj/item/screwdriver/power(src)
new /obj/item/crowbar/power(src)
- new /obj/item/weldingtool/experimental(src)
+ new /obj/item/weldingtool/electric(src)
new /obj/item/multitool(src)
new /obj/item/construction/rcd/combat(src)
new /obj/item/extinguisher/mini(src)
@@ -453,7 +473,7 @@
/obj/item/storage/belt/military/clip/flamer/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/glass/beaker/large/fuel(src)
- new /obj/item/ammo_box/magazine/co9mm(src)
+ new /obj/item/ammo_box/magazine/cm23(src)
/obj/item/storage/belt/medical/webbing/clip
name = "medical webbing"
diff --git a/code/modules/clothing/factions/frontiersmen.dm b/code/modules/clothing/factions/frontiersmen.dm
index 9bac6c40a00..7c485782326 100644
--- a/code/modules/clothing/factions/frontiersmen.dm
+++ b/code/modules/clothing/factions/frontiersmen.dm
@@ -10,6 +10,7 @@
can_adjust = FALSE
icon = 'icons/obj/clothing/faction/frontiersmen/uniforms.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/uniforms.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/frontiersmen/deckhand
name = "\improper deckhand jumpsuit"
@@ -40,24 +41,26 @@
//Unarmored suits//
///////////////////
-/obj/item/clothing/suit/frontiersmen
+/obj/item/clothing/suit/frontiersmen //Ideally, the basic suit model here should be turned into a placeholder model, and this item have "smock" or "apron" added on the end.
name = "frontiersmen smock"
desc = "A basic white surgical apron worn by the Frontiersmen. It seems it could stain very easily..."
icon_state = "frontier_surgery"
icon = 'icons/obj/clothing/faction/frontiersmen/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/suits.dmi'
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
//////////////////
//Armored suits//
/////////////////
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier
- name = "\improper Frontiersmen bulletproof armor"
+/obj/item/clothing/suit/armor/vest/frontier
+ name = "\improper Frontiersmen armor vest"
desc = "A scrap piece of armor made of disused protective plates. This one was used to protect the squishy bits of a Frontiersman, once."
icon_state = "frontier_armor"
icon = 'icons/obj/clothing/faction/frontiersmen/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/suits.dmi'
blood_overlay_type = "armor"
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/armor/vest/marine/frontier
name = "light tactical armor vest"
@@ -71,13 +74,13 @@
name = "reinforced fur coat"
desc = "A stiff olive-green coat, meant for frigid conditions. Commonly worn by Frontiersmen command."
icon_state = "frontier_coat"
- body_parts_covered = CHEST|GROIN|ARMS
+ body_parts_covered = CHEST|GROIN
cold_protection = CHEST|GROIN|ARMS
heat_protection = CHEST|GROIN|ARMS
icon_state = "frontier_coat"
item_state = "frontier_coat"
blood_overlay_type = "coat"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
icon = 'icons/obj/clothing/faction/frontiersmen/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/suits.dmi'
@@ -85,7 +88,7 @@
name = "frontiersmen fireproof coat"
desc = "A stiff olive-green coat, used particularly by Frontiersmen flame troopers. It seems to be lined with asbestos, to provide maximum heat and fire deterrence... At the cost of comfort. And mesothelioma."
icon_state = "frontier_fireproof_suit"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.9
permeability_coefficient = 0.5
@@ -127,7 +130,7 @@
name = "frontiersman cap"
desc = "An olive-green and grey baseball hat, worn by cargo technicians working under the Frontiersmen. Even they have the rights for a cool cap!"
icon_state = "frontiersoft"
- soft_type = "frontiersmen"
+ soft_type = "frontier"
icon = 'icons/obj/clothing/faction/frontiersmen/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/head.dmi'
@@ -142,7 +145,7 @@
name = "\improper Frontiersmen officer beret"
desc = "A scratchy olive green beret emblazoned with the Frontiersmen insignia, worn by Frontiersmen who want to look good while intimidating freighter captains."
icon_state = "frontier_officer_beret"
- armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
/obj/item/clothing/head/frontier
name = "frontier surgical cap"
@@ -162,17 +165,20 @@
name = "\improper frontiersmen commander's cap"
desc = "An imposing peaked cap, meant for a commander of the Frontiersmen."
icon_state = "frontier_cap"
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/frontier/admiral
name = "\improper frontiersmen admiral's cap"
desc = "An imposing peaked cap meant for only the highest of officers of the Frontiersmen pirate fleet."
icon_state = "frontier_admiral_cap"
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/helmet/bulletproof/x11/frontier
name = "\improper frontiersmen X-11 helmet"
desc = "A heavily modified X-11 pattern helmet used by the Frontiersmen pirate fleet."
icon_state = "x11helm_frontier"
unique_reskin = null
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/helmet/bulletproof/x11/frontier/fireproof
name = "\improper fireproof frontiersmen X-11 helmet"
@@ -184,12 +190,18 @@
resistance_flags = FIRE_PROOF
armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
-/obj/item/clothing/head/helmet/marine/frontier
+/obj/item/clothing/head/helmet/frontier
name = "frontiersmen reinforced helmet"
desc = "A reinforced Frontiersmen X-11. The front plate has a small window to let the user see."
icon_state = "marine_frontier"
icon = 'icons/obj/clothing/faction/frontiersmen/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/head.dmi'
+ armor = list("melee" = 35, "bullet" = 55, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50)
+ slowdown = 0.1
+ min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
+ clothing_flags = STOPSPRESSUREDAMAGE | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
////////////
//Glasses//
@@ -225,6 +237,33 @@
unique_reskin = null
+/obj/item/storage/belt/security/military/frontiersmen/illestren/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/illestren_a850r(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/security/military/frontiersmen/skm_ammo/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/skm_762_40(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/security/military/frontiersmen/mauler_mp_ammo/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m9mm_mauler(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/security/military/frontiersmen/spitter_ammo/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/spitter_9mm(src)
+ new /obj/item/grenade/frag(src)
+
+/obj/item/storage/belt/security/military/frontiersmen/flamer/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/reagent_containers/glass/beaker/large/napalm(src)
+ new /obj/item/grenade/frag(src)
+
+
/obj/item/storage/belt/medical/webbing/frontiersmen
name = "leather medical bandolier"
desc = "A rudimentary leather bandolier, utilized by both independents and frontiersmen alike. This one is painted white, usually to be worn by a medic."
@@ -243,18 +282,10 @@
new /obj/item/hypospray/mkii(src)
update_appearance()
-
-/obj/item/storage/belt/security/military/frontiersmen/skm_ammo/PopulateContents()
- for(var/i in 1 to 4)
- new /obj/item/ammo_box/magazine/skm_762_40(src)
- new /obj/item/grenade/frag(src)
-
-/obj/item/storage/belt/security/military/frontiersmen/aps_mp_ammo/PopulateContents() //replace with spitter. remind me.
- for(var/i in 1 to 4)
- new /obj/item/ammo_box/magazine/pistolm9mm(src)
- new /obj/item/grenade/frag(src)
-
-/obj/item/storage/belt/security/military/frontiersmen/flamer/PopulateContents()
- for(var/i in 1 to 4)
- new /obj/item/reagent_containers/glass/beaker/large/napalm(src)
- new /obj/item/grenade/frag(src)
+/obj/item/storage/belt/medical/webbing/frontiersmen/combat/PopulateContents()
+ new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
+ new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/stack/medical/gauze/twelve(src)
+ new /obj/item/stack/medical/splint(src)
diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm
index aa274e15948..2466ebb3a5c 100644
--- a/code/modules/clothing/factions/gezena.dm
+++ b/code/modules/clothing/factions/gezena.dm
@@ -36,10 +36,12 @@
item_state = "bluecloth"
blood_overlay_type = "coat"
togglename = "zipper"
- body_parts_covered = CHEST
+ body_parts_covered = CHEST|GROIN|ARMS
+ cold_protection = CHEST|GROIN|ARMS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
- armor = list("melee" = 20, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
//Armored suit
@@ -100,6 +102,10 @@
w_class = WEIGHT_CLASS_NORMAL
supports_variations = DIGITIGRADE_VARIATION
+/obj/item/clothing/suit/space/gezena/Initialize()
+ . = ..()
+ allowed = GLOB.security_hardsuit_allowed
+
/obj/item/clothing/head/helmet/space/gezena
name = "\improper Eridanite model E-3 helmet"
desc = "A celebration of the diversity in Epsilon Eridani, the E-3 spacesuit helmet features rubberized grommets fitting for any length of horn, and an internal monitor for life support."
@@ -130,6 +136,9 @@
desc = "The standard cap of the Epsilon Eridani Armed Forces, in Navy colors. Due to the hazards of sunburn and insect-spread diseases, this cap features a flap on its back."
icon_state = "navalflap"
item_state = "bluecloth"
+ cold_protection = HEAD
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
/obj/item/clothing/head/gezena/marine
name = "\improper EAFMC Cap"
@@ -143,6 +152,12 @@
icon_state = "marineflap"
item_state = "marinecloth"
+/obj/item/clothing/head/gezena/flap/marine
+ name = "\improper PGFMC Betzu-il cap"
+ desc = "The standard cap of the PGF military, in Marine Corps colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects."
+ icon_state = "marineflap"
+ item_state = "marinecloth"
+
/obj/item/clothing/head/gezena/marine/lead
name = "\improper EAFMC Commander Cap"
desc = "The standard cap of the PGF military, in Marine Corps colors. The silver markings denote it as a commander's cap."
@@ -155,6 +170,12 @@
icon_state = "squadflap"
item_state = "marinecloth"
+/obj/item/clothing/head/gezena/flap/marine/lead
+ name = "\improper PGFMC Commander's' Betzu-il cap"
+ desc = "The standard cap of the PGF military, in Marine Corps colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. The silver markings denote it as a commander's cap."
+ icon_state = "squadflap"
+ item_state = "marinecloth"
+
/obj/item/clothing/head/gezena/medic
name = "\improper EAF medic cap"
desc = "The standard cap of the Epsilon Eridani Armed Forces. The coloring indicates the wearer as a medical officer."
@@ -167,6 +188,12 @@
icon_state = "medicflap"
item_state = "whitecloth"
+/obj/item/clothing/head/gezena/flap/medic
+ name = "\improper PGF medic Betzu-il cap"
+ desc = "The standard cap of the PGF military. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. The coloring indicates the wearer as a medical officer."
+ icon_state = "medicflap"
+ item_state = "whitecloth"
+
/obj/item/clothing/head/gezena/captain // no captain flap yet(?)
name = "\improper EAFN captain's cap"
desc = "The standard cap of the Epsilon Eridani Armed Forces, in Navy colors. The decoration indicates the wearer as a ship's Captain."
@@ -212,7 +239,6 @@
name = "\improper PGFN Captain's Gripper Gloves"
desc = "As the name suggests, the gloves employed by the Epsilon Eridani Armed Forces are designed to ensure the highest possible grip is maintained while also providing protection from blisters in work environments. Bears the silver standard of an Eridanite captain."
icon_state = "captaingloves"
- siemens_coefficient = 0
//Boots
@@ -220,7 +246,7 @@
name = "\improper Eridanite steel-toed boots"
desc = "These boots have steel protection around the toes. Standard issue to all members of all branches of the Epsilon Eridani Armed Forces."
icon = 'icons/obj/clothing/faction/gezena/feet.dmi'
- //mob_overlay_icon = 'icons/mob/clothing/faction/gezena/feet.dmi' todo: find out why digi breaks here
+ mob_overlay_icon = 'icons/mob/clothing/faction/gezena/feet.dmi'
icon_state = "pgfboots"
item_state = "jackboots"
@@ -237,6 +263,20 @@
item_state = "bluecloth"
unique_reskin = null
+/obj/item/storage/belt/military/gezena/bg16/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/stock_parts/cell/gun/pgf(src)
+ new /obj/item/screwdriver(src)
+
+/obj/item/storage/belt/military/gezena/engineer/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 2)
+ new /obj/item/stock_parts/cell/gun/pgf(src)
+ new /obj/item/screwdriver(src)
+ new /obj/item/grenade/c4
+ new /obj/item/grenade/c4
+
/obj/item/storage/belt/medical/gezena
name = "\improper EAF Medical gear harness"
desc = "A lightweight harness covered in pouches, supplied to the ground troops of the EAF. This variant is designed for carrying medical supplies."
@@ -247,6 +287,17 @@
icon_state = "medpouches"
item_state = "whitecloth"
+/obj/item/storage/belt/medical/gezena/paramedic/PopulateContents()
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/synthflesh(src)
+ new /obj/item/stack/medical/gauze/twelve(src)
+ new /obj/item/stack/medical/splint(src)
+ . = ..()
+
+
//Cloaks
/obj/item/clothing/neck/cloak/gezena
diff --git a/code/modules/clothing/factions/hardliners.dm b/code/modules/clothing/factions/hardliners.dm
index 958657920e7..e27c11c9eef 100644
--- a/code/modules/clothing/factions/hardliners.dm
+++ b/code/modules/clothing/factions/hardliners.dm
@@ -28,13 +28,14 @@
//Unarmored suits//
///////////////////
-/obj/item/clothing/suit/hardliners
+/obj/item/clothing/suit/hardliners //Ideally, the basic suit model here should be turned into a placeholder model, and this item have "smock" or "apron" added on the end.
name = "white smock"
desc = "A plain-white surgical smock typically worn by both Hardliners and Cybersun staff. Even mercenaries need medical attention!"
icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
icon_state = "hl_apron"
item_state = "whitecloth"
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
/obj/item/clothing/suit/hazardvest/hardliners
name = "blood-red hazard vest"
@@ -44,6 +45,20 @@
icon_state = "hl_hazard"
item_state = "whitecloth"
+/obj/item/clothing/suit/hooded/wintercoat/security/hardliners
+ name = "hardliner winter coat"
+ desc = "A stark-white winter coat used by Marauders of the Hardliner movement, the zipper tab displaying the cracked emblem of the Gorlex Marauders."
+ icon_state = "coathl"
+ item_state = "coathl"
+ icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
+ hoodtype = /obj/item/clothing/head/hooded/winterhood/security/hardliners
+
+/obj/item/clothing/head/hooded/winterhood/security/hardliners
+ icon_state = "hood_hl"
+ icon = 'icons/obj/clothing/faction/hardliners/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/head.dmi'
+
//////////////////
//Armored suits//
/////////////////
@@ -69,22 +84,22 @@
/obj/item/clothing/suit/armor/hardliners/sergeant
name = "hardliners sergeant jacket"
desc = "An armored jacket typically worn by sergeant of the Hardliners. They're reminiscent of the garb worn by old Gorlex navymen, prior to its destruction."
- body_parts_covered = CHEST|GROIN|ARMS
+ body_parts_covered = CHEST|GROIN
icon_state = "hl_sergeant"
item_state = "hl_sergeant"
blood_overlay_type = "coat"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
/obj/item/clothing/suit/toggle/armor/vest/hardliners
name = "hardliners captain coat"
desc = "An imposing armored coat worn by captains of Hardliner fleets, hand-designed by Cybersun tailors to provide maximum protection to its wearer."
- body_parts_covered = CHEST|GROIN|ARMS
+ body_parts_covered = CHEST|GROIN
icon_state = "hl_captain"
item_state = "hl_captain"
icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
blood_overlay_type = "coat"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"
///////////////
@@ -111,7 +126,27 @@
icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl
- lightweight = 1
+ jetpack = null
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/hl
+ name = "elite white-red hardsuit helmet"
+ desc = "An elite version of the infamous white-red Hardliner hardsuit, with improved armor and fireproofing. It is in EVA mode. Property of Gorlex Marauders."
+ alt_desc = "An elite version of the infamous white-red Hardliner hardsuit, with improved armor and fireproofing. It is in combat mode. Property of Gorlex Marauders."
+ icon_state = "hardsuit0-hlelite"
+ hardsuit_type = "hlelite"
+ icon = 'icons/obj/clothing/faction/hardliners/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/head.dmi'
+
+/obj/item/clothing/suit/space/hardsuit/syndi/elite/hl
+ name = "elite white-red hardsuit"
+ desc = "An elite version of the infamous white-red Hardliner hardsuit, with improved armor and fireproofing. It is in travel mode."
+ alt_desc = "An elite version of the infamous white-red Hardliner hardsuit, with improved armor and fireproofing. It is in combat mode."
+ icon_state = "hardsuit0-hlelite"
+ item_state = "hardsuit0-hlelite"
+ hardsuit_type = "hlelite"
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/hl
+ icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
jetpack = null
/////////
@@ -150,7 +185,7 @@
/obj/item/clothing/head/helmet/hardliners/swat
name = "hardliners pilot helmet"
- desc = "A modified X-11 helmet utilized by regular pilots, as well as the feared mech pilots of the Hardliner movement. The attached visor helps protect against sudden flashes from explosions."
+ desc = "A modified X-11 helmet utilized by regular pilots, as well as the feared exosuit pilots of the Hardliner movement. The attached visor helps protect against sudden flashes from explosions."
flash_protect = FLASH_PROTECTION_WELDER
icon_state = "hl_pilot"
item_state = "hl_pilot"
@@ -179,3 +214,9 @@
item_state = "hl_webbing"
icon = 'icons/obj/clothing/faction/hardliners/belt.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/belt.dmi'
+
+/obj/item/storage/belt/security/webbing/hardliners/sidewinder/PopulateContents()
+ . = ..()
+ new /obj/item/ammo_box/magazine/m57_39_sidewinder(src)
+ new /obj/item/ammo_box/magazine/m57_39_sidewinder(src)
+ new /obj/item/ammo_box/magazine/m57_39_sidewinder(src)
diff --git a/code/modules/clothing/factions/nanotrasen.dm b/code/modules/clothing/factions/nanotrasen.dm
index 664c534d236..9d2c8ba3899 100644
--- a/code/modules/clothing/factions/nanotrasen.dm
+++ b/code/modules/clothing/factions/nanotrasen.dm
@@ -9,7 +9,8 @@
righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
icon_state = "deckhand"
item_state = "graycloth"
- supports_variations = DIGITIGRADE_VARIATION
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
// Engineering uniforms
/obj/item/clothing/under/nanotrasen/engineering
@@ -17,12 +18,16 @@
desc = "A dirty grey jumpsuit with reflective blue flashes on the limbs and a wrench icon on the back. A Nanotrasen, Inc. logo is stitched into the collar."
icon_state = "engi"
item_state = "greycloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/engineering/atmos
name = "atmospherics jumpsuit"
desc = "A thick grey jumpsuit with black stripes and an 'O2' icon on the back. A Nanotrasen, Inc. logo is stitched into the collar."
icon_state = "atmos_tech"
item_state = "greycloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/engineering/director
name = "engineering director's overalls"
@@ -30,18 +35,23 @@
icon_state = "engi_director"
item_state = "blackcloth"
+
//Supply uniforms
/obj/item/clothing/under/nanotrasen/supply
name = "cargo handler shorts"
desc = "A cheap work shirt and black shorts, typical of cargo handlers and clerks at N+S Logistics."
icon_state = "supply"
item_state = "browncloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/supply/qm
name = "supply director slacks"
desc = "Crisp slacks and a pressed brown shirt that any supply director could be proud of. N+S Logistics' compass rose logo is embossed on every button."
icon_state = "supply_director"
item_state = "browncloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/supply/miner
name = "mining overalls"
@@ -74,12 +84,16 @@
desc = "A crisp white shirt with blue stripes on the arms, identifying the owner as trained Nanotrasen medical staff. The faint smell of antiseptic won't wash out."
icon_state = "doctor"
item_state = "whitecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/medical/paramedic
name = "paramedic uniform"
desc = "Tough synthetic pants and a white uniform shirt, designed to handle all manner of scrapes and splashes in the line of duty. The tag identifies this as property of Nanotrasen, Inc."
icon_state = "paramedic"
item_state = "whitecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/medical/director
name = "medical director's slacks"
@@ -94,24 +108,32 @@
desc = "A grey jumpsuit with purple sleeves and faint stains on the elbows and knees. It looks stiff and cheap, but is surprisingly comfortable."
icon_state = "janitor"
item_state = "graycloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/affairs
name = "neatly pleated slacks"
desc = "Flawlessly pleated slacks and a linen shirt with the Nanotrasen logo stitched repeatedly into the cuffs and collar. It exudes an aura of quiet authority."
icon_state = "affairs"
item_state = "whitecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/security
name = "security slacks"
desc = "A starched grey uniform with red arm flashes, of a type seen throughout the core worlds. The Vigilitas Interstellar logo is proudly emblazoned on the front."
icon_state = "security"
item_state = "graycloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/security/director
name = "security director's slacks"
desc = "A robust crimson uniform, heavily starched, with a Vigilitas logo neatly stitched onto either end of the collar. The last line of defense for Vigilitas's managerial staff."
icon_state = "security_director"
item_state = "redcloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
//Command uniforms
/obj/item/clothing/under/nanotrasen/captain
@@ -163,24 +185,31 @@
desc = "A thick fluid-repelling smock rendered in what is unmistakeably Nanotrasen Blue. The tag on the inside declares it property of Nanotrasen, Inc."
icon_state = "med_smock"
item_state = "bluecloth"
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
/obj/item/clothing/suit/nanotrasen/suitjacket
name = "fancy black suit jacket"
desc = "A fine black linen suit jacket with blue markings and a Nanotrasen lapel pin. It has a strangely menacing aura."
icon_state = "suit_jacket"
item_state = "blackcloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/nanotrasen/vest
name = "black hazard vest"
desc = "A thin black vest with reflective markings, worn to guarantee visibility when operating around industrial equipment or in dark or dusty conditions. Property of Nanotrasen, Inc."
icon_state = "engi_vest"
item_state = "blackcloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/nanotrasen/vest/blue
name = "blue hazard vest"
desc = "A thin vest with reflective stripes, worn to guarantee visibility in dangerous conditions. The vest itself is an offensively bright shade of Nanotrasen Blue. Property of Nanotrasen, Inc."
icon_state = "atmos_vest"
item_state = "bluecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/toggle/nanotrasen
name = "officer's coat"
@@ -230,19 +259,23 @@
icon_state = "armor"
item_state = "blackcloth"
body_parts_covered = CHEST|GROIN
- armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 50, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
resistance_flags = FIRE_PROOF
/obj/item/clothing/suit/armor/nanotrasen/slim
name = "slim armor vest"
icon_state = "armor_slim"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/armor/nanotrasen/sec_director
name = "security director's overcoat"
desc = "A tailored black overcoat, made from cutting-edge ballistic fabrics and composites. Vigilitas's 'VI' logo is embossed on every button. Intimidating and profoundly stylish."
icon_state = "command_coat"
- body_parts_covered = CHEST|GROIN|ARMS
- armor = list("melee" = 30, "bullet" = 0, "laser" = 30, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
+ body_parts_covered = CHEST|GROIN
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/armor/nanotrasen/captain
name = "captain's jacket"
@@ -250,7 +283,7 @@
icon_state = "armor_captain"
item_state = "bluecloth"
body_parts_covered = CHEST|GROIN
- armor = list("melee" = 50, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
+ armor = list("melee" = 50, "bullet" = 40, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
resistance_flags = FIRE_PROOF
/obj/item/clothing/suit/armor/nanotrasen/captain/parade
@@ -258,7 +291,7 @@
desc = "An exquisitely-decorated fine blue jacket, suitable for especially formal situations, or for a commanding officer who wants to flaunt their status even more than usual. Richly decorated with gold thread and embroidered Nanotrasen logos."
icon_state = "captain_formal"
item_state = "bluecloth"
- body_parts_covered = CHEST|GROIN|ARMS
+ body_parts_covered = CHEST|GROIN
armor = list("melee" = 30, "bullet" = 0, "laser" = 30, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
// Hats //
@@ -336,8 +369,10 @@
desc = "A blue peaked hat with red silk decoration and an embroidered Nanotrasen logo, worn exclusively by management."
icon_state = "officer_peaked"
item_state = "bluecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
-/obj/item/clothing/head/nanotrasen/officer
+/obj/item/clothing/head/nanotrasen/officer/fedora
name = "officer's fedora"
desc = "A fedora in a violent shade of Nanotrasen Blue, with a red silk band."
icon_state = "officer_fedora"
@@ -354,6 +389,8 @@
desc = "A decorated blue peaked cap, rife with laurels and gold thread, with a large badge on the front displaying the Nanotrasen, Inc. logo. This hat practically oozes authority."
icon_state = "com_peaked"
item_state = "bluecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/hardhat/nanotrasen //TODO: inhands for hardhats
name = "black heavy-duty hat"
@@ -364,18 +401,24 @@
righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
icon_state = "hardhat_black"
item_state = "blackcloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/hardhat/nanotrasen/blue
name = "blue heavy-duty hat"
desc = "A tough plastic helmet with suspension rig, designed to protect against blunt impacts. This one is brightly colored in Nanotrasen Blue, with the company logo on the front."
icon_state = "hardhat_blue"
item_state = "bluecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/hardhat/nanotrasen/white
name = "white heavy-duty hat"
desc = "An extremely tough plastic helmet with suspension rig, designed to protect against blunt impacts. This one is colored bright white, typical of managerial staff, and has a Nanotrasen logo on the front."
icon_state = "hardhat_white"
item_state = "graycloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
// Neck //
@@ -389,3 +432,19 @@
righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
icon_state = "sash"
item_state = "redcloth"
+
+// Mask //
+
+/obj/item/clothing/mask/gas/vigilitas
+ name = "Vigilitas gas mask"
+ desc = "A protective gas mask designed for first response, specialist operations, and counter terrorism by Vigilitas Interstellar officers. It features a wide scratch resistant visor, ports for connecting an oxygen supply, and secure, comfortable straps."
+ icon = 'icons/obj/clothing/faction/nanotrasen/mask.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/nanotrasen/mask.dmi'
+ kepori_override_icon = 'icons/mob/clothing/faction/nanotrasen/mask_kepori.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
+ icon_state = "vigi_gas_mask"
+ item_state = "vigi_gas_mask"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ supports_variations = KEPORI_VARIATION | VOX_VARIATION
diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm
index 7892a098b50..366fa3b37cf 100644
--- a/code/modules/clothing/factions/ngr.dm
+++ b/code/modules/clothing/factions/ngr.dm
@@ -11,10 +11,11 @@
can_adjust = FALSE
icon = 'icons/obj/clothing/faction/ngr/uniforms.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/uniforms.dmi'
+ supports_variations = DIGITIGRADE_VARIATION
/obj/item/clothing/under/syndicate/ngr/fatigues
name = "\improper NGR fatigues"
- desc = "Beige fatigues used primarily by the ship and mech pilots of the New Gorlex Republic."
+ desc = "Beige fatigues used primarily by the shuttle and exosuit pilots of the New Gorlex Republic."
icon_state = "ngr_fatigues"
item_state = "ngr_fatigues"
@@ -29,6 +30,7 @@
desc = "A button-up in a tasteful black with beige pants, used by officers of the New Gorlex Republic."
icon_state = "ngr_officer"
item_state = "ngr_officer"
+ supports_variations = DIGITIGRADE_VARIATION
/obj/item/clothing/under/plasmaman/ngr
name = "\improper NGR phorid envirosuit"
@@ -56,6 +58,7 @@
desc = "A blood-red surgical smock typically worn by field medics of the New Gorlex Republic. It hides red blood really well!"
icon_state = "ngr_apron"
item_state = "redcloth"
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
/obj/item/clothing/suit/hazardvest/ngr
name = "blood-red hazard vest"
@@ -64,6 +67,21 @@
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/suits.dmi'
icon_state = "ngr_hazard"
item_state = "redcloth"
+ supports_variations = VOX_VARIATION
+
+/obj/item/clothing/suit/hooded/wintercoat/security/ngr
+ name = "NGR winter coat"
+ desc = "A sleek beige winter coat used by the Second Battlegroup of the New Gorlex Republic, the zipper tab proudly displays the official emblem of the NGR."
+ icon_state = "coatngr"
+ item_state = "coatngr"
+ icon = 'icons/obj/clothing/faction/ngr/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/ngr/suits.dmi'
+ hoodtype = /obj/item/clothing/head/hooded/winterhood/security/ngr
+
+/obj/item/clothing/head/hooded/winterhood/security/ngr
+ icon_state = "hood_ngr"
+ icon = 'icons/obj/clothing/faction/ngr/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/ngr/head.dmi'
//////////////////
//Armored suits//
@@ -81,20 +99,20 @@
/obj/item/clothing/suit/armor/ngr/lieutenant
name = "\improper 2nd Battlegroup overcoat"
desc = "An armored overcoat worn by the lieutenants of the New Gorlex Republic's 2nd Battlegroup."
- body_parts_covered = CHEST|GROIN|ARMS
+ body_parts_covered = CHEST|GROIN
icon_state = "ngr_lieutenant"
item_state = "ngr_lieutenant"
blood_overlay_type = "coat"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
/obj/item/clothing/suit/armor/ngr/captain
name = "\improper 2nd Battlegroup coat"
desc = "An armored coat worn by captains the New Gorlex Republic's 2nd Battlegroup."
- body_parts_covered = CHEST|GROIN|ARMS
+ body_parts_covered = CHEST|GROIN
icon_state = "ngr_captain"
item_state = "ngr_captain"
blood_overlay_type = "coat"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
///////////////
//Spacesuits//
@@ -120,8 +138,8 @@
icon = 'icons/obj/clothing/faction/ngr/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/suits.dmi'
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ngr
- lightweight = 1
jetpack = null
+ greyscale_colors = list("#33353a", "#d9ad82", "#8c1a34")
/obj/item/clothing/head/helmet/space/plasmaman/ngr
name = "NGR phorid envirosuit helmet"
@@ -141,7 +159,6 @@
icon_state = "ngr_garrison"
icon = 'icons/obj/clothing/faction/ngr/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/head.dmi'
- armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
/obj/item/clothing/head/ngr/flap
name = "beige flap cap"
@@ -204,21 +221,22 @@
//Masks//
/////////
-/obj/item/clothing/mask/gas/sechailer/balaclava/ngr
+/obj/item/clothing/mask/balaclava/ngr
name = "NGR combat balaclava"
- desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the New Gorlex Republic to protect against sandstorms."
+ desc = "A surprisingly advanced balaclava. While it doesn't muffle your voice, it has a mouthpiece for internals. Comfy to boot! This version is commonly used by the soldiers of the New Gorlex Republic to protect against sandstorms."
icon_state = "ngr_balaclava"
item_state = "ngr_balaclava"
icon = 'icons/obj/clothing/faction/ngr/mask.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/mask.dmi'
-/obj/item/clothing/mask/gas/syndicate/ngr
+/obj/item/clothing/mask/breath/ngr
name = "NGR face mask"
desc = "A face mask that covers the nose, mouth and neck of those who wear it. Favored by field medics over the balaclava due to lessened heat while wearing."
icon_state = "ngr_facemask"
item_state = "ngr_facemask"
icon = 'icons/obj/clothing/faction/ngr/mask.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/mask.dmi'
+ supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION
//////////
//Neck//
@@ -230,6 +248,7 @@
icon_state = "ngr_shemagh"
icon = 'icons/obj/clothing/faction/ngr/neck.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/neck.dmi'
+ supports_variations = VOX_VARIATION
//////////
//Belts//
@@ -242,3 +261,14 @@
item_state = "ngr_webbing"
icon = 'icons/obj/clothing/faction/ngr/belt.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/belt.dmi'
+
+/obj/item/storage/belt/security/webbing/ngr/cobra/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m45_cobra(src)
+
+/obj/item/storage/belt/security/webbing/ngr/hydra_grenadier/PopulateContents()
+ for(var/i in 1 to 3)
+ new /obj/item/ammo_box/magazine/m556_42_hydra(src)
+ new /obj/item/ammo_casing/a40mm(src)
+ new /obj/item/ammo_casing/a40mm(src)
diff --git a/code/modules/clothing/factions/srm.dm b/code/modules/clothing/factions/srm.dm
index cd901306b7a..34e6b4218fe 100644
--- a/code/modules/clothing/factions/srm.dm
+++ b/code/modules/clothing/factions/srm.dm
@@ -10,6 +10,7 @@
can_adjust = FALSE
icon = 'icons/obj/clothing/faction/srm/uniforms.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/srm/uniforms.dmi'
+ supports_variations = KEPORI_VARIATION
//////////////////
//Armored suits//
@@ -20,17 +21,19 @@
desc = "A coat made from hard leather. Meant to withstand long hunts in harsh wilderness."
icon_state = "armor_rouma"
item_state = "rouma_coat"
- body_parts_covered = CHEST|GROIN|ARMS
+ body_parts_covered = CHEST|GROIN
cold_protection = CHEST|GROIN|ARMS
heat_protection = CHEST|GROIN|ARMS
icon = 'icons/obj/clothing/faction/srm/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi'
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/suit/armor/roumain/shadow
name = "saint-roumain shadow duster"
desc = "A coat made from hard leather. Its rough, barely-treated finish is typical of one of the Saint-Roumain Militia's trainees."
icon_state = "armor_rouma_shadow"
item_state = "rouma_shadow_coat"
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/suit/toggle/labcoat/roumain_med
name = "saint-roumain medical duster"
@@ -38,7 +41,8 @@
icon = 'icons/obj/clothing/faction/srm/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi'
icon_state = "rouma_med_coat"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/suit/hazardvest/roumain
name = "saint-roumain machinist leather vest"
@@ -47,31 +51,34 @@
mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi'
icon_state = "armor_rouma_machinist"
item_state = "rouma_coat"
- armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 40, "bomb" = 35, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
+ armor = list("melee" = 35, "bullet" = 20, "laser" = 20, "energy" = 40, "bomb" = 35, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
/obj/item/clothing/suit/armor/roumain/flamebearer
name = "saint-roumain flamebearer robes"
desc = "A set of ashy-grey robes made from hard leather, adorned with gold trims. Its rough finish after a near-char and application of aromatics is heavily favored for the ecclesiastical sect of the Church of Saint Roumain, a living reminder of the Ashen Huntsman himself."
icon_state = "armor_rouma_flamebearer"
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/suit/armor/roumain/colligne
name = "saint-roumain colligne coat"
desc = "A well-maintained hard leather coat typically worn to denote the rank of Colligne, a trainee Hunter Montagne. It is treated with bullet-resistant materials, and lined with the dark fur of Illestrian dire wolves."
icon_state = "armor_rouma_colligne"
item_state = "rouma_coat"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
+ body_parts_covered = CHEST|GROIN
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/suit/armor/roumain/montagne
name = "saint-roumain montagne coat"
desc = "A stylish red coat to indicate that you are, in fact, a Hunter Montagne. Made of extra hard exotic leather, treated with bullet-resistant materials, and lined with the fur of some unidentifiable creature."
icon_state = "armor_rouma_montagne"
item_state = "rouma_montagne_coat"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
- armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
+ body_parts_covered = CHEST|GROIN
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
+ supports_variations = KEPORI_VARIATION
///////////////
//Spacesuits//
@@ -86,6 +93,7 @@
item_state = "hardsuit0-roumain"
hardsuit_type = "roumain"
worn_y_offset = 4
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/suit/space/hardsuit/solgov/roumain
name = "\improper roumain hardsuit"
@@ -96,6 +104,7 @@
item_state = "hardsuit-roumain"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov/roumain
slowdown = 0.5
+ supports_variations = KEPORI_VARIATION
/////////
//Hats//
@@ -107,11 +116,13 @@
icon_state = "rouma_hat"
icon = 'icons/obj/clothing/faction/srm/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/srm/head.dmi'
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/head/cowboy/sec/roumain/shadow
name = "shadow's hat"
desc = "A rough, simple hat. The way it covers your eyes makes you feel badass, but you just look like a wannabe hunter."
icon_state = "rouma_shadow_hat"
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/head/cowboy/sec/roumain/machinist
name = "machinist's hat"
@@ -122,21 +133,25 @@
name = "medical hunter's hat"
desc = "A very wide-brimmed, round hat treated with oil and wax. Somehow manages to look stylish and creepy at the same time."
icon_state = "rouma_med_hat"
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/head/cowboy/sec/roumain/flamebearer
name = "flamebearer's hat"
desc = "A wide-brimmed, pointed hat with charred leather, granting it an ash-grey appearance. The design honors the one the Ashen Huntsman himself wore, according to legend."
icon_state = "rouma_flamebearer_hat"
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/head/cowboy/sec/roumain/colligne
name = "colligne's hat"
desc = "A fancy, pointy leather hat with a large feather plume to signal that you are, in fact... A Hunter Colligne. You still have some ways to go before you gain the title of Montagne."
icon_state = "rouma_colligne_hat"
+ supports_variations = KEPORI_VARIATION
/obj/item/clothing/head/cowboy/sec/roumain/montagne
name = "montagne's hat"
desc = "A very fancy hat with a large feather plume to signal that you are, in fact, a Hunter Montagne. The exotic fur lining is impeccably soft."
icon_state = "rouma_montagne_hat"
+ supports_variations = KEPORI_VARIATION
///////////////
//Accessories//
diff --git a/code/modules/clothing/factions/suns.dm b/code/modules/clothing/factions/suns.dm
index df6d831e479..bce8586c913 100644
--- a/code/modules/clothing/factions/suns.dm
+++ b/code/modules/clothing/factions/suns.dm
@@ -162,7 +162,7 @@
/////////////////
-/obj/item/clothing/suit/armor/vest/bulletproof/suns
+/obj/item/clothing/suit/armor/vest/suns
name = "peacekeeper plating"
desc = "A standard issue set of plate assigned to peacekeepers, both durable and stylish."
icon_state = "suns_pkarmor"
@@ -171,21 +171,22 @@
mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi'
lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
-/obj/item/clothing/suit/armor/vest/bulletproof/suns/hos
+/obj/item/clothing/suit/armor/vest/suns/hos
name = "gilded peacekeeper plating"
desc = "A set of plate assigned to peacekeepers, both durable and stylish. This one has a gold lining to indicate rank."
icon_state = "suns_lpkarmor"
item_state = "suns_pkarmor"
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-/obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos //remind me to make this something to buy
+/obj/item/clothing/suit/armor/vest/suns/ehos //remind me to make this something to buy
name = "peacekeeper greatcoat"
desc = "A funky armored coat worn by eccentric peacekeepers. Closing the coat is socially improper."
icon_state = "suns_greatcoat"
item_state = "suns_greatcoat"
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
/obj/item/clothing/suit/toggle/suns/pkcoat
name = "peacekeeper coat"
@@ -195,23 +196,23 @@
armor = list("melee" = 15, "bullet" = 30, "laser" = 10, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 25)
lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
+ body_parts_covered = CHEST|GROIN
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
-/obj/item/clothing/suit/armor/vest/bulletproof/suns/captain
+/obj/item/clothing/suit/armor/vest/suns/captain
name = "decorated academic coat"
desc = "An armored coat intended for SUNS captains on the frontier. Go forth, and spread the message of the academy."
icon_state = "suns_captaincoat"
item_state = "suns_overblack"
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-/obj/item/clothing/suit/armor/vest/bulletproof/suns/xo
+/obj/item/clothing/suit/armor/vest/suns/xo
name = "academic staff coat"
desc = "A white coat used by SUNS academic staff. It designates the second in command on the ship."
icon_state = "suns_xojacket"
item_state = "suns_overwhite"
-
///////////////
//Spacesuits//
//////////////
@@ -343,7 +344,7 @@
icon_state = "sunsvisor"
item_state = "suns_pkhelmet"
tint = 0
- armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) // identical stats to bulletproof helmet, as chest matches bulletproof vest
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) // identical stats to vest
clothing_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //Why? Because I'm not giving PK's sec masks nor hud sunglasses.
icon = 'icons/obj/clothing/faction/suns/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi'
@@ -465,10 +466,10 @@
/obj/item/clothing/gloves/suns/captain
name = "\improper SUNS captain's gloves"
- desc = "Fancy black gloves for trusted SUNS members. Sports a complex lining that prevents the wearer from being shocked."
+ desc = "Fancy black gloves for trusted SUNS members."
icon_state = "suns_captaingloves"
item_state = "suns_blackgloves"
- siemens_coefficient = 0
+ siemens_coefficient = 0.5
permeability_coefficient = 0.05
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index f33a789156e..5e5f11e0ba7 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -1,7 +1,8 @@
//Glasses
/obj/item/clothing/glasses
name = "glasses"
- icon = 'icons/obj/clothing/glasses.dmi'
+ icon = 'icons/obj/clothing/eyes/eyes.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/eyes/eyes.dmi'
lefthand_file = 'icons/mob/inhands/clothing/glasses_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing/glasses_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
@@ -43,8 +44,6 @@
user.update_sight()
if(icon_state == "welding-g")
change_glass_color(user, /datum/client_colour/glass_colour/gray)
- else if(icon_state == "bustin-g")
- change_glass_color(user, /datum/client_colour/glass_colour/green)
else
change_glass_color(user, null)
@@ -82,19 +81,6 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
glass_colour_type = /datum/client_colour/glass_colour/green
-/obj/item/clothing/glasses/meson/gar
- name = "gar mesons"
- icon_state = "garm"
- item_state = "garm"
- desc = "Do the impossible, see the invisible!"
- force = 10
- throwforce = 10
- throw_speed = 4
- attack_verb = list("sliced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- custom_price = 500
-
/obj/item/clothing/glasses/science
name = "science goggles"
desc = "A pair of snazzy goggles used to protect against chemical spills. Fitted with an analyzer for scanning items and reagents."
@@ -163,12 +149,6 @@
qdel(src)
user.put_in_hands(double_patch)
-/obj/item/clothing/glasses/monocle
- name = "monocle"
- desc = "Such a dapper eyepiece!"
- icon_state = "monocle"
- supports_variations = VOX_VARIATION
-
/obj/item/clothing/glasses/material
name = "optical material scanner"
desc = "Very confusing glasses."
@@ -182,19 +162,6 @@
desc = "Used by miners to detect ores deep within the rock."
darkness_view = 0
-/obj/item/clothing/glasses/material/mining/gar
- name = "gar material scanner"
- icon_state = "garm"
- item_state = "garm"
- desc = "Do the impossible, see the invisible!"
- force = 10
- throwforce = 20
- throw_speed = 4
- attack_verb = list("sliced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- glass_colour_type = /datum/client_colour/glass_colour/lightgreen
-
/obj/item/clothing/glasses/regular
name = "prescription glasses"
desc = "Made by Nerd. Co."
@@ -263,47 +230,13 @@
clothing_flags = SCAN_REAGENTS
glass_colour_type = /datum/client_colour/glass_colour/darkpurple
-/obj/item/clothing/glasses/sunglasses/garb
- name = "black gar glasses"
- desc = "Go beyond impossible and kick reason to the curb!"
- icon_state = "garb"
- item_state = "garb"
- force = 10
- throwforce = 10
- throw_speed = 4
- attack_verb = list("sliced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
-
-/obj/item/clothing/glasses/sunglasses/garb/supergarb
- name = "black giga gar glasses"
- desc = "Believe in us humans."
- icon_state = "supergarb"
- item_state = "garb"
- force = 12
- throwforce = 12
-
-/obj/item/clothing/glasses/sunglasses/gar
- name = "gar glasses"
- desc = "Just who the hell do you think I am?!"
- icon_state = "gar"
- item_state = "gar"
- force = 10
- throwforce = 10
- throw_speed = 4
- attack_verb = list("sliced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- glass_colour_type = /datum/client_colour/glass_colour/orange
-
-/obj/item/clothing/glasses/sunglasses/gar/supergar
- name = "giga gar glasses"
- desc = "We evolve past the person we were a minute before. Little by little we advance with each turn. That's how a drill works!"
- icon_state = "supergar"
- item_state = "gar"
- force = 12
- throwforce = 12
- glass_colour_type = /datum/client_colour/glass_colour/red
+/obj/item/clothing/glasses/sunglasses/ballistic
+ name = "ballistic goggles"
+ desc = "A pair of flash-proof ballistic goggles."
+ icon_state = "ballistic_goggles"
+ item_state = "ballistic_goggles"
+ supports_variations = KEPORI_VARIATION | VOX_VARIATION
+ glass_colour_type = /datum/client_colour/glass_colour/lightblue
/obj/item/clothing/glasses/welding
name = "welding goggles"
@@ -314,7 +247,7 @@
flash_protect = FLASH_PROTECTION_WELDER
custom_materials = list(/datum/material/iron = 250)
tint = 2
- visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
+ visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | SEALS_EYES
flags_cover = GLASSESCOVERSEYES
glass_colour_type = /datum/client_colour/glass_colour/gray
supports_variations = VOX_VARIATION
@@ -322,17 +255,6 @@
/obj/item/clothing/glasses/welding/attack_self(mob/user)
weldingvisortoggle(user)
-/obj/item/clothing/glasses/welding/ghostbuster
- name = "optical ecto-scanner"
- desc = "A bulky pair of unwieldy glasses that lets you see things best left unseen. Obscures vision, but also gives a bit of eye protection"
- icon_state = "bustin-g"
- item_state = "bustin-g"
- invis_view = SEE_INVISIBLE_OBSERVER
- invis_override = null
- flash_protect = 1
- visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_INVISVIEW
- glass_colour_type = /datum/client_colour/glass_colour/green
-
/obj/item/clothing/glasses/blindfold
name = "blindfold"
desc = "Covers the eyes, preventing sight."
@@ -378,10 +300,10 @@
colored_before = TRUE
/obj/item/clothing/glasses/blindfold/white/worn_overlays(isinhands = FALSE, file2use)
- . = list()
+ . = ..()
if(!isinhands && ishuman(loc) && !colored_before)
var/mob/living/carbon/human/H = loc
- var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/eyes.dmi', "blindfoldwhite")
+ var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/eyes/eyes.dmi', "blindfoldwhite")
M.appearance_flags |= RESET_COLOR
M.color = "#[H.eye_color]"
. += M
@@ -399,7 +321,7 @@
patch_one.forceMove(user.drop_location())
patch_two.forceMove(user.drop_location())
to_chat(user, "You undo the knot on the eyepatches.")
- Destroy()
+ qdel(src)
/obj/item/clothing/glasses/sunglasses/big
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks flashes."
@@ -447,20 +369,6 @@
return
chameleon_action.emp_randomise()
-/obj/item/clothing/glasses/thermal/monocle
- name = "thermoncle"
- desc = "Never before has seeing through walls felt so gentlepersonly."
- icon_state = "thermoncle"
- flags_1 = null //doesn't protect eyes because it's a monocle, duh
-
-/obj/item/clothing/glasses/thermal/monocle/examine(mob/user) //Different examiners see a different description!
- if(user.gender == MALE)
- desc = replacetext(desc, "person", "man")
- else if(user.gender == FEMALE)
- desc = replacetext(desc, "person", "woman")
- . = ..()
- desc = initial(desc)
-
/obj/item/clothing/glasses/thermal/eyepatch
name = "optical thermal eyepatch"
desc = "An eyepatch with built-in thermal optics."
@@ -485,12 +393,14 @@
desc = "A pair of goggles meant for low temperatures."
icon_state = "cold"
item_state = "cold"
+ flags_cover = GLASSESCOVERSEYES | SEALS_EYES
/obj/item/clothing/glasses/heat
name = "heat goggles"
desc = "A pair of goggles meant for high temperatures."
icon_state = "heat"
item_state = "heat"
+ flags_cover = GLASSESCOVERSEYES | SEALS_EYES
/obj/item/clothing/glasses/orange
name = "orange glasses"
@@ -506,35 +416,6 @@
item_state = "redglasses"
glass_colour_type = /datum/client_colour/glass_colour/red
-/obj/item/clothing/glasses/godeye
- name = "eye of god"
- desc = "A strange eye, said to have been torn from an omniscient creature that used to roam the wastes."
- icon_state = "godeye"
- item_state = "godeye"
- vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
- darkness_view = 8
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- resistance_flags = LAVA_PROOF | FIRE_PROOF
- clothing_flags = SCAN_REAGENTS
-
-/obj/item/clothing/glasses/godeye/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, EYE_OF_GOD_TRAIT)
-
-/obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, src) && W != src && W.loc == user)
- if(W.icon_state == "godeye")
- W.icon_state = "doublegodeye"
- W.item_state = "doublegodeye"
- W.desc = "A pair of strange eyes, said to have been torn from an omniscient creature that used to roam the wastes. There's no real reason to have two, but that isn't stopping you."
- if(iscarbon(user))
- var/mob/living/carbon/C = user
- C.update_inv_wear_mask()
- else
- to_chat(user, "The eye winks at you and vanishes into the abyss, you feel really unlucky.")
- qdel(src)
- ..()
-
/obj/item/clothing/glasses/AltClick(mob/user)
if(glass_colour_type && ishuman(user))
var/mob/living/carbon/human/H = user
@@ -572,7 +453,7 @@
desc = "Medical, security and diagnostic hud. Alt click to toggle xray."
icon_state = "nvgmeson"
item_state = "nvgmeson"
- flags_cover = GLASSESCOVERSEYES
+ flags_cover = GLASSESCOVERSEYES | SEALS_EYES
darkness_view = 8
flash_protect = FLASH_PROTECTION_WELDER
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 0698981207b..6891ac7de31 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -162,26 +162,6 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
glass_colour_type = /datum/client_colour/glass_colour/green
-/obj/item/clothing/glasses/hud/security/sunglasses/gars
- name = "\improper HUD gar glasses"
- desc = "GAR glasses with a HUD."
- icon_state = "gars"
- item_state = "garb"
- force = 10
- throwforce = 10
- throw_speed = 4
- attack_verb = list("sliced")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
-
-/obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars
- name = "giga HUD gar glasses"
- desc = "GIGA GAR glasses with a HUD."
- icon_state = "supergars"
- item_state = "garb"
- force = 12
- throwforce = 12
-
/obj/item/clothing/glasses/hud/toggle
name = "Toggle HUD"
desc = "A hud with multiple functions."
@@ -259,7 +239,7 @@
desc = "A snazzy looking pair of ballistic goggles with an integrated security hud. The opaque visor provides flash protection."
icon_state = "inteq_goggles"
item_state = "inteq_goggles"
- supports_variations = KEPORI_VARIATION
+ supports_variations = KEPORI_VARIATION | VOX_VARIATION
glass_colour_type = /datum/client_colour/glass_colour/orange
/obj/item/clothing/glasses/hud/health/prescription
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
index 61c06125d8f..ea0062359c9 100644
--- a/code/modules/clothing/gloves/_gloves.dm
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -17,6 +17,7 @@
clothamnt = 2
greyscale_colors = list(list(10, 13), list(11, 14), list(9, 12))
greyscale_icon_state = "gloves"
+ blood_overlay_type = "hands"
/obj/item/clothing/gloves/wash(clean_types)
. = ..()
@@ -25,14 +26,13 @@
return TRUE
/obj/item/clothing/gloves/worn_overlays(isinhands = FALSE)
- . = list()
+ . = ..()
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_hands = mutable_appearance('icons/effects/blood.dmi', "bloodyhands")
- bloody_hands.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_hands
+ . += setup_blood_overlay()
+
/obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE)
..()
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index cbac3e0e890..db9e2814b2c 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -177,10 +177,10 @@
icon_state = "brown"
/obj/item/clothing/gloves/color/captain
- desc = "Regal white gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier, and armoured bracers. Swanky."
+ desc = "Regal white gloves, with a nice gold trim, an integrated thermal barrier, and armoured bracers. Swanky."
name = "captain's gloves"
icon_state = "captain"
- siemens_coefficient = 0
+ siemens_coefficient = 0.5
permeability_coefficient = 0.05
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
@@ -190,7 +190,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 50)
/obj/item/clothing/gloves/color/captain/nt
- desc = "Regal blue gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier, and armoured bracers. Swanky."
+ desc = "Regal blue gloves with gold trim and a fire and acid-resistant coating. Swanky."
name = "captain's gloves"
icon_state = "captainnt"
@@ -231,7 +231,7 @@
name = "infiltrator gloves"
desc = "Specialized combat gloves for carrying people around. Transfers tactical kidnapping knowledge into the user via nanochips."
icon_state = "infiltrator"
- siemens_coefficient = 0
+ siemens_coefficient = 0.5
permeability_coefficient = 0.3
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -259,24 +259,6 @@
item_state = "lgloves"
custom_price = 200
-/obj/effect/spawner/lootdrop/gloves
- name = "random gloves"
- desc = "These gloves are supposed to be a random color..."
- icon = 'icons/obj/clothing/gloves.dmi'
- icon_state = "random_gloves"
- loot = list(
- /obj/item/clothing/gloves/color/orange = 1,
- /obj/item/clothing/gloves/color/red = 1,
- /obj/item/clothing/gloves/color/blue = 1,
- /obj/item/clothing/gloves/color/purple = 1,
- /obj/item/clothing/gloves/color/green = 1,
- /obj/item/clothing/gloves/color/grey = 1,
- /obj/item/clothing/gloves/color/light_brown = 1,
- /obj/item/clothing/gloves/color/brown = 1,
- /obj/item/clothing/gloves/color/white = 1,
- /obj/item/clothing/gloves/color/rainbow = 1,
- )
-
/obj/item/clothing/gloves/maid
name = "maid arm covers"
desc = "Cylindrical looking tubes that go over your arm, weird."
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 9d8db3c035d..45999fd75db 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -23,13 +23,14 @@
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = NONE
+ clothing_traits = list(TRAIT_PLANT_SAFE)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30)
/obj/item/clothing/gloves/combat
name = "combat gloves"
- desc = "These tactical gloves are fireproof and electrically insulated."
+ desc = "These tactical gloves are extra-durable, offering some fire and acid protection."
icon_state = "combat"
- siemens_coefficient = 0
+ siemens_coefficient = 0.5
permeability_coefficient = 0.05
strip_delay = 80
cold_protection = HANDS
@@ -40,16 +41,6 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
//supports_variations = KEPORI_VARIATION
-/obj/item/clothing/gloves/combat/maid
- name = "combat maid sleeves"
- desc = "These 'tactical' gloves and sleeves are fireproof and electrically insulated. Warm to boot."
- icon_state = "syndimaid_arms"
-
-/obj/item/clothing/gloves/combat/maid/inteq
- name = "inteq combat maid sleeves"
- desc = "Tacticute and comfy, along with being both fireproof and electrically insulated."
- icon_state = "inteqmaid_arms"
-
/obj/item/clothing/gloves/bracer
name = "bone bracers"
desc = "For when you're expecting to get slapped on the wrist. Offers modest protection to your arms."
@@ -125,7 +116,7 @@
name = "explorer envirogloves"
icon_state = "explorerplasma"
-/obj/item/clothing/gloves/color/botanic_leather/plasmaman
+/obj/item/clothing/gloves/botanic_leather/plasmaman
name = "botany envirogloves"
desc = "Covers up those scandalous boney hands."
icon_state = "botanyplasma"
@@ -142,5 +133,5 @@
/obj/item/clothing/gloves/combat/wizard
name = "enchanted gloves"
- desc = "These gloves have been enchanted with a spell that makes them electrically insulated and fireproof."
+ desc = "These gloves have been enchanted with a spell that makes them fireproof and acid-resistant."
icon_state = "wizard"
diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm
index 0ae7f48089e..2667297dc35 100644
--- a/code/modules/clothing/gloves/tacklers.dm
+++ b/code/modules/clothing/gloves/tacklers.dm
@@ -67,7 +67,7 @@
name = "guerrilla gloves"
desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."
icon_state = "combat"
- siemens_coefficient = 0
+ siemens_coefficient = 0.5
permeability_coefficient = 0.05
/obj/item/clothing/gloves/tackler/rocket
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index 4039402588f..e74c788faa9 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -12,6 +12,7 @@
greyscale_icon_state = "hat"
greyscale_colors = list(list(16,26))
supports_variations = VOX_VARIATION
+ blood_overlay_type = "helmet"
///Special throw_impact for hats to frisbee hats at people to place them on their heads/attempt to de-hat them.
/obj/item/clothing/head/throw_impact(atom/hit_atom, datum/thrownthing/thrownthing)
@@ -60,14 +61,12 @@
/obj/item/clothing/head/worn_overlays(isinhands = FALSE)
- . = list()
+ . = ..()
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_helmet = mutable_appearance('icons/effects/blood.dmi', "helmetblood")
- bloody_helmet.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_helmet
+ . += setup_blood_overlay()
/obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE)
..()
diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm
index 5aa39eb0ba5..3a930d728ad 100644
--- a/code/modules/clothing/head/beanie.dm
+++ b/code/modules/clothing/head/beanie.dm
@@ -53,10 +53,6 @@
//Striped Beanies have unique sprites
-/obj/item/clothing/head/beanie/christmas
- name = "christmas beanie"
- icon_state = "beaniechristmas"
-
/obj/item/clothing/head/beanie/striped
name = "striped beanie"
icon_state = "beaniestriped"
@@ -78,15 +74,3 @@
desc = "A beanie made from durathread, its resilient fibres provide some protection to the wearer."
icon_state = "beaniedurathread"
armor = list("melee" = 15, "bullet" = 5, "laser" = 15, "energy" = 25, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 5)
-
-/obj/item/clothing/head/beanie/waldo
- name = "red striped bobble hat"
- desc = "If you're going on a worldwide hike, you'll need some cold protection."
- icon_state = "waldo_hat"
-
-/obj/item/clothing/head/beanie/rasta
- name = "rastacap"
- desc = "Perfect for tucking in those dreadlocks."
- icon_state = "beanierasta"
-
-//No dog fashion sprites yet :( poor Ian can't be dope like the rest of us yet
diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm
index 9d3ca21ed4f..78d77908cd3 100644
--- a/code/modules/clothing/head/berets.dm
+++ b/code/modules/clothing/head/berets.dm
@@ -5,18 +5,6 @@
icon_state = "beret"
dog_fashion = /datum/dog_fashion/head/beret
-/obj/item/clothing/head/beret/vintage
- name = "vintage beret"
- desc = "A well-worn beret."
- icon_state = "vintageberet"
- dog_fashion = null
-
-/obj/item/clothing/head/beret/archaic
- name = "archaic beret"
- desc = "An absolutely ancient beret."
- icon_state = "archaicberet"
- dog_fashion = null
-
/obj/item/clothing/head/beret/black
name = "black beret"
desc = "A black beret."
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 036d6ffbd41..9aa05ea897c 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -5,17 +5,6 @@
name = "collectable hat"
desc = "A rare collectable hat."
-/obj/item/clothing/head/collectable/petehat
- name = "ultra rare Pete's hat!"
- desc = "It smells faintly of plasma."
- icon_state = "petehat"
-
-/obj/item/clothing/head/collectable/xenom
- name = "collectable xenomorph helmet!"
- desc = "Hiss hiss hiss!"
- clothing_flags = SNUG_FIT
- icon_state = "xenom"
-
/obj/item/clothing/head/collectable/chef
name = "collectable chef's hat"
desc = "A rare chef's hat meant for hat collectors!"
@@ -24,12 +13,6 @@
dog_fashion = /datum/dog_fashion/head/chef
-/obj/item/clothing/head/collectable/paper
- name = "collectable paper hat"
- desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from water, fire, and Curators."
- icon_state = "paper"
- dog_fashion = /datum/dog_fashion/head
-
/obj/item/clothing/head/collectable/tophat
name = "collectable top hat"
desc = "A top hat worn by only the most prestigious hat collectors."
@@ -64,12 +47,6 @@
item_state = "welding"
clothing_flags = SNUG_FIT
-/obj/item/clothing/head/collectable/slime
- name = "collectable slime hat"
- desc = "Just like a real brain slug!"
- icon_state = "headslime"
- clothing_flags = SNUG_FIT
-
/obj/item/clothing/head/collectable/flatcap
name = "collectable flat cap"
desc = "A collectible laborer's flat cap! Smells like No. 9 coal..."
@@ -91,13 +68,6 @@
dog_fashion = /datum/dog_fashion/head/kitty
-/obj/item/clothing/head/collectable/rabbitears
- name = "collectable rabbit ears"
- desc = "Not as lucky as the feet!"
- icon_state = "bunny"
-
- dog_fashion = /datum/dog_fashion/head/rabbit
-
/obj/item/clothing/head/collectable/wizard
name = "collectable wizard's hat"
desc = "NOTE: Any magical powers gained from wearing this hat are purely coincidental."
@@ -111,16 +81,6 @@
icon_state = "hardhat_standard"
dog_fashion = /datum/dog_fashion/head
-/obj/item/clothing/head/collectable/HoS
- name = "collectable HoS hat"
- desc = "Now you too can beat prisoners, set silly sentences, and arrest for no reason!"
- icon_state = "hoscap"
-
-/obj/item/clothing/head/collectable/HoP
- name = "collectable HoP hat"
- desc = "It's your turn to demand excessive paperwork, signatures, stamps, and hire more clowns! Papers, please!"
- icon_state = "hopcap_nt"
- dog_fashion = /datum/dog_fashion/head/head_of_personnel
/obj/item/clothing/head/collectable/thunderdome
name = "collectable Thunderdome helmet"
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index dba4c2f8040..4247405d873 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -62,6 +62,10 @@
icon_state = "hardhat_orange"
dog_fashion = null
+/obj/item/clothing/head/hardhat/purple
+ icon_state = "hardhat_purple"
+ dog_fashion = null
+
/obj/item/clothing/head/hardhat/red
name = "firefighter helmet"
icon_state = "hardhat_red"
@@ -116,7 +120,7 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
/obj/item/clothing/head/hardhat/mining
name = "mining helmet"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 352349783ba..75103c5f524 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -6,7 +6,7 @@
icon_state = "helmet"
item_state = "helmet"
var/flashlight_state = "helmet_flight_overlay"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
heat_protection = HEAD
@@ -219,6 +219,7 @@
can_flashlight = TRUE
dog_fashion = null
allow_post_reskins = TRUE
+ supports_variations = KEPORI_VARIATION
unique_reskin = list(
"None" = "helmetalt",
"Desert" = "helmetalt_desert",
@@ -228,37 +229,6 @@
)
content_overlays = TRUE
-/obj/item/clothing/head/helmet/marine
- name = "tactical combat helmet"
- desc = "A tactical black helmet, sealed from outside hazards with a reinforced visor."
- icon_state = "marine_command"
- item_state = "helmetalt"
- armor = list("melee" = 50, "bullet" = 75, "laser" = 55, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50)
- slowdown = 0.3
- min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- clothing_flags = STOPSPRESSUREDAMAGE
- resistance_flags = FIRE_PROOF | ACID_PROOF
- can_flashlight = TRUE
- dog_fashion = null
-
-/obj/item/clothing/head/helmet/marine/Initialize(mapload)
- set_attached_light(new /obj/item/flashlight/seclite)
- update_helmlight()
- update_appearance()
- . = ..()
-
-/obj/item/clothing/head/helmet/marine/security
- name = "marine heavy helmet"
- icon_state = "marine_security"
-
-/obj/item/clothing/head/helmet/marine/engineer
- name = "marine utility helmet"
- icon_state = "marine_engineer"
-
-/obj/item/clothing/head/helmet/marine/medic
- name = "marine medic helmet"
- icon_state = "marine_medic"
-
/obj/item/clothing/head/helmet/old
name = "degrading helmet"
desc = "Standard issue security helmet. Due to degradation the helmet's visor obstructs the users ability to see long distances."
@@ -286,7 +256,7 @@
visor_flags_inv = HIDEFACE
toggle_cooldown = 0
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
- visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+ visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
dog_fashion = null
/obj/item/clothing/head/helmet/justice
@@ -327,7 +297,7 @@
desc = "An extremely robust, space-worthy helmet in a nefarious red and black stripe pattern."
icon_state = "swatsyndie"
item_state = "swatsyndie"
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100)
+ armor = list("melee" = 40, "bullet" = 35, "laser" = 35,"energy" = 40, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
@@ -492,7 +462,7 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
flash_protect = FLASH_PROTECTION_WELDER
flags_inv = HIDEHAIR|HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
strip_delay = 80
/obj/item/clothing/head/helmet/swat/inteq
@@ -501,7 +471,7 @@
icon_state = "inteq_swat"
item_state = "inteq_swat"
flags_inv = HIDEHAIR
- supports_variations = KEPORI_VARIATION
+ supports_variations = KEPORI_VARIATION | VOX_VARIATION
content_overlays = TRUE
/obj/item/clothing/head/helmet/inteq
@@ -510,7 +480,7 @@
icon_state = "inteq_helmet"
icon_state = "inteq_helmet"
can_flashlight = TRUE
- supports_variations = KEPORI_VARIATION
+ supports_variations = KEPORI_VARIATION | VOX_VARIATION
content_overlays = TRUE
/obj/item/clothing/head/solgov
@@ -548,7 +518,7 @@
icon_state = "solgov_envirohelm"
item_state = "solgov_envirohelm"
-/obj/item/clothing/head/helmet/operator
+/obj/item/clothing/head/helmet/syndie
name = "\improper operator helmet"
desc = "A robust combat helmet commonly employed by Syndicate forces, regardless of alignment."
icon_state = "operator"
@@ -567,6 +537,7 @@
icon_state = "m10helm"
can_flashlight = TRUE
dog_fashion = null
+ supports_variations = null
unique_reskin = list(
"None" = "m10helm",
"Desert" = "m10helm_desert",
@@ -582,6 +553,7 @@
can_flashlight = TRUE
dog_fashion = null
allow_post_reskins = TRUE
+ supports_variations = null
unique_reskin = list(
"None" = "x11helm",
"Desert" = "x11helm_desert",
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 3e04245e1a1..85b3af96829 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -33,10 +33,6 @@
desc = "A commanding white stetson adorned with a general's badge. Why this belongs to a captain is anybody's guess."
icon_state = "cowboycap"
-/obj/item/clothing/head/caphat/nt
- name = "captain's hat"
- icon_state = "captain_nt"
-
/obj/item/clothing/head/frontier/peaked
name = "\improper Frontiersmen commander's cap"
desc = "An imposing peaked cap, meant for a commander of the Frontiersmen."
@@ -47,41 +43,6 @@
desc = "An imposing peaked cap meant for only the highest of officers of the Frontiersmen pirate fleet."
icon_state = "frontier_admiral_cap"
-//Head of Personnel
-/obj/item/clothing/head/hopcap
- name = "head of personnel's cap"
- icon_state = "hopcap"
- desc = "The symbol of true bureaucratic micromanagement."
- dog_fashion = /datum/dog_fashion/head/head_of_personnel
-
-/obj/item/clothing/head/hopcap/nt
- icon_state = "hopcap_nt"
- dog_fashion = /datum/dog_fashion/head/head_of_personnel
-
-//Cargo
-/obj/item/clothing/head/supply_chief
- name = "supply chief's cap"
- desc = "The one thing between you and 40 boxes of orderable pizza is the person wearing this hat."
- icon_state = "supply_chief_cap"
-
-/obj/item/clothing/head/deliveries_officer
- name = "deliveries officer's cap"
- desc = "Whether through fires, the vacuum of space, or hordes of souless husks of grey suited criminals, your crate will always be delivered!"
- icon_state = "deliveries_officer_cap"
-
-//Chaplain
-/obj/item/clothing/head/nun_hood
- name = "nun hood"
- desc = "Maximum piety in this star system."
- icon_state = "nun_hood"
- flags_inv = HIDEHAIR
- flags_cover = HEADCOVERSEYES
-
-/obj/item/clothing/head/bishopmitre
- name = "bishop mitre"
- desc = "An opulent hat that functions as a radio to God. Or as a lightning rod, depending on who you ask."
- icon_state = "bishopmitre"
-
//Detective
/obj/item/clothing/head/fedora/det_hat
name = "detective's fedora"
@@ -96,8 +57,9 @@
new /obj/item/reagent_containers/food/drinks/flask/det(src)
/obj/item/clothing/head/fedora/det_hat/examine_more(mob/user)
+ . = ..()
if(!in_range(src, user) || !isobserver(user)) //hide the easter egg a little more
- . = "You try to examine [src] closer, but you're too far away."
+ . += "You try to examine [src] closer, but you're too far away."
return
. += "Alt-click to take a candy corn."
@@ -223,7 +185,7 @@
. = ..()
UnregisterSignal(M, COMSIG_MOB_SAY)
-/obj/item/clothing/head/warden/drill/proc/handle_speech(datum/source, mob/speech_args)
+/obj/item/clothing/head/warden/drill/proc/handle_speech(datum/source, list/speech_args)
var/message = speech_args[SPEECH_MESSAGE]
if(message[1] != "*")
switch (mode)
@@ -252,12 +214,3 @@
#undef DRILL_SHOUTING
#undef DRILL_YELLING
#undef DRILL_CANADIAN
-
-/obj/item/clothing/head/witchunter
- name = "witchunter hat"
- desc = "This hat saw much use back in the day."
- icon_state = "witchhunterhat"
- item_state = "witchhunterhat"
- flags_cover = HEADCOVERSEYES
- flags_inv = HIDEEYES|HIDEHAIR
- armor = list("melee" = 30, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 6380e7c82ba..75c1e7f9103 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -17,18 +17,6 @@
armor = list("melee" = 30, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = (8 SECONDS)
-/obj/item/clothing/head/spacepolice
- name = "space police cap"
- desc = "A blue cap for patrolling the daily beat."
- icon_state = "policecap_families"
- item_state = "policecap_families"
-
-/obj/item/clothing/head/powdered_wig
- name = "powdered wig"
- desc = "A powdered wig."
- icon_state = "pwig"
- item_state = "pwig"
-
/obj/item/clothing/head/that
name = "top-hat"
desc = "It's an amish looking hat."
@@ -37,30 +25,6 @@
dog_fashion = /datum/dog_fashion/head
throwforce = 1
-/obj/item/clothing/head/canada
- name = "striped red tophat"
- desc = "It smells like fresh donut holes. / Il sent comme des trous de beignets frais."
- icon_state = "canada"
- item_state = "canada"
-
-/obj/item/clothing/head/redcoat
- name = "redcoat's hat"
- icon_state = "redcoat"
- desc = "'I guess it's a redhead.'"
-
-/obj/item/clothing/head/plaguedoctorhat
- name = "plague doctor's hat"
- desc = "These were once used by plague doctors. They're pretty much useless."
- icon_state = "plaguedoctor"
- permeability_coefficient = 0.01
-
-/obj/item/clothing/head/hasturhood
- name = "hastur's hood"
- desc = "It's unspeakably stylish."
- icon_state = "hasturhood"
- flags_inv = HIDEHAIR
- flags_cover = HEADCOVERSEYES
-
/obj/item/clothing/head/nursehat
name = "nurse's hat"
desc = "It allows quick identification of trained medical personnel."
@@ -78,15 +42,6 @@
clothing_flags = SNUG_FIT
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-/obj/item/clothing/head/cueball
- name = "cueball helmet"
- desc = "A large, featureless white orb meant to be worn on your head. How do you even see out of this thing?"
- icon_state = "cueball"
- item_state="cueball"
- clothing_flags = SNUG_FIT
- flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
/obj/item/clothing/head/snowman
name = "Snowman Head"
desc = "A ball of white styrofoam. So festive."
@@ -96,38 +51,6 @@
flags_cover = HEADCOVERSEYES
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-/obj/item/clothing/head/justice
- name = "justice hat"
- desc = "Fight for what's righteous!"
- icon_state = "justicered"
- item_state = "justicered"
- clothing_flags = SNUG_FIT
- flags_inv = HIDEHAIR|HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
- flags_cover = HEADCOVERSEYES
-
-/obj/item/clothing/head/justice/blue
- icon_state = "justiceblue"
- item_state = "justiceblue"
-
-/obj/item/clothing/head/justice/yellow
- icon_state = "justiceyellow"
- item_state = "justiceyellow"
-
-/obj/item/clothing/head/justice/green
- icon_state = "justicegreen"
- item_state = "justicegreen"
-
-/obj/item/clothing/head/justice/pink
- icon_state = "justicepink"
- item_state = "justicepink"
-
-/obj/item/clothing/head/rabbitears
- name = "rabbit ears"
- desc = "A headband with a pair of faux rabbit ears."
- icon_state = "bunny"
-
- dog_fashion = /datum/dog_fashion/head/rabbit
-
/obj/item/clothing/head/pirate
name = "pirate hat"
desc = "Yarr."
@@ -170,42 +93,12 @@
icon_state = "bandana"
item_state = "bandana"
-/obj/item/clothing/head/bowler
- name = "bowler-hat"
- desc = "Gentleman, elite aboard!"
- icon_state = "bowler"
- item_state = "bowler"
-
-/obj/item/clothing/head/witchwig
- name = "witch costume wig"
- desc = "Eeeee~heheheheheheh!"
- icon_state = "witch"
- item_state = "witch"
- flags_inv = HIDEHAIR
-
-/obj/item/clothing/head/chicken
- name = "chicken suit head"
- desc = "Bkaw!"
- icon_state = "chickenhead"
- item_state = "chickensuit"
- clothing_flags = SNUG_FIT
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
/obj/item/clothing/head/bearpelt
name = "bear pelt hat"
desc = "Fuzzy."
icon_state = "bearpelt"
item_state = "bearpelt"
-/obj/item/clothing/head/xenos
- name = "xenos helmet"
- icon_state = "xenos"
- item_state = "xenos_helm"
- desc = "A helmet made out of chitinous alien hide."
- clothing_flags = SNUG_FIT
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-
/obj/item/clothing/head/fedora
name = "fedora"
icon_state = "fedora"
@@ -229,34 +122,6 @@
item_state = "hat_solgov"
desc = "A slick blue hat used by both solarian civilians and physicists."
-/obj/item/clothing/head/sombrero
- name = "sombrero"
- icon_state = "sombrero"
- item_state = "sombrero"
- desc = "You can practically taste the fiesta."
- flags_inv = HIDEHAIR
-
- dog_fashion = /datum/dog_fashion/head/sombrero
-
-/obj/item/clothing/head/sombrero/green
- name = "green sombrero"
- icon_state = "greensombrero"
- item_state = "greensombrero"
- desc = "As elegant as a dancing cactus."
- flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
- dog_fashion = null
-
-/obj/item/clothing/head/sombrero/shamebrero
- name = "shamebrero"
- icon_state = "shamebrero"
- item_state = "shamebrero"
- desc = "Once it's on, it never comes off."
- dog_fashion = null
-
-/obj/item/clothing/head/sombrero/shamebrero/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT)
-
/obj/item/clothing/head/flatcap
name = "flat cap"
desc = "A working man's hat."
@@ -297,14 +162,6 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = /datum/dog_fashion/head/santa
-/obj/item/clothing/head/jester
- name = "jester hat"
- desc = "A hat with bells, to add some merriness to the suit."
- icon_state = "jester_hat"
-
-/obj/item/clothing/head/jester/alt
- icon_state = "jester2"
-
/obj/item/clothing/head/rice_hat
name = "rice hat"
desc = "Welcome to the rice fields, motherfucker."
@@ -328,45 +185,6 @@
icon_state = "crown"
resistance_flags = FIRE_PROOF
-/obj/item/clothing/head/crown/fancy
- name = "magnificent crown"
- desc = "A crown worn by only the highest emperors of the land space."
- icon_state = "fancycrown"
-
-/obj/item/clothing/head/scarecrow_hat
- name = "scarecrow hat"
- desc = "A simple straw hat."
- icon_state = "scarecrow_hat"
-
-/obj/item/clothing/head/lobsterhat
- name = "foam lobster head"
- desc = "When everything's going to crab, protecting your head is the best choice."
- icon_state = "lobster_hat"
- clothing_flags = SNUG_FIT
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
-/obj/item/clothing/head/drfreezehat
- name = "doctor freeze's wig"
- desc = "A cool wig for cool people."
- icon_state = "drfreeze_hat"
- flags_inv = HIDEHAIR
-
-/obj/item/clothing/head/pharaoh
- name = "pharaoh hat"
- desc = "Walk like an Egyptian."
- icon_state = "pharoah_hat"
- item_state = "pharoah_hat"
-
-/obj/item/clothing/head/nemes
- name = "headdress of Nemes"
- desc = "Lavish space tomb not included."
- icon_state = "nemes_headdress"
-
-/obj/item/clothing/head/delinquent
- name = "delinquent hat"
- desc = "Good grief."
- icon_state = "delinquent"
-
/obj/item/clothing/head/frenchberet
name = "french beret"
desc = "A quality beret, infused with the aroma of chain-smoking, wine-swilling Parisians. You feel less inclined to engage in military conflict, for some reason."
@@ -383,7 +201,7 @@
. = ..()
UnregisterSignal(M, COMSIG_MOB_SAY)
-/obj/item/clothing/head/frenchberet/proc/handle_speech(datum/source, mob/speech_args)
+/obj/item/clothing/head/frenchberet/proc/handle_speech(datum/source, list/speech_args)
var/message = speech_args[SPEECH_MESSAGE]
if(message[1] != "*")
message = " [message]"
@@ -402,68 +220,12 @@
message += pick(" Honh honh honh!"," Honh!"," Zut Alors!")
speech_args[SPEECH_MESSAGE] = trim(message)
-/obj/item/clothing/head/clownmitre
- name = "Hat of the Honkmother"
- desc = "It's hard for parishoners to see a banana peel on the floor when they're looking up at your glorious chapeau."
- icon_state = "clownmitre"
-
-/obj/item/clothing/head/kippah
- name = "kippah"
- desc = "Signals that you follow the Jewish Halakha. Keeps the head covered and the soul extra-Orthodox."
- icon_state = "kippah"
-
-/obj/item/clothing/head/taqiyahwhite
- name = "white taqiyah"
- desc = "An extra-mustahabb way of showing your devotion to Allah."
- icon_state = "taqiyahwhite"
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
-
-/obj/item/clothing/head/taqiyahred
- name = "red taqiyah"
- desc = "An extra-mustahabb way of showing your devotion to Allah."
- icon_state = "taqiyahred"
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
-
-/obj/item/clothing/head/shrine_wig
- name = "shrine maiden's wig"
- desc = "Purify in style!"
- flags_inv = HIDEHAIR //bald
- mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
- icon_state = "shrine_wig"
- item_state = "shrine_wig"
- worn_x_dimension = 64
- worn_y_dimension = 64
-
/obj/item/clothing/head/intern
name = "\improper CentCom Head Intern beancap"
desc = "A horrifying mix of beanie and softcap in CentCom green. You'd have to be pretty desperate for power over your peers to agree to wear this."
icon_state = "intern_hat"
item_state = "intern_hat"
-/obj/item/clothing/head/goatpelt
- name = "goat pelt hat"
- desc = "Fuzzy and Warm!"
- icon_state = "goatpelt"
- item_state = "goatpelt"
-
-/obj/item/clothing/head/jackbros
- name = "frosty hat"
- desc = "Hee-ho!"
- icon_state = "JackFrostHat"
- item_state = "JackFrostHat"
-
-/obj/item/clothing/head/maidheadband/syndicate
- name = "tactical maid headband"
- desc = "Tacticute."
- icon_state = "syndieheadband"
- item_state = "syndieheadband"
-
-/obj/item/clothing/head/maidheadband/inteq
- name = "inteq maid headband"
- desc = "Tacticute."
- icon_state = "inteqheadband"
- item_state = "inteqheadband"
-
/obj/item/clothing/head/inteq_peaked
name = "inteq peaked cap"
desc = "A peaked cap for Vanguards with a commanding authority, emblazoned with the golden badge of the IRMG."
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index c04b61563f5..3cd7c022887 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -33,82 +33,6 @@
/obj/item/clothing/head/welding/attack_self(mob/user)
weldingvisortoggle(user)
-/*
- * Cakehat
- */
-/obj/item/clothing/head/hardhat/cakehat
- name = "cakehat"
- desc = "You put the cake on your head. Brilliant."
- icon_state = "hardhat_cakehat"
- item_state = "hardhat_cakehat"
- lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
- hitsound = 'sound/weapons/tap.ogg'
- var/hitsound_on = 'sound/weapons/sear.ogg' //so we can differentiate between cakehat and energyhat
- var/hitsound_off = 'sound/weapons/tap.ogg'
- var/force_on = 15
- var/throwforce_on = 15
- var/damtype_on = BURN
- flags_inv = HIDEEARS|HIDEHAIR
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- light_range = 2 //luminosity when on
- flags_cover = HEADCOVERSEYES
- heat = 999
-
- dog_fashion = /datum/dog_fashion/head
-
-/obj/item/clothing/head/hardhat/cakehat/process()
- var/turf/location = src.loc
- if(ishuman(location))
- var/mob/living/carbon/human/M = location
- if(M.is_holding(src) || M.head == src)
- location = M.loc
-
- if(isturf(location))
- location.hotspot_expose(700, 1)
-
-/obj/item/clothing/head/hardhat/cakehat/turn_on(mob/living/user)
- ..()
- force = force_on
- throwforce = throwforce_on
- damtype = damtype_on
- hitsound = hitsound_on
- START_PROCESSING(SSobj, src)
-
-/obj/item/clothing/head/hardhat/cakehat/turn_off(mob/living/user)
- ..()
- force = 0
- throwforce = 0
- damtype = BRUTE
- hitsound = hitsound_off
- STOP_PROCESSING(SSobj, src)
-
-/obj/item/clothing/head/hardhat/cakehat/get_temperature()
- return on * heat
-
-/obj/item/clothing/head/hardhat/cakehat/energycake
- name = "energy cake"
- desc = "You put the energy sword on your cake. Brilliant."
- icon_state = "hardhat_energycake"
- item_state = "hardhat_energycake"
- hitsound = 'sound/weapons/tap.ogg'
- hitsound_on = 'sound/weapons/blade1.ogg'
- hitsound_off = 'sound/weapons/tap.ogg'
- damtype_on = BRUTE
- force_on = 18 //same as epen (but much more obvious)
- light_range = 3 //ditto
- heat = 0
-
-/obj/item/clothing/head/hardhat/cakehat/energycake/turn_on(mob/living/user)
- playsound(user, 'sound/weapons/saberon.ogg', 5, TRUE)
- to_chat(user, "You turn on \the [src].")
- ..()
-
-/obj/item/clothing/head/hardhat/cakehat/energycake/turn_off(mob/living/user)
- playsound(user, 'sound/weapons/saberoff.ogg', 5, TRUE)
- to_chat(user, "You turn off \the [src].")
- ..()
-
/*
* Trapper Hat
*/
@@ -181,17 +105,6 @@
if(ishuman(user))
add_atom_colour("#[user.hair_color]", FIXED_COLOUR_PRIORITY)
-/obj/item/clothing/head/hardhat/reindeer
- name = "novelty reindeer hat"
- desc = "Some fake antlers and a very fake red nose."
- icon_state = "hardhat_reindeer"
- item_state = "hardhat_reindeer"
- flags_inv = 0
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- light_range = 1 //luminosity when on
-
- dog_fashion = /datum/dog_fashion/head/reindeer
-
/obj/item/clothing/head/cardborg
name = "cardborg helmet"
desc = "A helmet made out of a box."
@@ -241,7 +154,7 @@
return ..()
/obj/item/clothing/head/wig/worn_overlays(isinhands = FALSE, file2use)
- . = list()
+ . = ..()
if(!isinhands)
var/datum/sprite_accessory/S = GLOB.hairstyles_list[hairstyle]
if(!S)
@@ -304,66 +217,20 @@
flags_inv = HIDEEARS|HIDEHAIR
armor = list("melee" = 5, "bullet" = 0, "laser" = -5, "energy" = -15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20)
-/obj/item/clothing/head/foilhat
- name = "tinfoil hat"
- desc = "Thought control rays, psychotronic scanning. Don't mind that, I'm protected cause I made this hat."
- icon_state = "foilhat"
- item_state = "foilhat"
- armor = list("melee" = 0, "bullet" = 0, "laser" = -5,"energy" = -15, "bomb" = 0, "bio" = 0, "rad" = -5, "fire" = 0, "acid" = 0)
- equip_delay_other = 140
- clothing_flags = ANTI_TINFOIL_MANEUVER
- var/datum/brain_trauma/mild/phobia/conspiracies/paranoia
- var/warped = FALSE
-
-/obj/item/clothing/head/foilhat/equipped(mob/living/carbon/human/user, slot)
- . = ..()
- if(slot != ITEM_SLOT_HEAD || warped)
- return
- if(paranoia)
- QDEL_NULL(paranoia)
- paranoia = new()
-
- user.gain_trauma(paranoia, TRAUMA_RESILIENCE_MAGIC)
- to_chat(user, "As you don the foiled hat, an entire world of conspiracy theories and seemingly insane ideas suddenly rush into your mind. What you once thought unbelievable suddenly seems.. undeniable. Everything is connected and nothing happens just by accident. You know too much and now they're out to get you. ")
-
-/obj/item/clothing/head/foilhat/MouseDrop(atom/over_object)
- //God Im sorry
- if(!warped && iscarbon(usr))
- var/mob/living/carbon/C = usr
- if(src == C.head)
- to_chat(C, "Why would you want to take this off? Do you want them to get into your mind?!")
- return
- return ..()
-
-/obj/item/clothing/head/foilhat/dropped(mob/user)
- . = ..()
- if(paranoia)
- QDEL_NULL(paranoia)
-
-/obj/item/clothing/head/foilhat/proc/warp_up()
- name = "scorched tinfoil hat"
- desc = "A badly warped up hat. Quite unprobable this will still work against any of fictional and contemporary dangers it used to."
- warped = TRUE
- clothing_flags &= ~ANTI_TINFOIL_MANEUVER
- if(!isliving(loc) || !paranoia)
- return
- var/mob/living/target = loc
- if(target.get_item_by_slot(ITEM_SLOT_HEAD) != src)
- return
- QDEL_NULL(paranoia)
- if(target.stat < UNCONSCIOUS)
- to_chat(target, "Your zealous conspirationism rapidly dissipates as the donned hat warps up into a ruined mess. All those theories starting to sound like nothing but a ridicolous fanfare.")
-
-/obj/item/clothing/head/foilhat/attack_hand(mob/user)
- if(!warped && iscarbon(user))
- var/mob/living/carbon/C = user
- if(src == C.head)
- to_chat(user, "Why would you want to take this off? Do you want them to get into your mind?!")
- return
- return ..()
-
-/obj/item/clothing/head/foilhat/microwave_act(obj/machinery/microwave/M)
- . = ..()
- if(!warped)
- warp_up()
+/obj/item/clothing/head/plastic_flower
+ name = "plastic flower"
+ desc = "A realistic imitation of a flower. Not edible though."
+ icon = 'icons/obj/hydroponics/harvest.dmi'
+ icon_state = "poppy"
+ body_parts_covered = null
+ unique_reskin = list(
+ "Poppy" = "poppy",
+ "Sunflower" = "sunflower",
+ "Moonflower" = "moonflower",
+ "Novaflower" = "novaflower",
+ "Harebell" = "harebell",
+ "Geranium" = "geranium",
+ "Lily" = "lily"
+ )
+ custom_materials = (list(/datum/material/plastic = 1000))
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 3e5052cacc9..307106409f1 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -161,3 +161,32 @@
icon_state = "inteqmedsoft"
soft_type = "inteqmed"
dog_fashion = null
+
+/obj/item/clothing/head/soft/utility_beige
+ name = "beige utility cover"
+ desc = "A flat beige utility cover, unbranded. Just the right color for those sandy planetoids."
+ icon_state = "patrolbeigesoft"
+ soft_type = "patrolbeige"
+ dog_fashion = null
+
+/obj/item/clothing/head/soft/utility_black
+ name = "black utility cover"
+ desc = "A flat black utility cover, unbranded. Night Vision Goggles sold separately."
+ icon_state = "patrolblacksoft"
+ soft_type = "patrolblack"
+ dog_fashion = null
+
+/obj/item/clothing/head/soft/utility_olive
+ name = "miskilamao cap"
+ desc = "An olive utility cover emblazoned with the Miskilamo Shipbreaking logo. The material feels cheap."
+ icon_state = "patrololivesoft"
+ soft_type = "patrololive"
+ dog_fashion = null
+
+/obj/item/clothing/head/soft/utility_navy
+ name = "navy utility cover"
+ desc = "A navy blue utility cover, unbranded. Perfect for Seamen on long voyages."
+ icon_state = "patrolnavysoft"
+ soft_type = "patrolnavy"
+ dog_fashion = null
+//recompile icons comment!!!!!
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index 03ca246b60a..10724104fd0 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -11,6 +11,7 @@
var/mask_adjusted = 0
var/adjusted_flags = null
supports_variations = VOX_VARIATION | KEPORI_VARIATION
+ blood_overlay_type = "mask"
/obj/item/clothing/mask/attack_self(mob/user)
if((clothing_flags & VOICEBOX_TOGGLABLE))
@@ -32,15 +33,13 @@
/obj/item/clothing/mask/proc/handle_speech()
/obj/item/clothing/mask/worn_overlays(isinhands = FALSE)
- . = list()
+ . = ..()
if(!isinhands)
if(body_parts_covered & HEAD)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_mask = mutable_appearance('icons/effects/blood.dmi', "maskblood")
- bloody_mask.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_mask
+ . += setup_blood_overlay()
/obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE)
..()
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index c532202a3df..a1ddb98a347 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -1,16 +1,35 @@
/obj/item/clothing/mask/balaclava
name = "balaclava"
- desc = "LOADSAMONEY"
+ desc = "A stretchy fabric hood with eye holes meant for keeping the face warm in cold weather. Also useful for concealing one's identity."
icon_state = "balaclava"
item_state = "balaclava"
- flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
+ clothing_flags = ALLOWINTERNALS
+ visor_flags = ALLOWINTERNALS
+ flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
+ visor_flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
+ gas_transfer_coefficient = 0.1
+ permeability_coefficient = 0.5
actions_types = list(/datum/action/item_action/adjust)
+ flags_cover = MASKCOVERSMOUTH
+ visor_flags_cover = MASKCOVERSMOUTH
+ resistance_flags = NONE
+ supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION | VOX_VARIATION
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
adjustmask(user)
+/obj/item/clothing/mask/balaclava/AltClick(mob/user)
+ ..()
+ if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+ return
+ else
+ adjustmask(user)
+
+/obj/item/clothing/mask/balaclava/examine(mob/user)
+ . = ..()
+ . += "Alt-click [src] to adjust it."
+
/obj/item/clothing/mask/infiltrator
name = "infiltrator balaclava"
desc = "It makes you feel safe in your anonymity, but for a stealth outfit you sure do look obvious that you're up to no good. It seems to have a built in heads-up display."
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 8ff4e6bcb0d..ea6719e1fb6 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -36,3 +36,8 @@
permeability_coefficient = 0.01
equip_delay_other = 10
+/obj/item/clothing/mask/balaclava/inteq //inteq needs a faction clothing file badly but it's out of scope for this PR -apogee
+ name = "IRMG combat balaclava"
+ desc = "A surprisingly advanced balaclava. While it doesn't muffle your voice, it has a mouthpiece for internals. Comfy to boot! This one is a variataion commonly used by the IRMG to protect it's members idenites."
+ icon_state = "inteq_balaclava"
+ item_state = "inteq_balaclava"
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 34e77816c94..4fd1df88f0b 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -8,7 +8,7 @@
item_state = "gas_alt"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
- flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH | PEPPERPROOF
+ flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
resistance_flags = NONE
/obj/item/clothing/mask/gas/atmos
@@ -275,3 +275,10 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR
+/obj/item/clothing/mask/gas/inteq
+ name = "Inteq gas mask"
+ desc = "A protective gas mask refit for Inteq's standards. It features a modified scratch resistant visor, ports for connecting an oxygen supply, and secure, comfortable straps."
+ icon_state = "inteq_gas_mask"
+ item_state = "inteq_gas_mask"
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ supports_variations = KEPORI_VARIATION
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index 78bbc032e86..35fd0e30430 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -13,6 +13,7 @@
visor_flags_inv = HIDEFACIALHAIR | HIDEFACE
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF
visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF
+ supports_variations = VOX_VARIATION
/obj/item/clothing/mask/gas/sechailer/swat
name = "\improper SWAT mask"
@@ -28,13 +29,6 @@
icon_state = "spacepol"
item_state = "spacepol"
-/obj/item/clothing/mask/gas/sechailer/cyborg
- name = "security hailer"
- desc = "A set of recognizable pre-recorded messages for cyborgs to use when apprehending criminals."
- icon = 'icons/obj/device.dmi'
- icon_state = "taperecorder_idle"
- mob_overlay_state = "sechailer"
-
/obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, action)
if(istype(action, /datum/action/item_action/adjust))
adjustmask(user)
@@ -66,17 +60,3 @@
icon_state = "whistle"
item_state = "whistle"
blown_sound = 'sound/misc/trenchwhistle.ogg'
-
-/obj/item/clothing/mask/gas/sechailer/balaclava
- name = "combat balaclava"
- desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot!"
- icon_state = "combat_balaclava"
- item_state = "combat_balaclava"
- strip_delay = 60
- alternate_worn_layer = BODY_LAYER
- flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
-
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq
- desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This one is a variataion commonly used by the IRMG to protect it's members idenites."
- icon_state = "inteq_balaclava"
- item_state = "inteq_balaclava"
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 725764a10b0..d2b57371105 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -154,13 +154,6 @@
clothing_flags = VOICEBOX_TOGGLABLE
modifies_speech = TRUE
-/obj/item/clothing/mask/frog/handle_speech(datum/source, list/speech_args) //whenever you speak
- if(!(clothing_flags & VOICEBOX_DISABLED))
- if(prob(5)) //sometimes, the angry spirit finds others words to speak.
- speech_args[SPEECH_MESSAGE] = pick("HUUUUU!!","SMOOOOOKIN'!!","Hello my baby, hello my honey, hello my rag-time gal.", "Feels bad, man.", "GIT DIS GUY OFF ME!!" ,"SOMEBODY STOP ME!!", "NORMIES, GET OUT!!")
- else
- speech_args[SPEECH_MESSAGE] = pick("Ree!!", "Reee!!","REEE!!","REEEEE!!") //but its usually just angry gibberish,
-
/obj/item/clothing/mask/frog/cursed
clothing_flags = NONE
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 8838ed657b5..a1f9c817f34 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -11,7 +11,7 @@
greyscale_icon_state = "scarf"
/obj/item/clothing/neck/worn_overlays(isinhands = FALSE)
- . = list()
+ . = ..()
if(!isinhands)
if(body_parts_covered & HEAD)
if(damaged_clothes)
@@ -167,6 +167,7 @@
desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
icon_state = "stethoscope"
cuttable = FALSE
+ supports_variations = VOX_VARIATION
/obj/item/clothing/neck/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
if(ishuman(M) && isliving(user))
@@ -267,6 +268,7 @@
name = "shemagh"
desc = "An oversized shemagh, for those with a keen sense of fashion, or those operating tactically."
icon_state = "shemagh"
+ supports_variations = VOX_VARIATION
//The three following scarves don't have the scarf subtype
//This is because Ian can equip anything from that subtype
@@ -275,21 +277,25 @@
name = "striped red scarf"
icon_state = "stripedredscarf"
custom_price = 10
+ supports_variations = VOX_VARIATION
/obj/item/clothing/neck/stripedgreenscarf
name = "striped green scarf"
icon_state = "stripedgreenscarf"
custom_price = 10
+ supports_variations = VOX_VARIATION
/obj/item/clothing/neck/stripedbluescarf
name = "striped blue scarf"
icon_state = "stripedbluescarf"
custom_price = 10
+ supports_variations = VOX_VARIATION
/obj/item/clothing/neck/stripedsolgovscarf
name = "striped solgov scarf"
icon_state = "stripedsolgovscarf"
custom_price = 10
+ supports_variations = VOX_VARIATION
/obj/item/clothing/neck/petcollar
name = "pet collar"
@@ -304,6 +310,23 @@
tagname = stripped_input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot", MAX_NAME_LEN)
name = "[initial(name)] - [tagname]"
+/obj/item/clothing/neck/dogtag
+ name = "dogtag"
+ desc = "A nondescript dogtag."
+ icon = 'icons/obj/clothing/neck.dmi'
+ icon_state = "dogtag"
+ resistance_flags = FIRE_PROOF
+ w_class = WEIGHT_CLASS_SMALL
+ slot_flags = ITEM_SLOT_NECK | ITEM_SLOT_POCKETS
+
+/obj/item/clothing/neck/dogtag/frontier
+ name = "frontiersman dogtag"
+ desc = "A dogtag marked with the name and rank of a Frontiersmen pirate. You could turn this in to an outpost console contract for money."
+
+/obj/item/clothing/neck/dogtag/ramzi
+ name = "ramzi clique dogtag"
+ desc = "A dogtag marked with the name and rank of a Ramzi Clique pirate. You could turn this in to an outpost console contract for money."
+
//////////////
//DOPE BLING//
//////////////
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index b3a2b20f687..56f2a677c12 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -1,21 +1,23 @@
/datum/outfit/job/frontiersmen/ert //most basic of grunts
name = "ERT - Frontiersman Basic"
- head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
+ head = /obj/item/clothing/head/beret/sec/frontier
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
suit_store = /obj/item/gun/ballistic/rifle/illestren
+ belt = /obj/item/storage/belt/security/military/frontiersmen/illestren
uniform = /obj/item/clothing/under/frontiersmen
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset/pirate/alt
back = /obj/item/storage/backpack
- l_pocket = /obj/item/flashlight/seclite
- r_pocket = /obj/item/tank/internals/emergency_oxygen/double
+ id = null // lol
+ wallet = null
box = /obj/item/storage/box/survival/frontier
- id = null // lol
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/double
- backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/illestren_a850r=5, /obj/item/grenade/frag=1)
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen)
/datum/outfit/job/frontiersmen/ert/random
name = "ERT - Frontiersman Randomized"
@@ -25,47 +27,56 @@
suit = null
suit_store = null
back = null
+ belt = null
+ gloves = null
+
l_pocket = null
r_pocket = /obj/item/radio
+
backpack_contents = list()
+ box = null
+ backpack = null
+ courierbag = null
+ satchel = null
+ duffelbag = null
+
/datum/outfit/job/frontiersmen/ert/random/pre_equip(mob/living/carbon/human/H, visualsOnly, client/preference_source)
. = ..()
if(visualsOnly)
return
if(prob(90))
- head = pickweight(list(
+ head = pick_weight(list(
/obj/item/clothing/head/beret/sec/frontier = 10,
/obj/item/clothing/head/helmet/bulletproof/x11/frontier = 5,
/obj/item/reagent_containers/glass/bucket = 1))
if(prob(60))
- suit = pickweight(list(
+ suit = pick_weight(list(
/obj/item/clothing/suit/armor/vest = 5,
- /obj/item/clothing/suit/armor/vest/bulletproof/frontier = 5,
- /obj/item/clothing/suit/armor/vest/scrap_armor = 1))
-
- if(prob(30))
- mask = pickweight(list(
- /obj/item/clothing/mask/gas/frontiersmen = 5,
- /obj/item/clothing/mask/gas/sechailer/balaclava = 5,
- /obj/item/clothing/mask/breath = 5,
+ /obj/item/clothing/suit/armor/vest/frontier = 5,
+ /obj/item/clothing/suit/armor/vest/scrap = 1))
+
+ if(prob(50))
+ mask = pick_weight(list(
+ /obj/item/clothing/mask/gas/frontiersmen = 12,
+ /obj/item/clothing/mask/balaclava = 10,
+ /obj/item/clothing/mask/breath = 7,
/obj/item/clothing/mask/whistle = 3))
if(prob(90))
- back = pickweight(list(
+ back = pick_weight(list(
/obj/item/storage/backpack = 20,
/obj/item/storage/backpack/satchel = 20,
/obj/item/storage/backpack/messenger = 20,
/obj/item/melee/baton/cattleprod/loaded = 5,
- /obj/item/reagent_containers/food/snacks/baguette = 2, // yes you can put this on your back
- /obj/item/deployable_turret_folded = 1,
- /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended = 1,
+ /obj/item/deployable_turret_folded = 4,
+ /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended = 3,
))
if(prob(90))
- shoes = pickweight(list(
+ shoes = pick_weight(list(
/obj/item/clothing/shoes/jackboots = 10,
/obj/item/clothing/shoes/sneakers = 5,
))
@@ -73,29 +84,32 @@
var/extra_class = pick(list("Doctor", "Breacher", "Ammo Carrier"))
switch(extra_class)
if("Doctor")
- backpack_contents += list(/obj/item/storage/firstaid/regular = 1)
+ backpack_contents += list(/obj/item/storage/firstaid/medical = 1)
gloves = /obj/item/clothing/gloves/color/latex
suit = /obj/item/clothing/suit/frontiersmen
head = /obj/item/clothing/head/frontier
if(prob(50))
- belt = /obj/item/storage/belt/medical/surgery
+ belt = /obj/item/storage/belt/medical/webbing/frontiersmen/combat
if(prob(30))
glasses = /obj/item/clothing/glasses/hud/health
if("Breacher")
- backpack_contents += list(/obj/item/grenade/c4 = 2)
- if(prob(10))
+ backpack_contents += list(/obj/item/grenade/c4 = 2, /obj/item/grenade/smokebomb = 3)
+ if(prob(60))
belt = /obj/item/storage/belt/grenade/full
if("Ammo Carrier")
var/loops = rand(1,3)
for(var/i in 1 to loops)
var/ammotype = pick(list(
- /obj/item/ammo_box/c8x50mm_box,
- /obj/item/ammo_box/c45,
- /obj/item/ammo_box/a357_box,
- /obj/item/ammo_box/c45,
- /obj/item/ammo_box/a4570,
+ /obj/item/storage/box/ammo/a8_50r,
+ /obj/item/storage/box/ammo/c45,
+ /obj/item/storage/box/ammo/a357,
+ /obj/item/storage/box/ammo/c45,
+ /obj/item/storage/box/ammo/a4570,
/obj/item/stock_parts/cell/gun/mini))
- backpack_contents += ammotype
+ if(istype(back, /obj/item/storage/backpack))
+ backpack_contents += ammotype
+ else
+ H.put_in_hands(ammotype, FALSE)
var/weapon = pick(list("Bolt-Action", "Pistol", "Melee"))
switch(weapon)
@@ -113,7 +127,7 @@
/obj/item/gun/ballistic/revolver/shadow,
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/presawn,
/obj/item/gun/energy/e_gun/mini))
- if(prob(30))
+ if(prob(80))
l_hand = pick(list(
/obj/item/gun/ballistic/automatic/pistol/disposable,
/obj/item/gun/ballistic/automatic/pistol/candor,
@@ -122,15 +136,15 @@
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/presawn,
/obj/item/gun/energy/e_gun/mini))
if("Melee")
- r_hand = pickweight(list(
- /obj/item/kitchen/knife/combat/survival = 15,
+ r_hand = pick_weight(list(
+ /obj/item/melee/knife/survival = 15,
/obj/item/melee/baseball_bat = 10,
- /obj/item/melee/roastingstick = 2,
+ /obj/item/roastingstick = 2,
/obj/item/kitchen/fork = 1,
/obj/item/melee/flyswatter = 1,
))
-/datum/outfit/job/frontiersmen/ert/grunt //better armed, use for quick creating pirate ships
+/datum/outfit/job/frontiersmen/ert/unarmed //better armed, use for quick creating pirate ships
name = "ERT - Frontiersman Grunt (Unarmed)"
suit_store = null
@@ -138,17 +152,30 @@
backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen)
-/datum/outfit/job/frontiersmen/ert/grunt/skm
- name = "ERT - Frontiersman Grunt (SKM-24)"
+/datum/outfit/job/frontiersmen/ert/skm
+ name = "ERT - Frontiersman Grunt (SKM-24 AR)"
suit_store = /obj/item/gun/ballistic/automatic/assault/skm
belt = /obj/item/storage/belt/security/military/frontiersmen/skm_ammo
-/datum/outfit/job/frontiersmen/ert/grunt/aps_mp //remember. Remind me to replace this with the spitter.
- name = "ERT - Frontiersman Grunt (Stechkin APS)"
+/datum/outfit/job/frontiersmen/ert/mauler_mp
+ name = "ERT - Frontiersman Grunt (Mauler MP)"
+
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
+ belt = /obj/item/storage/belt/security/military/frontiersmen/mauler_mp_ammo
+
+/datum/outfit/job/frontiersmen/ert/spitter_mp
+ name = "ERT - Frontiersman Grunt (Spitter MP)"
+
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/spitter
+ belt = /obj/item/storage/belt/security/military/frontiersmen/spitter_ammo
+
+/datum/outfit/job/frontiersmen/ert/pounder_smg
+ name = "ERT - Frontiersman Grunt (Pounder SMG)"
- suit_store = /obj/item/gun/ballistic/automatic/pistol/APS
- belt = /obj/item/storage/belt/security/military/frontiersmen/aps_mp_ammo
+ suit_store = /obj/item/gun/ballistic/automatic/smg/pounder
+ belt = null
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen=1, /obj/item/ammo_box/magazine/c22lr_pounder_pan=2)
/datum/outfit/job/frontiersmen/ert/leader
name = "ERT - Frontiersman Officer"
@@ -158,16 +185,33 @@
ears = /obj/item/radio/headset/pirate/alt/captain
back = /obj/item/storage/backpack/satchel/leather
suit = /obj/item/clothing/suit/armor/frontier
- suit_store = /obj/item/gun/ballistic/automatic/pistol/deagle
+ suit_store = null
+ belt = /obj/item/gun/ballistic/automatic/pistol/deagle
+
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/m50=2, /obj/item/binoculars=1, /obj/item/melee/knife/survival)
+
+/datum/outfit/job/frontiersmen/ert/leader/heavy
+ name = "ERT - Frontiersman Officer (Shock Troop)"
+
+ suit = /obj/item/clothing/suit/armor/vest/marine/frontier
+ head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier
+ mask = /obj/item/clothing/mask/breath
+ belt = /obj/item/gun/ballistic/automatic/pistol/deagle/gold // daring today aren't we
- backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/m50=2, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)
+ backpack = /obj/item/minigunpack
+ satchel = /obj/item/minigunpack
+ courierbag = /obj/item/minigunpack
+ duffelbag = /obj/item/minigunpack
-/datum/outfit/job/frontiersmen/ert/leader/unnarmed
- name = "ERT - Frontiersman Officer (Unnarmed)"
+ backpack_contents = null
+ box = null
+
+/datum/outfit/job/frontiersmen/ert/leader/unarmed
+ name = "ERT - Frontiersman Officer (Unarmed)"
suit_store = null
- backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/binoculars=1, /obj/item/melee/knife/survival)
/datum/outfit/job/frontiersmen/ert/medic
name = "ERT - Frontiersman Medic"
@@ -177,10 +221,22 @@
mask = /obj/item/clothing/mask/surgical
gloves = /obj/item/clothing/gloves/color/latex/nitrile
belt = /obj/item/storage/belt/medical/webbing/frontiersmen/surgery
- suit_store = /obj/item/gun/ballistic/automatic/pistol/APS
+ suit = /obj/item/clothing/suit/frontiersmen
+ suit_store = null
- backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack=3, /obj/item/ammo_box/magazine/pistolm9mm=2)
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/regular, /obj/item/ammo_box/magazine/m9mm_mauler = 2, /obj/item/gun/ballistic/automatic/pistol/mauler)
+/datum/outfit/job/frontiersmen/ert/medic/heavy
+ name = "ERT - Frontiersman Medic (Shock Troop)"
+
+ head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier
+ mask = /obj/item/clothing/mask/breath/ngr
+ suit = /obj/item/clothing/suit/armor/vest/frontier
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
+ belt = /obj/item/storage/belt/medical/webbing/frontiersmen/combat
+ glasses = /obj/item/clothing/glasses/hud/health
+
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 3, /obj/item/ammo_box/magazine/m9mm_mauler=2)
/datum/outfit/job/frontiersmen/ert/engineer
name = "ERT - Frontiersman Engineer"
@@ -202,19 +258,23 @@
suit_store = /obj/item/tank/internals/oxygen/red
uniform = /obj/item/clothing/under/frontiersmen/fireproof
gloves = /obj/item/clothing/gloves/combat
- back = /obj/item/storage/backpack
+ back = /obj/item/storage/backpack/fireproof
belt = /obj/item/storage/belt/security/military/frontiersmen/flamer
l_hand = /obj/item/flamethrower/full/tank
- backpack_contents = list(/obj/item/gun/ballistic/shotgun/doublebarrel/presawn=1,/obj/item/ammo_box/a12g=1,/obj/item/extinguisher=2,/obj/item/radio=1)
+ backpack_contents = list(
+ /obj/item/gun/ballistic/shotgun/doublebarrel/presawn=1, \
+ /obj/item/storage/box/ammo/a12g_slug = 1, \
+ /obj/item/extinguisher = 2, \
+ /obj/item/radio=1)
-/datum/outfit/job/frontiersmen/ert/sentry_lmg
- name = "ERT - Frontiersman Sentry (SKM-24v)"
+/datum/outfit/job/frontiersmen/ert/sentry
+ name = "ERT - Frontiersman Sentry (SKM-24v LMG)"
- head = /obj/item/clothing/head/helmet/marine/frontier
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ head = /obj/item/clothing/head/helmet/frontier
+ mask = /obj/item/clothing/mask/balaclava
suit = /obj/item/clothing/suit/armor/vest/marine/frontier
suit_store = /obj/item/gun/ballistic/automatic/hmg/skm_lmg/drum_mag
gloves = /obj/item/clothing/gloves/combat
@@ -222,3 +282,11 @@
belt = /obj/item/gun/ballistic/revolver/mateba
backpack_contents = list(/obj/item/ammo_box/magazine/skm_762_40/drum=2,/obj/item/ammo_box/a357=2,/obj/item/grenade/frag=1,/obj/item/radio=1)
+
+/datum/outfit/job/frontiersmen/ert/sentry/shredder
+ name = "ERT - Frontiersman Sentry (Shredder LMG)"
+
+ suit_store = null
+ l_hand = /obj/item/gun/ballistic/automatic/hmg/shredder // this doesnt even fit on the suit storage slot
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m12_shredder=2,/obj/item/ammo_box/a357=2,/obj/item/grenade/frag=1,/obj/item/radio=1)
diff --git a/code/modules/clothing/outfits/ert/gezena_ert.dm b/code/modules/clothing/outfits/ert/gezena_ert.dm
new file mode 100644
index 00000000000..436b7379599
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/gezena_ert.dm
@@ -0,0 +1,87 @@
+/datum/outfit/job/gezena/ert
+ name = "ERT - PGF Marine Rifleman"
+ id_assignment = "Marine Rifleman"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
+
+ uniform = /obj/item/clothing/under/gezena/marine
+ suit = /obj/item/clothing/suit/armor/gezena/marine
+ head = /obj/item/clothing/head/helmet/gezena
+ belt = /obj/item/storage/belt/military/gezena/bg16
+ gloves = /obj/item/clothing/gloves/gezena/marine
+ shoes = /obj/item/clothing/shoes/combat/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena
+ suit_store = /obj/item/gun/energy/kalix/pgf
+
+ l_pocket = /obj/item/melee/knife/combat
+ r_pocket = /obj/item/flashlight/seclite
+
+ backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/grenade/frag=2)
+
+
+/datum/outfit/job/gezena/ert/gunner
+ name = "ERT - PGF Marine Gunner"
+
+ suit_store = /obj/item/gun/energy/kalix/pgf/heavy // yea there's not much else to put in. sorry
+
+/datum/outfit/job/gezena/ert/engineer
+ name = "ERT - PGF Marine Combat Engineer"
+ id_assignment = "Marine Combat Engineer"
+
+ belt = /obj/item/storage/belt/military/gezena/engineer
+
+/datum/outfit/job/gezena/ert/medic
+ name = "ERT - PGF Marine Medic"
+ id_assignment = "Marine Medic"
+ jobtype = /datum/job/paramedic
+ job_icon = "paramedic"
+
+ belt = /obj/item/storage/belt/medical/gezena/paramedic
+ gloves = /obj/item/clothing/gloves/gezena/marine
+ neck = /obj/item/clothing/neck/cloak/gezena/med
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/para
+ box = /obj/item/storage/box/survival/medical
+
+ backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/screwdriver)
+
+
+/datum/outfit/job/gezena/ert/leader
+ name = "ERT - PGF Marine Sergeant"
+ id_assignment = "Marine Sergeant"
+ jobtype = /datum/job/hos
+ job_icon = "headofsecurity"
+
+ suit = /obj/item/clothing/suit/armor/gezena/marinecoat
+ head = /obj/item/clothing/head/helmet/gezena
+ gloves = /obj/item/clothing/gloves/gezena/marine
+ shoes = /obj/item/clothing/shoes/combat/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena/lead
+ suit_store = /obj/item/gun/energy/kalix/pgf/heavy
+
+ backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/grenade/smokebomb = 3, /obj/item/binoculars)
+
+
+/datum/outfit/job/gezena/ert/inspector
+ name = "ERT - PGF Naval Observer"
+ id_assignment = "Naval Observer"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "headofpersonnel"
+
+ head = /obj/item/clothing/head/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena/command
+ uniform = /obj/item/clothing/under/gezena
+ suit = /obj/item/clothing/suit/armor/gezena
+ suit_store = null
+ belt = null
+ gloves = /obj/item/clothing/gloves/gezena
+
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/satchel
+ courierbag = /obj/item/storage/backpack/satchel
+
+ backpack_contents = list(/obj/item/folder, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
diff --git a/code/modules/clothing/outfits/ert/indie_ert.dm b/code/modules/clothing/outfits/ert/indie_ert.dm
index e45f0895d0f..57d737ba0f8 100644
--- a/code/modules/clothing/outfits/ert/indie_ert.dm
+++ b/code/modules/clothing/outfits/ert/indie_ert.dm
@@ -3,25 +3,18 @@
jobtype = /datum/job/officer
job_icon = "securityofficer"
+ wallet = null
+
head = /obj/item/clothing/head/helmet/sec
ears = /obj/item/radio/headset/alt
- mask = null
uniform = /obj/item/clothing/under/rank/security/officer
- shoes = /obj/item/clothing/shoes/combat/swat
+ shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/color/black
suit = /obj/item/clothing/suit/armor/vest
back = /obj/item/storage/backpack/security
belt = /obj/item/storage/belt/security/full
id = /obj/item/card/id
-/datum/outfit/job/independent/ert/post_equip(mob/living/carbon/human/H, visualsOnly, client/preference_source)
- . = ..()
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access += list(ACCESS_CENT_GENERAL)
-
/datum/outfit/job/independent/ert/emt
name = "ERT - Independent Paramedic"
jobtype = /datum/job/paramedic
@@ -37,6 +30,15 @@
back = /obj/item/storage/backpack/medic
belt = /obj/item/storage/belt/medical/webbing/paramedic
+ backpack_contents = list(/obj/item/storage/firstaid/medical)
+
+/datum/outfit/job/independent/ert/emt/eva
+ name = "ERT - Independent Paramedic (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/medical
+ suit_store = /obj/item/tank/internals/oxygen
+
/datum/outfit/job/independent/ert/firefighter
name = "ERT - Independent Firefighter (Standard)"
jobtype = /datum/job/atmos
@@ -44,14 +46,20 @@
head = /obj/item/clothing/head/hardhat/red
uniform = /obj/item/clothing/under/utility
- suit = /obj/item/clothing/suit/fire/firefighter
+ suit = /obj/item/clothing/suit/fire/atmos
suit_store = /obj/item/extinguisher
glasses = /obj/item/clothing/glasses/heat
- mask = /obj/item/clothing/mask/breath
+ belt = null
+ mask = /obj/item/clothing/mask/gas/atmos
shoes = /obj/item/clothing/shoes/workboots
gloves = /obj/item/clothing/gloves/color/black
back = /obj/item/tank/internals/oxygen/red
+ backpack = /obj/item/storage/backpack/fireproof
+ courierbag = /obj/item/storage/backpack/fireproof
+ duffelbag = /obj/item/storage/backpack/fireproof
+ satchel = /obj/item/storage/backpack/fireproof
+
l_pocket = /obj/item/crowbar/red
r_pocket = /obj/item/radio
@@ -61,27 +69,33 @@
job_icon = "paramedic"
mask = /obj/item/clothing/mask/breath/medical
- back = /obj/item/storage/backpack/fireproof
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
glasses = /obj/item/clothing/glasses/hud/health
suit_store = /obj/item/tank/internals/emergency_oxygen
l_pocket = /obj/item/extinguisher/mini
- backpack_contents = list(/obj/item/storage/firstaid/fire=1, /obj/item/storage/firstaid/o2=1, /obj/item/radio=1)
+ backpack_contents = list(/obj/item/storage/firstaid/fire=1, /obj/item/storage/firstaid/o2=1)
/datum/outfit/job/independent/ert/firefighter/leader
name = "ERT - Independent Firefighter (Group Captain)"
jobtype = /datum/job/chief_engineer
job_icon = "chiefengineer"
- back = /obj/item/fireaxe
suit = /obj/item/clothing/suit/space/hardsuit/engine
suit_store = /obj/item/tank/internals/oxygen/red
head = null
belt = /obj/item/storage/belt/utility/atmostech
gloves = /obj/item/clothing/gloves/color/yellow
+ backpack_contents = null
+ box = null
+
+ backpack = /obj/item/melee/axe/fire
+ courierbag = /obj/item/melee/axe/fire
+ duffelbag = /obj/item/melee/axe/fire
+ satchel = /obj/item/melee/axe/fire
+
/datum/outfit/job/independent/ert/technician
name = "ERT - Independent Technician"
jobtype = /datum/job/engineer
@@ -90,6 +104,7 @@
head = /obj/item/clothing/head/hardhat
uniform = /obj/item/clothing/under/rank/engineering/engineer
belt = /obj/item/storage/belt/utility/full/engi
+ gloves = /obj/item/clothing/gloves/color/yellow
suit = /obj/item/clothing/suit/toggle/hazard
shoes = /obj/item/clothing/shoes/workboots
back = /obj/item/storage/backpack/industrial
@@ -97,3 +112,61 @@
r_pocket = /obj/item/analyzer
box = /obj/item/storage/box/survival/engineer
+
+/datum/outfit/job/independent/ert/pizza
+ name = "ERT - Independent Pizza Delivery Worker"
+
+ uniform = /obj/item/clothing/under/suit/burgundy
+ neck = /obj/item/clothing/neck/tie/red
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ head = /obj/item/clothing/head/soft/mime
+ suit = null
+ ears = null
+ belt = null
+ gloves = null
+
+
+/datum/outfit/job/independent/ert/janitor
+ name = "ERT - Independent Sanitation Technician"
+ jobtype = /datum/job/janitor
+ job_icon = "janitor"
+
+ uniform = /obj/item/clothing/under/rank/civilian/janitor
+ head = /obj/item/clothing/head/soft/purple
+ ears = /obj/item/radio/headset
+ mask = null
+ shoes = /obj/item/clothing/shoes/combat/swat
+ gloves = /obj/item/clothing/gloves/color/purple
+ suit = null
+ belt = /obj/item/storage/belt/janitor/full
+
+/datum/outfit/job/independent/ert/deathsquad
+ name = "ERT - Death Commando"
+ job_icon = "deathsquad"
+ faction_icon = null
+ id_assignment = "Commando" // i mean. if you have enough time to look at a dsquaddie's id card. why not
+
+ head = null
+ uniform = /obj/item/clothing/under/rank/security/officer/military
+ id = /obj/item/card/id/ert/deathsquad
+ suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
+ shoes = /obj/item/clothing/shoes/combat/swat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
+ mask = /obj/item/clothing/mask/gas/sechailer/swat
+ glasses = /obj/item/clothing/glasses/hud/toggle/thermal
+ back = /obj/item/storage/backpack/security
+ suit_store = /obj/item/tank/internals/emergency_oxygen/double
+ belt = /obj/item/gun/ballistic/revolver/mateba
+ ears = /obj/item/radio/headset/alt
+ r_hand = /obj/item/gun/energy/pulse
+
+ l_pocket = /obj/item/melee/energy/sword/saber
+ r_pocket = /obj/item/shield/energy
+
+
+ backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
+ /obj/item/ammo_box/a357=1,\
+ /obj/item/storage/firstaid/regular=1,\
+ /obj/item/storage/box/flashbangs=1,\
+ /obj/item/flashlight=1,\
+ /obj/item/grenade/c4/x4=1)
diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm
index b3fc0c61970..6513fe11dd4 100644
--- a/code/modules/clothing/outfits/ert/inteq_ert.dm
+++ b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -4,31 +4,63 @@
jobtype = /datum/job/officer
job_icon = "securityofficer"
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ wallet = null
+
+ head = /obj/item/clothing/head/helmet/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
- suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ suit = /obj/item/clothing/suit/armor/vest
suit_store = /obj/item/gun/ballistic/automatic/assault/skm/inteq
gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset/inteq/alt
id = /obj/item/card/id
belt = /obj/item/storage/belt/security/webbing/inteq/skm
- back = /obj/item/storage/backpack/fireproof
- l_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/melee/knife/combat
r_pocket = /obj/item/flashlight/seclite
- backpack_contents = list(/obj/item/radio=1)
+/datum/outfit/job/inteq/ert/eva
+ name = "ERT - Inteq Rifleman (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
/datum/outfit/job/inteq/ert/shotgun
name = "ERT - Inteq Shotgunner"
- id_assignment = "Enforcer"
- suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
- belt = /obj/item/storage/belt/security/webbing/inteq/alt
+ suit_store = /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq
+ belt = /obj/item/storage/belt/security/webbing/inteq/alt/bulldog
- backpack_contents = list(/obj/item/storage/box/lethalshot=2, /obj/item/radio=1)
+/datum/outfit/job/inteq/ert/shotgun/eva
+ name = "ERT - Inteq Shotgunner (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
+
+/datum/outfit/job/inteq/ert/engineer
+ name = "ERT - Inteq Artificer"
+ id_assignment = "Artificer"
+ jobtype = /datum/job/engineer
+ job_icon = "stationengineer"
+
+ head = /obj/item/clothing/head/soft/inteq
+ uniform = /obj/item/clothing/under/syndicate/inteq/artificer
+ belt = /obj/item/storage/belt/utility/full/engi
+ gloves = /obj/item/clothing/gloves/color/yellow
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/co9mm=2)
+
+/datum/outfit/job/inteq/ert/engineer/eva
+ name = "ERT - Inteq Artificer (EVA)"
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
/datum/outfit/job/inteq/ert/medic
name = "ERT - Inteq Corpsman"
@@ -36,13 +68,21 @@
jobtype = /datum/job/paramedic
job_icon = "paramedic"
+ head = /obj/item/clothing/head/soft/inteq/corpsman
uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
belt = /obj/item/storage/belt/medical/webbing/paramedic
- suit_store = null
+ suit = /obj/item/clothing/suit/armor/inteq/corpsman
+ suit_store = /obj/item/healthanalyzer
+
+ backpack_contents = list(/obj/item/storage/firstaid/medical=1)
- l_pocket = /obj/item/healthanalyzer
+/datum/outfit/job/inteq/ert/medic/eva
+ name = "ERT - Inteq Corpsman (EVA)"
- backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/radio=1)
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ suit_store = null
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
/datum/outfit/job/inteq/ert/leader
name = "ERT - Inteq Vanguard"
@@ -50,7 +90,62 @@
jobtype = /datum/job/hos
job_icon = "headofsecurity"
+ head = /obj/item/clothing/head/helmet/inteq
ears = /obj/item/radio/headset/inteq/alt/captain
back = /obj/item/storage/backpack/messenger/inteq
+ belt = /obj/item/storage/belt/security/webbing/inteq/skm_carabine
+ suit = /obj/item/clothing/suit/armor/hos/inteq
+ suit_store = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq
+ id = /obj/item/card/id/gold
+
+ backpack_contents = list(/obj/item/megaphone/sec)
+
+/datum/outfit/job/inteq/ert/leader/eva
+ name = "ERT - Inteq Vanguard (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
+
+/datum/outfit/job/inteq/ert/honor_guard
+ name = "ERT - Inteq Honor Guard"
+ id_assignment = "Guardsman"
+ jobtype = /datum/job/officer
+ job_icon = "inteq"
+
+ uniform = /obj/item/clothing/under/syndicate/inteq
+ suit = /obj/item/clothing/suit/armor/vest/marine
+ belt = /obj/item/storage/belt/military/assault/commander
+ gloves = /obj/item/clothing/gloves/color/white
+ shoes = /obj/item/clothing/shoes/combat
+ head = /obj/item/clothing/head/beret/sec/hos/inteq/honorable
+ mask = /obj/item/clothing/mask/balaclava/inteq
+ ears = /obj/item/radio/headset/inteq/captain
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
+ r_pocket = /obj/item/restraints/handcuffs
suit_store = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
- id = /obj/item/card/id/silver
+
+ backpack_contents = list(/obj/item/gun/energy/taser)
+
+
+/datum/outfit/job/inteq/ert/inspector
+ name = "ERT - Inteq Mothership Investigator"
+ id_assignment = "Investigator"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "inteq"
+
+ uniform = /obj/item/clothing/under/syndicate/inteq
+ suit = null
+ suit_store = null
+ belt = /obj/item/clipboard
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/laceup
+ head = /obj/item/clothing/head/beret/sec/inteq
+ mask = null
+ ears = /obj/item/radio/headset/inteq/captain
+ glasses = null
+
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/stamp/inteq, /obj/item/folder, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index bc440d3bc61..cec786d7078 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -1,26 +1,61 @@
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard
- name = "ERT - CLIP Minuteman BARD Specialist"
- id_assignment = "Biohazard Assessment Specialist"
+/datum/outfit/job/clip/minutemen/bard
+ name = "ERT - C-MM BARD Field Agent"
+ id_assignment = "Biohazard Assessment Field Agent"
+ jobtype = /datum/job/virologist
+ job_icon = "virologist" // can someone resprite the biosuits already
+
+ wallet = null
+
+ uniform = /obj/item/clothing/under/clip/formal/with_shirt
+ head = /obj/item/clothing/head/clip
+ mask = /obj/item/clothing/mask/surgical
+ gloves = /obj/item/clothing/gloves/color/latex
+
+ backpack = /obj/item/storage/backpack/satchel/sec/clip
+ satchel = /obj/item/storage/backpack/satchel/sec/clip
+ courierbag = /obj/item/storage/backpack/satchel/sec/clip
+ duffelbag = /obj/item/storage/backpack/satchel/sec/clip
+
+ l_pocket = /obj/item/taperecorder
+ r_pocket = /obj/item/flashlight
+
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip,
+ /obj/item/evidencebag = 2,
+ /obj/item/camera,
+ /obj/item/storage/firstaid/toxin,
+ )
+
+/datum/outfit/job/clip/minutemen/bard/emergency
+ name = "ERT - C-MM BARD Xenofauna Specialist"
+ id_assignment = "Biohazard Assessment Xenofauna Specialist"
job_icon = "clip_cmm2"
+ uniform = /obj/item/clothing/under/clip/minutemen
suit = /obj/item/clothing/suit/armor/vest/marine/heavy
- suit_store = /obj/item/gun/ballistic/shotgun/bulldog/minutemen
+ suit_store = /obj/item/gun/ballistic/shotgun/cm15/incendiary
mask = /obj/item/clothing/mask/gas/clip
head = /obj/item/clothing/head/helmet/riot/clip
- belt = /obj/item/storage/belt/military/clip/cm15
+ belt = /obj/item/storage/belt/military/clip/cm15_inc
glasses = /obj/item/clothing/glasses/hud/health/night
- r_pocket = /obj/item/kitchen/knife/combat
+ r_pocket = /obj/item/melee/knife/combat
l_pocket = /obj/item/extinguisher/mini
+ shoes = /obj/item/clothing/shoes/combat
+
+ backpack = /obj/item/storage/backpack/ert
+ satchel = /obj/item/storage/backpack/ert
+ courierbag = /obj/item/storage/backpack/ert
+ duffelbag = /obj/item/storage/backpack/ert
backpack_contents = list(
/obj/item/flashlight/seclite = 1,
/obj/item/storage/box/flares = 1
)
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic
- name = "ERT - CLIP Minuteman BARD Medical Specialist"
- id_assignment = "Corpsman"
+/datum/outfit/job/clip/minutemen/bard/emergency/medic
+ name = "ERT - C-MM BARD Medical Specialist"
+ id_assignment = "Biohazard Assessment Medical Aid Specialist"
+ uniform = /obj/item/clothing/under/clip/medic
suit = /obj/item/clothing/suit/armor/vest/marine
suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
belt = /obj/item/storage/belt/medical/webbing/clip/prefilled
@@ -31,11 +66,17 @@
/obj/item/flashlight/seclite = 1,
/obj/item/defibrillator/compact/loaded = 1,
/obj/item/storage/firstaid/advanced = 1,
- /obj/item/ammo_box/magazine/smgm9mm = 2
+ /obj/item/ammo_box/magazine/cm5_9mm = 2
)
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard/flamer
- name = "ERT - CLIP Minuteman BARD Flamethrower Specialist"
+ backpack = /obj/item/storage/backpack/ert/medical
+ satchel = /obj/item/storage/backpack/ert/medical
+ courierbag = /obj/item/storage/backpack/ert/medical
+ duffelbag = /obj/item/storage/backpack/ert/medical
+
+/datum/outfit/job/clip/minutemen/bard/emergency/flamer
+ name = "ERT - C-MM BARD Flamethrower Specialist"
+ id_assignment = "Biohazard Assessment Fire Control Specialist"
suit = /obj/item/clothing/suit/armor/vest/marine/medium
suit_store = /obj/item/flamethrower/full/tank
@@ -46,55 +87,96 @@
backpack_contents = list(
/obj/item/flashlight/seclite = 1,
/obj/item/extinguisher = 1,
- /obj/item/gun/ballistic/automatic/pistol/commander = 1 // replace commander with the cm23 when it is implemented
+ /obj/item/gun/ballistic/automatic/pistol/cm23 = 1
)
-
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader
- name = "ERT - CLIP Minuteman BARD Specialist Sergeant"
- id_assignment = "Biohazard Assessment Sergeant"
- job_icon = "clip_cmm3"
+/datum/outfit/job/clip/minutemen/bard/emergency/leader
+ name = "ERT - C-MM BARD Master Sergeant"
+ id_assignment = "Master Sergeant"
+ job_icon = "clip_cmm4"
belt = /obj/item/storage/belt/military/clip/e50
- uniform = /obj/item/clothing/under/clip/officer
suit = /obj/item/clothing/suit/armor/vest/marine
- suit_store = /obj/item/gun/energy/laser/e50
+ suit_store = /obj/item/gun/energy/laser/e50/clip
r_pocket = /obj/item/grenade/c4
l_pocket = /obj/item/reagent_containers/hypospray/medipen/stimpack
backpack_contents = list(
/obj/item/storage/box/flares = 1,
/obj/item/grenade/c4 = 2,
+ /obj/item/grenade/smokebomb = 2,
/obj/item/flashlight/seclite = 1
)
-/datum/outfit/job/clip/minutemen/grunt/dressed/riot
- name = "ERT - CLIP Minuteman Riot Officer"
- job_icon = "securityofficerOld"
+/datum/outfit/job/clip/minutemen/military_police
+ name = "ERT - C-MM Military Police"
+ id_assignment = "Military Police"
+ job_icon = "clip_cmm3"
+
+ ears = /obj/item/radio/headset/clip/alt
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
+ head = /obj/item/clothing/head/clip/slouch
+ glasses = /obj/item/clothing/glasses/sunglasses
+ belt = /obj/item/storage/belt/security/full
+ shoes = /obj/item/clothing/shoes/jackboots
+ gloves = /obj/item/clothing/gloves/color/white
+
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/melee/knife/combat
+
+/datum/outfit/job/clip/minutemen/military_police/riot
+ name = "ERT - C-MM Military Police (Riot Control)"
suit = /obj/item/clothing/suit/armor/riot/clip
+ mask = /obj/item/clothing/mask/balaclava/combat
+ glasses = /obj/item/clothing/glasses/sunglasses/big
+ gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/helmet/riot/clip
l_hand = /obj/item/melee/baton/loaded
- back = /obj/item/shield/riot
- belt = /obj/item/gun/ballistic/automatic/smg/cm5/no_mag
- r_pocket = /obj/item/ammo_box/magazine/smgm9mm/rubber
- l_pocket = /obj/item/ammo_box/magazine/smgm9mm/rubber
+ belt = /obj/item/gun/ballistic/automatic/smg/cm5/rubber
+
+ r_pocket = /obj/item/ammo_box/magazine/cm5_9mm/rubber
+ l_pocket = /obj/item/reagent_containers/spray/pepper
backpack_contents = null
box = null
- backpack = null
- duffelbag = null
- courierbag = null
- satchel = null
+ backpack = /obj/item/shield/riot
+ duffelbag = /obj/item/shield/riot
+ courierbag = /obj/item/shield/riot
+ satchel = /obj/item/shield/riot
-/datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader
- name = "ERT - CLIP Minutemen Riot Officer Sergeant"
- id_assignment = "Security Sergeant"
- job_icon = "lieutenant"
+/datum/outfit/job/clip/minutemen/military_police/leader
+ name = "ERT - C-MM Chief Military Police"
+ id_assignment = "Chief Military Police"
+ job_icon = "clip_cmm4"
+ head = /obj/item/clothing/head/clip/slouch/officer
+ uniform = /obj/item/clothing/under/clip/officer
ears = /obj/item/radio/headset/clip/alt/captain
- back = /obj/item/shield/riot/flash
+
+/datum/outfit/job/clip/minutemen/military_police/leader/riot
+ name = "ERT - C-MM Chief Military Police (Riot Control)"
+
+ suit = /obj/item/clothing/suit/armor/riot/clip
+ mask = /obj/item/clothing/mask/balaclava/combat
+ glasses = /obj/item/clothing/glasses/sunglasses/big
+ gloves = /obj/item/clothing/gloves/tackler/combat
+ head = /obj/item/clothing/head/helmet/riot/clip
+ suit_store = /obj/item/melee/baton/loaded
+ l_hand = /obj/item/megaphone/command
+ belt = /obj/item/gun/ballistic/automatic/smg/cm5/rubber
+
+ r_pocket = /obj/item/assembly/flash/handheld
+ l_pocket = /obj/item/ammo_box/magazine/cm5_9mm/rubber
+
+ backpack_contents = null
+ box = null
+
+ backpack = /obj/item/shield/riot/flash
+ duffelbag = /obj/item/shield/riot/flash
+ courierbag = /obj/item/shield/riot/flash
+ satchel = /obj/item/shield/riot/flash
/datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
name = "CLIP Minutemen - Minuteman (Spotter Hardsuit)"
diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
index 4cec7ad56f8..49a01ae5693 100644
--- a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
+++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
@@ -1,464 +1,72 @@
-// this is where the base ERT outfit goes
-/datum/outfit/centcom/ert
- name = "ERT Common"
-
- mask = /obj/item/clothing/mask/gas/sechailer
- uniform = /obj/item/clothing/under/rank/centcom/official
- shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/combat
- ears = /obj/item/radio/headset/headset_cent/alt
-
-/datum/outfit/centcom/ert/post_equip(mob/living/carbon/human/human, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/id = human.wear_id
- if(id)
- id.registered_name = human.real_name
- id.update_label()
- ..()
-
-/datum/outfit/centcom/ert/commander
- name = "ERT Commander"
-
- id = /obj/item/card/id/ert
- suit = /obj/item/clothing/suit/space/hardsuit/ert
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- back = /obj/item/storage/backpack/ert
- belt = /obj/item/storage/belt/security/full
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1)
- l_pocket = /obj/item/kitchen/knife/switchblade
-
-/datum/outfit/centcom/ert/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/heads/captain
- R.recalculateChannels()
-
-/datum/outfit/centcom/ert/commander/alert
- name = "ERT Commander - High Alert"
-
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- glasses = /obj/item/clothing/glasses/thermal/eyepatch
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/pulse/pistol=1)
- l_pocket = /obj/item/melee/transforming/energy/sword/saber
-
-/datum/outfit/centcom/ert/security
- name = "ERT Security"
-
- id = /obj/item/card/id/ert/security
- suit = /obj/item/clothing/suit/space/hardsuit/ert/sec
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- back = /obj/item/storage/backpack/ert/security
- belt = /obj/item/storage/belt/security/full
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/handcuffs=1,
- /obj/item/melee/baton/loaded=1)
-
-/datum/outfit/centcom/ert/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
-
-/datum/outfit/centcom/ert/security/alert
- name = "ERT Security - High Alert"
-
- suit_store = /obj/item/gun/energy/pulse/carbine
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/handcuffs=1,\
- /obj/item/melee/baton/loaded=1)
-
-/datum/outfit/centcom/ert/medic
- name = "ERT Medic"
-
- id = /obj/item/card/id/ert/medical
- suit = /obj/item/clothing/suit/space/hardsuit/ert/med
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/hud/health
- back = /obj/item/storage/backpack/ert/medical
- belt = /obj/item/storage/belt/medical
- r_hand = /obj/item/storage/firstaid/regular
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/reagent_containers/hypospray/combat=1,\
- /obj/item/gun/medbeam=1)
-
-/datum/outfit/centcom/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
-
-/datum/outfit/centcom/ert/medic/alert
- name = "ERT Medic - High Alert"
-
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/pulse/pistol=1,\
- /obj/item/reagent_containers/hypospray/combat/nanites=1,\
- /obj/item/gun/medbeam=1)
-
-/datum/outfit/centcom/ert/engineer
- name = "ERT Engineer"
-
- id = /obj/item/card/id/ert/engineer
- suit = /obj/item/clothing/suit/space/hardsuit/ert/engi
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/meson/engine
- back = /obj/item/storage/backpack/ert/engineer
- belt = /obj/item/storage/belt/utility/full
- l_pocket = /obj/item/rcd_ammo/large
- r_hand = /obj/item/storage/firstaid/regular
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/construction/rcd/loaded=1)
-
-
-/datum/outfit/centcom/ert/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
+/datum/outfit/job/nanotrasen/ert
+ name = "ERT - Nanotrasen Vigilitas Security Officer"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
- if(visualsOnly)
- return
+ wallet = null
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/nanotrasen/security
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/nanotrasen/cap/security
+ suit = /obj/item/clothing/suit/armor/nanotrasen
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/commander
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ shoes = /obj/item/clothing/shoes/jackboots
-/datum/outfit/centcom/ert/engineer/alert
- name = "ERT Engineer - High Alert"
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/pulse/pistol=1,\
- /obj/item/construction/rcd/combat=1)
+ backpack_contents = list(/obj/item/ammo_box/magazine/co9mm = 3)
-// official
+ implants = list(/obj/item/implant/weapons_auth)
-/datum/outfit/centcom/centcom_official
- name = "CentCom Official"
+/datum/outfit/job/nanotrasen/ert/inspector
+ name = "ERT - Nanotrasen CentCom Inspector"
+ id_assignment = "Inspector"
+ job_icon = "centcom"
+ head = null
uniform = /obj/item/clothing/under/rank/centcom/official
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
+ suit = null
+ suit_store = null
ears = /obj/item/radio/headset/headset_cent
glasses = /obj/item/clothing/glasses/sunglasses
- belt = /obj/item/gun/energy/e_gun
- l_pocket = /obj/item/pen
- back = /obj/item/storage/backpack/satchel
- r_pocket = /obj/item/pda/heads
- l_hand = /obj/item/clipboard
+ belt = /obj/item/clipboard
id = /obj/item/card/id/centcom
- backpack_contents = list(/obj/item/stamp/centcom=1)
-
-/datum/outfit/centcom/centcom_official/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
- var/obj/item/pda/heads/pda = H.r_store
- pda.owner = H.real_name
- pda.ownjob = "CentCom Official"
- pda.update_label()
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_centcom_access("CentCom Official")
- W.access += ACCESS_WEAPONS
- W.assignment = "CentCom Official"
- W.registered_name = H.real_name
- W.update_label()
- ..()
-
-/datum/outfit/centcom/ert/janitor
- name = "ERT Janitor"
-
- id = /obj/item/card/id/ert/janitor
- suit = /obj/item/clothing/suit/space/hardsuit/ert/jani
- glasses = /obj/item/clothing/glasses/night
- back = /obj/item/storage/backpack/ert/janitor
- belt = /obj/item/storage/belt/janitor/full
- r_pocket = /obj/item/grenade/chem_grenade/cleaner
- l_pocket = /obj/item/grenade/chem_grenade/cleaner
- l_hand = /obj/item/storage/bag/trash/bluespace
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/lights/mixed=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/mop/advanced=1,\
- /obj/item/reagent_containers/glass/bucket=1,\
- /obj/item/grenade/clusterbuster/cleaner=1)
-
-/datum/outfit/centcom/ert/janitor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
+ l_pocket = /obj/item/pen
+ r_pocket = /obj/item/pda/heads
-/datum/outfit/centcom/ert/janitor/heavy
- name = "ERT Janitor - Heavy Duty"
+ backpack_contents = list(/obj/item/stamp/nanotrasen/central, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- r_hand = /obj/item/reagent_containers/spray/chemsprayer/janitor
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/lights/mixed=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/grenade/clusterbuster/cleaner=3)
+// /datum/outfit/job/nanotrasen/ert/emergency
+// name = "ERT - Vigilitas Emergency Response Officer"
-/datum/outfit/centcom/centcom_intern
- name = "CentCom Intern"
+/datum/outfit/job/nanotrasen/ert/leader
+ name = "ERT - Nanotrasen Vigilitas Security Corporal"
+ jobtype = /datum/job/hos
+ job_icon = "lieutenant"
- uniform = /obj/item/clothing/under/rank/centcom/intern
- shoes = /obj/item/clothing/shoes/sneakers/black
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/nanotrasen/security
gloves = /obj/item/clothing/gloves/color/black
- ears = /obj/item/radio/headset/headset_cent
- glasses = /obj/item/clothing/glasses/sunglasses
- belt = /obj/item/melee/classic_baton
- r_hand = /obj/item/gun/ballistic/rifle/illestren
- back = /obj/item/storage/backpack/satchel
- l_pocket = /obj/item/ammo_box/magazine/illestren_a850r
- r_pocket = /obj/item/ammo_box/magazine/illestren_a850r
- id = /obj/item/card/id/centcom
- backpack_contents = list(/obj/item/storage/box/survival = 1)
-/datum/outfit/centcom/centcom_intern/unarmed
- name = "CentCom Intern (Unarmed)"
- belt = null
- l_hand = null
- l_pocket = null
- r_pocket = null
-
-/datum/outfit/centcom/centcom_intern/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_centcom_access(name)
- W.access += ACCESS_WEAPONS
- W.assignment = name
- W.registered_name = H.real_name
- W.update_label()
-
-/datum/outfit/centcom/centcom_intern/leader
- name = "CentCom Head Intern"
- belt = /obj/item/melee/baton/loaded
- suit = /obj/item/clothing/suit/armor/vest
- suit_store = /obj/item/gun/ballistic/rifle/illestren
- r_hand = /obj/item/megaphone
- head = /obj/item/clothing/head/intern
-
-/datum/outfit/centcom/centcom_intern/leader/unarmed // i'll be nice and let the leader keep their baton and vest
- name = "CentCom Head Intern (Unarmed)"
- suit_store = null
- l_pocket = null
- r_pocket = null
-
-// Marine
-
-/datum/outfit/centcom/ert/marine
- name = "Marine Commander"
-
- id = /obj/item/card/id/ert
- suit = /obj/item/clothing/suit/armor/vest/marine
- back = /obj/item/storage/backpack/ert
- backpack_contents = list(
- /obj/item/storage/box/survival/engineer = 1,
- /obj/item/gun_voucher/nanotrasen = 1
-)
- belt = /obj/item/storage/belt/military/assault
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
- l_pocket = /obj/item/kitchen/knife/combat
- r_pocket = /obj/item/tank/internals/emergency_oxygen/double
- uniform = /obj/item/clothing/under/rank/security/officer/military
- accessory = /obj/item/clothing/accessory/holster/marine
- mask = /obj/item/clothing/mask/gas/sechailer
- head = /obj/item/clothing/head/helmet/marine
-
-/datum/outfit/centcom/ert/marine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/heads/captain
- headset.recalculateChannels()
-
-/datum/outfit/centcom/ert/marine/security
- name = "Marine Heavy"
-
- id = /obj/item/card/id/ert/security
- suit = /obj/item/clothing/suit/armor/vest/marine/heavy
- back = /obj/item/storage/backpack/ert/security
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- head = /obj/item/clothing/head/helmet/marine/security
-
-/datum/outfit/centcom/ert/marine/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/headset_com
- headset.recalculateChannels()
-
-/datum/outfit/centcom/ert/marine/medic
- name = "Marine Medic"
-
- id = /obj/item/card/id/ert/medical
- suit = /obj/item/clothing/suit/armor/vest/marine
- accessory = /obj/item/clothing/accessory/holster/marine
- back = /obj/item/storage/backpack/ert/medical
- l_pocket = /obj/item/healthanalyzer
- head = /obj/item/clothing/head/helmet/marine/medic
- backpack_contents = list(
- /obj/item/storage/box/survival/engineer = 1,
- /obj/item/gun_voucher/nanotrasen = 1,
- /obj/item/reagent_containers/hypospray/combat = 1,
- /obj/item/storage/firstaid/regular = 1,
- /obj/item/storage/firstaid/advanced = 1
-)
- belt = /obj/item/storage/belt/medical/paramedic
- glasses = /obj/item/clothing/glasses/hud/health/sunglasses
-
-/datum/outfit/centcom/ert/marine/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/headset_com
- headset.recalculateChannels()
-
-/datum/outfit/centcom/ert/marine/engineer
- name = "Marine Engineer"
-
- id = /obj/item/card/id/ert/engineer
- suit = /obj/item/clothing/suit/armor/vest/marine/medium
- head = /obj/item/clothing/head/helmet/marine/engineer
- back = /obj/item/storage/backpack/ert/engineer
- backpack_contents = list(
- /obj/item/storage/box/survival/engineer = 1,
- /obj/item/gun_voucher/nanotrasen = 1,
- /obj/item/rcd_ammo/large = 2,
- )
- r_hand = /obj/item/deployable_turret_folded
- uniform = /obj/item/clothing/under/rank/security/officer/military/eng
- belt = /obj/item/storage/belt/utility/full/ert
- glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
-
-/datum/outfit/centcom/ert/marine/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/headset_com
- headset.recalculateChannels()
-
-// Loss Prevention
-/datum/outfit/job/nanotrasen/security/ert/lp
- name = "ERT - Loss Prevention Security Specialist"
- jobtype = /datum/job/officer
- job_icon = "securityresponseofficer"
-
- head = null
- implants = list(/obj/item/implant/mindshield)
- ears = /obj/item/radio/headset/nanotrasen/alt
- id = /obj/item/card/id/lpsec
- suit_store = /obj/item/gun/energy/laser/scatter/shotty
- belt = /obj/item/storage/belt/security/full
- glasses = /obj/item/clothing/glasses/sunglasses
- gloves = /obj/item/clothing/gloves/tackler/combat
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/sec
- uniform = /obj/item/clothing/under/rank/security/head_of_security/nt/lp
- shoes = /obj/item/clothing/shoes/jackboots
- back = /obj/item/storage/backpack/ert/security
-
- box = /obj/item/storage/box/survival/security
+ head = /obj/item/clothing/head/nanotrasen/beret/security
+ suit = /obj/item/clothing/suit/armor/nanotrasen/slim
l_pocket = /obj/item/restraints/handcuffs
- r_pocket = /obj/item/kitchen/knife/combat
-
- backpack_contents = list(/obj/item/radio=1, /obj/item/stock_parts/cell/gun/upgraded=2, /obj/item/screwdriver=1)
-
-
-/datum/outfit/job/nanotrasen/security/ert/lp/medic
- name = "ERT - Loss Prevention Medical Specialist"
- jobtype = /datum/job/doctor
- job_icon = "medicalresponseofficer"
+ r_pocket = /obj/item/assembly/flash/handheld
+ backpack_contents = null
- head = null
- uniform = /obj/item/clothing/under/rank/medical/paramedic/lp
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/med
- id = /obj/item/card/id/lpmed
- gloves = /obj/item/clothing/gloves/color/latex/nitrile
- back = /obj/item/storage/backpack/ert/medical
- belt = /obj/item/storage/belt/medical/surgery
-
- box = /obj/item/storage/box/survival/medical
- l_pocket = /obj/item/healthanalyzer
- r_pocket = /obj/item/reagent_containers/hypospray/medipen/atropine
-
- backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/radio=1)
-
-
-/datum/outfit/job/nanotrasen/security/ert/lp/engineer
- name = "ERT - Loss Prevention Engineering Specialist"
- jobtype = /datum/job/engineer
- job_icon = "engineeringresponseofficer"
-
- head = null
- uniform = /obj/item/clothing/under/rank/engineering/engineer/nt/lp
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/engi
- id = /obj/item/card/id/lpengie
- belt = /obj/item/storage/belt/utility/full
- gloves = /obj/item/clothing/gloves/combat
- glasses = /obj/item/clothing/glasses/welding
- back = /obj/item/storage/backpack/ert/engineer
-
- box = /obj/item/storage/box/survival/engineer
- l_pocket = /obj/item/extinguisher/mini
- r_pocket = /obj/item/wrench/combat
-
- backpack_contents = list(/obj/item/stack/sheet/metal/fifty=1, /obj/item/stack/sheet/glass/fifty=1, /obj/item/radio=1)
+// /datum/outfit/job/nanotrasen/ert/leader/emergency
+// name = "ERT - Vigilitas Emergency Response Lieutenant"
-/datum/outfit/job/nanotrasen/security/ert/lp/lieutenant
- name = "ERT - Loss Prevention Lieutenant"
- jobtype = /datum/job/captain
- job_icon = "emergencyresponseteamcommander"
-
- head = null
- ears = /obj/item/radio/headset/nanotrasen/alt/captain
- id = /obj/item/card/id/lplieu
- belt = /obj/item/storage/belt/military/army
- gloves = /obj/item/clothing/gloves/color/black
- uniform = /obj/item/clothing/under/rank/security/warden/lp
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp
- shoes = /obj/item/clothing/shoes/combat
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- back = /obj/item/storage/backpack/ert
+// /datum/outfit/job/nanotrasen/ert/emergency/medic
+// name = "ERT - Vigilitas Emergency Response Medic"
- l_pocket = /obj/item/megaphone/command
- r_pocket = /obj/item/binoculars
+// /datum/outfit/job/nanotrasen/ert/emergency/engineer
+// name = "ERT - Vigilitas Emergency Response Engineer"
diff --git a/code/modules/clothing/outfits/ert/roumain_ert.dm b/code/modules/clothing/outfits/ert/roumain_ert.dm
new file mode 100644
index 00000000000..efe7828173b
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/roumain_ert.dm
@@ -0,0 +1,131 @@
+/datum/outfit/job/roumain/ert
+ name = "ERT - Saint-Roumain Hunter" // flaming arrow and shadow
+ id_assignment = "Hunter"
+ jobtype = /datum/job/officer
+ job_icon = "srm_hunter"
+
+ wallet = null
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/armor/roumain
+ head = /obj/item/clothing/head/cowboy/sec/roumain
+ belt = /obj/item/gun/ballistic/revolver/shadow
+ suit_store = /obj/item/gun/ballistic/shotgun/flamingarrow/factory
+
+ l_pocket = /obj/item/ammo_box/a44roum_speedloader
+ r_pocket = /obj/item/flashlight/lantern
+
+ duffelbag = /obj/item/storage/backpack/satchel/leather
+ courierbag = /obj/item/storage/backpack/satchel/leather
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ box = null
+
+ backpack_contents = list(/obj/item/ammo_box/a44roum_speedloader = 2, /obj/item/storage/box/ammo/c38)
+
+/datum/outfit/job/roumain/ert/firestorm
+ name = "ERT - Saint-Roumain Hunter (Firestorm)" // firestorm and shadow
+
+ belt = /obj/item/gun/ballistic/revolver/shadow
+ suit_store = /obj/item/gun/ballistic/automatic/smg/firestorm/pan
+
+ l_pocket = /obj/item/ammo_box/a44roum_speedloader
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/c45_firestorm_mag/pan = 3, /obj/item/ammo_box/a44roum_speedloader = 2, /obj/item/storage/box/ammo/a44roum)
+
+/datum/outfit/job/roumain/ert/vickland
+ name = "ERT - Saint-Roumain Hunter (Vickland)" // vickland and candor
+
+ belt = /obj/item/gun/ballistic/automatic/pistol/candor/factory
+ suit_store = /obj/item/gun/ballistic/automatic/marksman/vickland
+
+ l_pocket = /obj/item/ammo_box/magazine/m45
+
+ backpack_contents = list(/obj/item/ammo_box/vickland_a308 = 6, /obj/item/storage/box/ammo/a308, /obj/item/ammo_box/magazine/m45 = 2)
+
+/datum/outfit/job/roumain/ert/scout
+ name = "ERT - Saint-Roumain Hunter (Scout)" // scout and detective special
+
+ belt = /obj/item/gun/ballistic/revolver/detective
+ suit_store = /obj/item/gun/ballistic/rifle/scout
+
+ backpack_contents = list(/obj/item/ammo_box/a300 = 5)
+
+/datum/outfit/job/roumain/ert/medic
+ name = "ERT - Saint-Roumain Hunter Doctor"
+ id_assignment = "Hunter Doctor"
+ job_icon = "srm_doctor"
+ jobtype = /datum/job/doctor
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/toggle/labcoat/roumain_med
+ suit_store = null
+ head = /obj/item/clothing/head/cowboy/sec/roumain/med
+ mask = /obj/item/clothing/mask/gas/plaguedoctor
+ gloves = null
+
+/datum/outfit/job/roumain/ert/engineer
+ name = "ERT - Saint-Roumain Machinist"
+ id_assignment = "Machinist"
+ job_icon = "srm_machinist"
+ jobtype = /datum/job/engineer
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ alt_uniform = null
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ belt = /obj/item/storage/belt/utility/full/engi
+ suit = /obj/item/clothing/suit/hazardvest/roumain
+ suit_store = null
+ head = /obj/item/clothing/head/cowboy/sec/roumain/machinist
+ glasses = /obj/item/clothing/glasses/welding
+ accessory = /obj/item/clothing/accessory/waistcoat/roumain
+ gloves = /obj/item/clothing/gloves/color/yellow
+
+
+/datum/outfit/job/roumain/ert/leader
+ name = "ERT - Saint-Roumain Hunter Montagne" // flaming bolt and montagne
+ id_assignment = "Hunter Montagne"
+ job_icon = "srm_montagne"
+ jobtype = /datum/job/captain
+
+ ears = /obj/item/radio/headset/headset_com/alt
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/cowboy
+ suit = /obj/item/clothing/suit/armor/roumain/montagne
+ suit_store = /obj/item/gun/ballistic/shotgun/flamingarrow/bolt
+ belt = /obj/item/gun/ballistic/revolver/montagne
+ head = /obj/item/clothing/head/cowboy/sec/roumain/montagne
+ id = /obj/item/card/id/gold
+
+ duffelbag = /obj/item/storage/backpack/cultpack
+ courierbag = /obj/item/storage/backpack/cultpack
+ backpack = /obj/item/storage/backpack/cultpack
+ satchel = /obj/item/storage/backpack/cultpack
+
+/datum/outfit/job/roumain/ert/leader/twobore
+ name = "ERT - Saint-Roumain Hunter Montagne (Huntsman)" // huntsman (twobore) and montagne
+
+ suit_store = /obj/item/gun/ballistic/shotgun/doublebarrel/twobore
+
+ l_pocket = /obj/item/ammo_box/a357
+
+ backpack_contents = list(/obj/item/ammo_casing/shotgun/buckshot/twobore = 8)
+
+/datum/outfit/job/roumain/ert/leader/colligne
+ name = "ERT - Saint-Roumain Hunter Colligne" // double barrel and ashhand
+ id_assignment = "Hunter Colligne"
+ job_icon = "srm_colligne"
+ jobtype = /datum/job/head_of_personnel
+
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/armor/roumain/colligne
+ suit_store = /obj/item/gun/ballistic/shotgun/doublebarrel/roumain
+ head = /obj/item/clothing/head/cowboy/sec/roumain/colligne
+ belt = /obj/item/gun/ballistic/revolver/ashhand
+ id = /obj/item/card/id/silver
+
+ backpack_contents = list(/obj/item/storage/box/ammo/a12g_buckshot, /obj/item/storage/box/ammo/a4570)
diff --git a/code/modules/clothing/outfits/ert/solgov_ert.dm b/code/modules/clothing/outfits/ert/solgov_ert.dm
index da3a1146648..5fbc808397b 100644
--- a/code/modules/clothing/outfits/ert/solgov_ert.dm
+++ b/code/modules/clothing/outfits/ert/solgov_ert.dm
@@ -4,27 +4,29 @@
jobtype = /datum/job/officer
job_icon = "sonnensoldner"
+ wallet = null
+
id = /obj/item/card/id/solgov
uniform = /obj/item/clothing/under/solgov
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov
+ suit = /obj/item/clothing/suit/armor/vest/solgov
mask = null
ears = /obj/item/radio/headset/solgov/alt
gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/solgov/sonnensoldner
- shoes = /obj/item/clothing/shoes/workboots
- back = /obj/item/storage/backpack
+ shoes = /obj/item/clothing/shoes/combat
box = /obj/item/storage/box/survival
l_hand = /obj/item/energyhalberd
/datum/outfit/job/solgov/ert/inspector
- name = "ERT - Inspector (SolGov)"
+ name = "ERT - SolGov Inspector"
id_assignment = "Inspector"
jobtype = /datum/job/head_of_personnel
job_icon = "solgovrepresentative"
uniform = /obj/item/clothing/under/solgov/formal
+ neck = /obj/item/clothing/neck/cloak/solgov
belt = /obj/item/clipboard
ears = /obj/item/radio/headset/solgov/captain
back = /obj/item/storage/backpack/satchel/leather
@@ -35,7 +37,9 @@
suit_store = null
mask = null
glasses = null
-
l_hand = null
- backpack_contents = list(/obj/item/stamp/solgov=1)
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/folder/solgov, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm
index 29da95448ee..8dd260c51af 100644
--- a/code/modules/clothing/outfits/ert/syndicate_ert.dm
+++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm
@@ -1,114 +1,186 @@
+// unaligned. they're basically stand-ins
+
/datum/outfit/job/syndicate/ert
name = "ERT - Syndicate Basic"
jobtype = /datum/job/officer
job_icon = "securityofficer"
+ wallet = null
+
+ uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/armor/vest/syndie
- suit_store = /obj/item/gun/ballistic/automatic/smg/c20r
+ suit_store = /obj/item/gun/ballistic/automatic/assault/hydra
shoes = /obj/item/clothing/shoes/combat
- ears = /obj/item/radio/headset/syndicate/alt
+ ears = /obj/item/radio/headset/headset_sec/alt
gloves = /obj/item/clothing/gloves/color/black
id = /obj/item/card/id/syndicate_command/crew_id
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
- head = /obj/item/clothing/head/helmet/operator
- back = /obj/item/storage/backpack/security
- belt = /obj/item/storage/belt/military/c20r
+ mask = /obj/item/clothing/mask/balaclava
+ head = /obj/item/clothing/head/helmet/syndie
+ belt = /obj/item/storage/belt/military/hydra
+ glasses = /obj/item/clothing/glasses/hud/security
- r_pocket = /obj/item/kitchen/knife/combat
+ r_pocket = /obj/item/melee/knife/combat
l_pocket = /obj/item/grenade/frag
implants = list(/obj/item/implant/weapons_auth)
- backpack_contents = list(/obj/item/radio=1)
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/ringneck=1, /obj/item/ammo_box/magazine/m10mm_ringneck=2)
/datum/outfit/job/syndicate/ert/leader
name = "ERT - Syndicate Basic Leader"
job_icon = "lieutenant"
head = /obj/item/clothing/head/HoS/beret/syndicate
+ mask = /obj/item/clothing/mask/balaclava/combat
+ ears = /obj/item/radio/headset/syndicate/alt/leader
+
+// inspector
+
+/datum/outfit/job/syndicate/ert/inspector
+ name = "ERT - ACLF Inspector"
+ id_assignment = "Inspector"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "syndicate"
+
+ uniform = /obj/item/clothing/under/syndicate
+ head = /obj/item/clothing/head/HoS/beret/syndicate
+ mask = null
+ belt = /obj/item/clipboard
+ back = /obj/item/storage/backpack/satchel/leather
ears = /obj/item/radio/headset/syndicate/captain
+ shoes = /obj/item/clothing/shoes/laceup
+ gloves = /obj/item/clothing/gloves/color/white
+ suit = /obj/item/clothing/suit/armor/hos
+ suit_store = null
- backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/syndicate=1, /obj/item/ammo_box/magazine/m10mm=2, /obj/item/radio=1)
+ backpack = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/satchel/sec
+ satchel = /obj/item/storage/backpack/satchel/sec
+ courierbag = /obj/item/storage/backpack/satchel/sec
-// gorlex loyalist/2nd battlegroup
+ l_pocket = /obj/item/pen/fourcolor
+ r_pocket = /obj/item/taperecorder
-/datum/outfit/job/syndicate/ert/gorlex
- name = "ERT - New Gorlex Republic Trooper"
+ backpack_contents = list(/obj/item/stamp/syndicate, /obj/item/paper_bin, /obj/item/folder/syndicate, /obj/item/tape)
- head = /obj/item/clothing/head/helmet/swat
- uniform = /obj/item/clothing/under/syndicate/combat
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- belt = /obj/item/storage/belt/military/assault/m90
- back = /obj/item/storage/backpack/security
- suit_store = /obj/item/gun/ballistic/automatic/smg/m90
+// new gorlex republic
-/datum/outfit/job/syndicate/ert/gorlex/pointman
- name = "ERT - New Gorlex Republic Pointman"
+/datum/outfit/job/syndicate/ert/ngr
+ name = "ERT - New Gorlex Republic Serviceman"
+ id_assignment = "Serviceman"
- suit_store = /obj/item/gun/ballistic/shotgun/bulldog
- belt = /obj/item/storage/belt/security/webbing/bulldog
+ head = /obj/item/clothing/head/helmet/ngr
+ mask = /obj/item/clothing/mask/balaclava/ngr
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/syndicate/ngr
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/ngr
+ suit = /obj/item/clothing/suit/armor/ngr
+ belt = /obj/item/storage/belt/security/webbing/ngr/cobra
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
-/datum/outfit/job/syndicate/ert/gorlex/medic
- name = "ERT - New Gorlex Republic Medic"
+/datum/outfit/job/syndicate/ert/ngr/grenadier
+ name = "ERT - New Gorlex Republic Grenadier"
+
+ belt = /obj/item/storage/belt/security/webbing/ngr/hydra_grenadier
+ suit_store = /obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl
+
+ backpack_contents = list(/obj/item/grenade/c4 = 3)
+
+/datum/outfit/job/syndicate/ert/ngr/medic
+ name = "ERT - New Gorlex Republic Field Medic"
jobtype = /datum/job/paramedic
job_icon = "paramedic"
+ id_assignment = "Field Medic"
- head = /obj/item/clothing/head/soft/black
- mask = null
- suit = /obj/item/clothing/suit/armor/vest/alt
+ head = /obj/item/clothing/head/ngr/surgical
+ mask = /obj/item/clothing/mask/breath/ngr
belt = /obj/item/storage/belt/medical/webbing/paramedic
- glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+ glasses = /obj/item/clothing/glasses/hud/health
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
- suit_store = /obj/item/gun/ballistic/automatic/pistol/syndicate
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/asp
l_pocket = /obj/item/radio
- backpack_contents = list(/obj/item/ammo_box/magazine/m10mm=2, /obj/item/storage/firstaid/medical=1, /obj/item/defibrillator/compact/combat/loaded=1)
+ backpack_contents = list(/obj/item/ammo_box/magazine/m57_39_asp = 2, /obj/item/storage/firstaid/medical=1, /obj/item/defibrillator/compact/combat/loaded=1)
-/datum/outfit/job/syndicate/ert/gorlex/sniper
- name = "ERT - New Gorlex Republic Sniper"
+/datum/outfit/job/syndicate/ert/ngr/sniper
+ name = "ERT - New Gorlex Republic Marksman"
head = /obj/item/clothing/head/beret/black
- back = /obj/item/storage/backpack/messenger/sec
- glasses = /obj/item/clothing/glasses/night
+ neck = /obj/item/clothing/neck/shemagh/ngr
gloves = /obj/item/clothing/gloves/fingerless
- suit = /obj/item/clothing/suit/armor/vest
- belt = /obj/item/storage/belt/security
- suit_store = /obj/item/gun/ballistic/automatic/marksman/sniper_rifle
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ belt = /obj/item/storage/belt/military/assault/sniper
+ suit_store = /obj/item/gun/ballistic/automatic/marksman/taipan
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
l_pocket = /obj/item/binoculars
- backpack_contents = list(/obj/item/ammo_box/magazine/sniper_rounds=2, /obj/item/radio=1)
+ backpack = /obj/item/storage/backpack/messenger/sec
+ duffelbag = /obj/item/storage/backpack/messenger/sec
+ satchel = /obj/item/storage/backpack/messenger/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
-/datum/outfit/job/syndicate/ert/gorlex/leader
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/asp, /obj/item/ammo_box/magazine/m57_39_asp = 2)
+
+/datum/outfit/job/syndicate/ert/ngr/leader
name = "ERT - New Gorlex Republic Sergeant"
job_icon = "lieutenant"
- uniform = /obj/item/clothing/under/syndicate/gorlex
- head = /obj/item/clothing/head/HoS/beret/syndicate
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
+ neck = /obj/item/clothing/mask/whistle/trench // funny
+ head = /obj/item/clothing/head/ngr/peaked
back = /obj/item/storage/backpack/satchel/sec
- mask = /obj/item/clothing/mask/gas/sechailer
- glasses = /obj/item/clothing/glasses/hud/security/night
gloves = /obj/item/clothing/gloves/tackler/combat
+ belt = /obj/item/storage/belt/security/webbing/ngr/cobra
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
l_pocket = /obj/item/megaphone/sec
-// commandos
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/asp, /obj/item/ammo_box/magazine/m57_39_asp = 2, /obj/item/grenade/smokebomb)
+
+/datum/outfit/job/syndicate/ert/ngr/inspector
+ name = "ERT - New Gorlex Republic Official"
+ id_assignment = "Official"
+ job_icon = "syndicate"
+
+ head = /obj/item/clothing/head/ngr
+ ears = /obj/item/radio/headset/syndicate/captain
+ gloves = /obj/item/clothing/gloves/color/white
+ mask = null
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
+ glasses = null
+ suit = /obj/item/clothing/suit/armor/ngr/lieutenant
+ belt = /obj/item/clipboard
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit_store = null
+
+ backpack = /obj/item/storage/backpack/satchel/leather
+ duffelbag = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ courierbag = /obj/item/storage/backpack/satchel/leather
+
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/folder/red, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
+
+// cybersun
/datum/outfit/job/syndicate/ert/cybersun
name = "ERT - Syndicate Cybersun Commando"
job_icon = "syndicate"
head = null
- uniform = /obj/item/clothing/under/syndicate/combat
- belt = /obj/item/storage/belt/military/c20r
+ mask = /obj/item/clothing/mask/breath
+ uniform = /obj/item/clothing/under/syndicate/cybersun
+ belt = /obj/item/storage/belt/military/boomslang
suit = /obj/item/clothing/suit/space/hardsuit/syndi/cybersun
- suit_store = /obj/item/gun/ballistic/automatic/smg/c20r
+ suit_store = /obj/item/gun/ballistic/automatic/marksman/boomslang
ears = /obj/item/radio/headset/syndicate/alt
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/hardliners
implants = list(/obj/item/implant/adrenalin)
- backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm, /obj/item/radio=1)
+ backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm, /obj/item/grenade/smokebomb)
/datum/outfit/job/syndicate/ert/cybersun/leader
name = "ERT - Syndicate Cybersun Commando Leader"
@@ -116,15 +188,36 @@
ears = /obj/item/radio/headset/syndicate/alt/captain
glasses = /obj/item/clothing/glasses/hud/security/night
- backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm=1, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1, /obj/item/radio=1)
+ backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm=1, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1, /obj/item/grenade/smokebomb)
-// paramedics
+/datum/outfit/job/syndicate/ert/cybersun/inspector
+ name = "ERT - Syndicate Cybersun Representative"
+
+ uniform = /obj/item/clothing/under/syndicate/cybersun/officer
+ head = /obj/item/clothing/head/HoS/cybersun
+ shoes = /obj/item/clothing/shoes/laceup
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ suit = null
+ suit_store = null
+ belt = /obj/item/clipboard
+ glasses = null
+ mask = null
+ ears = /obj/item/radio/headset/syndicate
+
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/stamp/cybersun, /obj/item/folder/red, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
+
+// cybersun paramedics
/datum/outfit/job/syndicate/ert/cybersun/medic
name = "ERT - Syndicate Cybersun Paramedic"
job_icon = "paramedic"
+ jobtype = /datum/job/paramedic
uniform = /obj/item/clothing/under/syndicate/medic
+ accessory = /obj/item/clothing/accessory/holster/marine
suit = /obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed
suit_store = /obj/item/tank/internals/oxygen
mask = /obj/item/clothing/mask/breath/medical
@@ -133,15 +226,11 @@
head = /obj/item/clothing/head/soft/cybersun/medical
belt = /obj/item/storage/belt/medical/webbing/paramedic
back = /obj/item/storage/backpack/ert/medical
- l_pocket = /obj/item/kitchen/knife/combat/survival
+ l_pocket = /obj/item/melee/knife/survival
r_pocket = /obj/item/pinpointer/crew
- accessory = /obj/item/clothing/accessory/holster/marine
backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/radio=1)
- jobtype = /datum/job/paramedic
- job_icon = "paramedic"
-
/datum/outfit/job/syndicate/ert/cybersun/medic/leader
name = "ERT - Syndicate Cybersun Lead Paramedic"
id_assignment = "Lead Paramedic"
@@ -154,25 +243,89 @@
backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/autosurgeon/cmo=1, /obj/item/radio=1, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1)
-// inspector
-/datum/outfit/job/syndicate/ert/inspector
- name = "ERT - Inspector (Syndicate)"
- id_assignment = "Inspector"
- jobtype = /datum/job/head_of_personnel
- job_icon = "syndicate"
+// hardliners
- uniform = /obj/item/clothing/under/syndicate/ngr/officer
- head = /obj/item/clothing/head/HoS/beret/syndicate
- mask = null
- belt = /obj/item/clipboard
- back = /obj/item/storage/backpack/satchel/leather
- ears = /obj/item/radio/headset/syndicate/captain
- shoes = /obj/item/clothing/shoes/laceup
- gloves = /obj/item/clothing/gloves/color/white
- suit = /obj/item/clothing/suit/armor/hos
- l_pocket = null
- r_pocket = null
- suit_store = null
+/datum/outfit/job/syndicate/ert/hardliner
+ name = "ERT - Syndicate Hardliner Mercenary"
+
+ uniform = /obj/item/clothing/under/syndicate/hardliners
+ suit = /obj/item/clothing/suit/armor/hardliners
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/hardliners
+ suit_store = /obj/item/gun/ballistic/automatic/smg/sidewinder
+ belt = /obj/item/storage/belt/security/webbing/hardliners/sidewinder
+ gloves = /obj/item/clothing/gloves/color/black
+ mask = /obj/item/clothing/mask/balaclava/combat
+ head = /obj/item/clothing/head/helmet/hardliners
+
+/datum/outfit/job/syndicate/ert/hardliner/engineer
+ name = "ERT - Syndicate Hardliner Mechanic"
+
+ head = /obj/item/clothing/head/hardhat/hardliners
+ belt = /obj/item/storage/belt/utility/full
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m45_cobra = 2)
+
+/datum/outfit/job/syndicate/ert/hardliner/medic
+ name = "ERT - Syndicate Hardliner Medic"
+
+ head = /obj/item/clothing/head/hardliners
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+
+/datum/outfit/job/syndicate/ert/hardliner/leader
+ name = "ERT - Syndicate Hardliner Sergeant"
+
+ uniform = /obj/item/clothing/under/syndicate/hardliners/officer
+ suit = /obj/item/clothing/suit/armor/hardliners/sergeant
+ head = /obj/item/clothing/head/hardliners/peaked
+
+// ramzi clique
+
+/datum/outfit/job/syndicate/ert/ramzi
+ name = "ERT - Ramzi Clique Cell Rifleman"
+
+ head = null
+ mask = /obj/item/clothing/mask/gas/syndicate
+ uniform = /obj/item/clothing/under/syndicate
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+ belt = /obj/item/storage/belt/military/cobra
+ glasses = /obj/item/clothing/glasses/thermal
+ gloves = /obj/item/clothing/gloves/combat
+ id = null // no identification for you
+
+ l_pocket = /obj/item/tank/internals/emergency_oxygen/double
+
+ implants = list(/obj/item/implant/explosive)
+ backpack_contents = list(/obj/item/grenade/frag = 3, /obj/item/grenade/smokebomb = 3)
+
+/datum/outfit/job/syndicate/ert/ramzi/demolitionist
+ name = "ERT - Ramzi Clique Cell Demolitionist"
+
+ belt = /obj/item/storage/belt/military/mako
+ suit_store = /obj/item/gun/ballistic/rocketlauncher/mako
+ glasses = /obj/item/clothing/glasses/meson/night
+
+ r_pocket = /obj/item/gun/ballistic/automatic/pistol/himehabu
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m22lr_himehabu = 2, /obj/item/grenade/c4/x4 = 3, /obj/item/grenade/syndieminibomb = 3, /obj/item/ammo_casing/caseless/rocket/a70mm = 4)
+
+/datum/outfit/job/syndicate/ert/ramzi/medic
+ name = "ERT - Ramzi Clique Cell Medic"
+
+ belt = /obj/item/storage/belt/medical/webbing/combat
+ glasses = /obj/item/clothing/glasses/hud/health/night
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m45_cobra = 3, /obj/item/defibrillator/compact/combat/loaded, /obj/item/reagent_containers/hypospray/combat)
+
+/datum/outfit/job/syndicate/ert/ramzi/leader
+ name = "ERT - Ramzi Clique Cell Leader"
+
+ uniform = /obj/item/clothing/under/syndicate/gorlex
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated // funny
+
+ belt = /obj/item/storage/belt/security/webbing/bulldog_mixed
+ suit_store = /obj/item/gun/ballistic/shotgun/automatic/bulldog/drum
- backpack_contents = list(/obj/item/stamp/syndicate)
+ backpack_contents = list(/obj/item/grenade/smokebomb = 4, /obj/item/grenade/stingbang = 2, /obj/item/grenade/empgrenade = 2)
diff --git a/code/modules/clothing/outfits/event.dm b/code/modules/clothing/outfits/event.dm
deleted file mode 100644
index 18af4e8b663..00000000000
--- a/code/modules/clothing/outfits/event.dm
+++ /dev/null
@@ -1,26 +0,0 @@
-/datum/outfit/santa //ho ho ho!
- name = "Santa Claus"
-
- uniform = /obj/item/clothing/under/color/red
- shoes = /obj/item/clothing/shoes/sneakers/red
- suit = /obj/item/clothing/suit/space/santa
- head = /obj/item/clothing/head/santa
- back = /obj/item/storage/backpack/santabag
- r_pocket = /obj/item/flashlight
- gloves = /obj/item/clothing/gloves/color/red
-
- box = /obj/item/storage/box/survival/engineer
- backpack_contents = list(/obj/item/a_gift/anything = 5)
-
-/datum/outfit/santa/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
- H.fully_replace_character_name(H.real_name, "Santa Claus")
- H.mind.assigned_role = "Santa"
- H.mind.special_role = "Santa"
-
- H.hairstyle = "Long Hair 3"
- H.facial_hairstyle = "Beard (Full)"
- H.hair_color = "FFF"
- H.facial_hair_color = "FFF"
- H.update_hair()
diff --git a/code/modules/clothing/outfits/factions/frontiersmen.dm b/code/modules/clothing/outfits/factions/frontiersmen.dm
index 7045f518218..b9e350da7a3 100644
--- a/code/modules/clothing/outfits/factions/frontiersmen.dm
+++ b/code/modules/clothing/outfits/factions/frontiersmen.dm
@@ -92,7 +92,7 @@
uniform = /obj/item/clothing/under/frontiersmen/officer
head = /obj/item/clothing/head/hardhat/frontier
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/color/yellow
belt = /obj/item/storage/belt/utility/full
// Engineer
@@ -133,7 +133,7 @@
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/beret/sec/frontier/officer
gloves = /obj/item/clothing/gloves/combat
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
// Head of Security
/datum/outfit/job/frontiersmen/hos
@@ -145,7 +145,7 @@
accessory = /obj/item/clothing/accessory/armband
uniform = /obj/item/clothing/under/frontiersmen/officer
head = /obj/item/clothing/head/beret/sec/frontier/officer
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
+ suit = /obj/item/clothing/suit/armor/vest/frontier
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/combat
backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/melee/baton/loaded=1)
@@ -184,7 +184,7 @@
accessory = /obj/item/clothing/accessory/armband/med
uniform = /obj/item/clothing/under/frontiersmen
glasses = /obj/item/clothing/glasses/hud/health
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
suit = /obj/item/clothing/suit/frontiersmen
head = /obj/item/clothing/head/frontier
belt = /obj/item/storage/belt/medical/webbing/frontiersmen
diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm
index df7a5145e47..efadbece4ba 100644
--- a/code/modules/clothing/outfits/factions/gezena.dm
+++ b/code/modules/clothing/outfits/factions/gezena.dm
@@ -22,7 +22,7 @@
/datum/outfit/job/gezena/assistant/bridge
name = "PGF - Bridge Crew"
- id_assignment = "Bridge Crew"
+ id_assignment = "Helmsman"
jobtype = /datum/job/head_of_personnel
/datum/outfit/job/gezena/engineer
@@ -71,6 +71,15 @@
courierbag = /obj/item/storage/backpack/messenger/sec
box = /obj/item/storage/box/survival/security
+/datum/outfit/job/gezena/security/sapper
+ name = "PGF - Marine Pioneer"
+ id_assignment = "Marine Pioneer"
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
/datum/outfit/job/gezena/hos
name = "PGF - Marine Sergeant"
id_assignment = "Sergeant"
diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm
index db227c2903c..7b82368f14d 100644
--- a/code/modules/clothing/outfits/factions/independent.dm
+++ b/code/modules/clothing/outfits/factions/independent.dm
@@ -30,7 +30,7 @@
..()
if(visualsOnly)
return
- var/obj/item/card/id/W = H.wear_id
+ var/obj/item/card/id/W = H.get_idcard()
W.access += list(ACCESS_KITCHEN)
/datum/outfit/job/independent/assistant/fancy
@@ -53,7 +53,7 @@
uniform = /obj/item/clothing/under/utility
head = /obj/item/clothing/head/soft/black
shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat/survival
+ l_pocket = /obj/item/melee/knife/survival
gloves = /obj/item/clothing/gloves/combat
implants = list(/obj/item/implant/radio)
@@ -107,6 +107,22 @@
gloves = /obj/item/clothing/gloves/color/white //poverty gloves
shoes = /obj/item/clothing/shoes/sneakers/brown
+/datum/outfit/job/independent/captain/merc
+ name = "Independent - Captain (Mercenary)"
+
+ uniform = /obj/item/clothing/under/syndicate
+ head = /obj/item/clothing/head/beret
+ gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/combat
+ suit = /obj/item/clothing/suit/armor/vest
+
+ accessory = null
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+
/datum/outfit/job/independent/captain/western
name = "Independent - Captain (Western)"
head = /obj/item/clothing/head/caphat/cowboy
@@ -145,7 +161,7 @@
suit = /obj/item/clothing/suit/armor/vest/marine/medium
head = /obj/item/clothing/head/soft/black
shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/melee/knife/combat
implants = list(/obj/item/implant/radio)
accessory = null
@@ -173,7 +189,6 @@
uniform = /obj/item/clothing/under/rank/command/head_of_personnel
dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
shoes = /obj/item/clothing/shoes/sneakers/brown
- head = /obj/item/clothing/head/hopcap
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
@@ -232,6 +247,20 @@
chameleon_extras = list(/obj/item/gun/energy/e_gun/hos, /obj/item/stamp/hos)
+/datum/outfit/job/independent/hos/merc
+ name = "Independent - Mercenary XO"
+ id_assignment = "Lieutenant"
+
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/syndicate
+ shoes = /obj/item/clothing/shoes/combat
+ suit = /obj/item/clothing/suit/armor/vest
+ alt_suit = null
+ gloves = /obj/item/clothing/gloves/combat
+ head = /obj/item/clothing/head/beret
+ glasses = null
+ l_pocket = null
+
// Roboticist
/datum/outfit/job/independent/roboticist
@@ -276,6 +305,13 @@
chameleon_extras = list(/obj/item/gun/energy/disabler, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/head/helmet)
//The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state
+/datum/outfit/job/independent/security/disarmed //No armor, no pocket handcuffs.
+ name = "Independent - Security Officer (Disarmed)"
+ head = null
+ suit = null
+ l_pocket = null
+
+
/datum/outfit/job/independent/security/western
name = "Independent - Security Officer (Western)"
@@ -283,6 +319,17 @@
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/cowboy/sec
+/datum/outfit/job/independent/security/merc
+ name = "Independent - Security Officer (Mercenary)"
+ id_assignment = "Trooper"
+
+ uniform = /obj/item/clothing/under/syndicate/camo
+ gloves = /obj/item/clothing/gloves/fingerless
+ head = null
+ suit = null
+ dcoat = null
+
+
/datum/outfit/job/independent/security/pirate
name = "Independent - Security Officer (Pirate)"
@@ -298,7 +345,7 @@
uniform = /obj/item/clothing/under/utility
head = /obj/item/clothing/head/soft/black
shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/melee/knife/combat
backpack_contents = list(/obj/item/melee/baton/loaded=1)
@@ -349,8 +396,8 @@
uniform = /obj/item/clothing/under/utility
head = /obj/item/clothing/head/soft/black
shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat/survival
- gloves = /obj/item/clothing/gloves/combat
+ l_pocket = /obj/item/melee/knife/survival
+ gloves = /obj/item/clothing/gloves/color/red/insulated
implants = list(/obj/item/implant/radio)
@@ -379,7 +426,7 @@
courierbag = /obj/item/storage/backpack/messenger/sec
box = /obj/item/storage/box/survival/security
- chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+ chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/m11
// Chief Engineer
@@ -442,7 +489,7 @@
job_icon = "cargotechnician"
ears = /obj/item/radio/headset/headset_cargo
- uniform = /obj/item/clothing/under/color/khaki
+ uniform = /obj/item/clothing/under/color/lightbrown
dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
@@ -535,23 +582,24 @@
job_icon = "quartermaster"
ears = /obj/item/radio/headset/headset_cargo
- uniform = /obj/item/clothing/under/rank/cargo/qm
- head = /obj/item/clothing/head/supply_chief
+ uniform = /obj/item/clothing/under/rank/security/detective
+ head = /obj/item/clothing/head/hardhat/white
dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
- shoes = /obj/item/clothing/shoes/sneakers/brown
+ suit = /obj/item/clothing/suit/hazardvest
+ shoes = /obj/item/clothing/shoes/workboots
glasses = /obj/item/clothing/glasses/sunglasses
- l_hand = /obj/item/clipboard
+ r_pocket = /obj/item/clipboard
backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
chameleon_extras = /obj/item/stamp/qm
/datum/outfit/job/independent/quartermaster/western
name = "Independent - Quartermaster (Western)"
- uniform = /obj/item/clothing/under/rank/cargo/qm
- suit = /obj/item/clothing/suit/toggle/hazard
- shoes = /obj/item/clothing/shoes/workboots
- glasses = /obj/item/clothing/glasses/sunglasses
+ suit = /obj/item/clothing/suit/jacket/leather/duster
+ gloves = /obj/item/clothing/gloves/fingerless
head = /obj/item/clothing/head/cowboy/sec
/datum/outfit/job/independent/miner
@@ -568,7 +616,7 @@
l_pocket = /obj/item/storage/bag/ore
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
- /obj/item/kitchen/knife/combat/survival=1,\
+ /obj/item/melee/knife/survival=1,\
/obj/item/stack/marker_beacon/ten=1,\
/obj/item/radio/weather_monitor=1)
diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm
index 75a36b1a313..95307aded9f 100644
--- a/code/modules/clothing/outfits/factions/inteq.dm
+++ b/code/modules/clothing/outfits/factions/inteq.dm
@@ -3,7 +3,7 @@
faction_icon = "bg_inteq"
uniform = /obj/item/clothing/under/syndicate/inteq
- box = /obj/item/storage/box/survival
+ box = /obj/item/storage/box/survival/inteq
backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
@@ -24,36 +24,46 @@
jobtype = /datum/job/assistant
job_icon = "assistant"
+ ears = /obj/item/radio/headset
r_pocket = /obj/item/radio
///captains
/datum/outfit/job/inteq/captain
- name = "IRMG - Vanguard (Naked)"
+ name = "IRMG - Vanguard"
id_assignment = "Vanguard"
jobtype = /datum/job/captain
job_icon = "captain"
+ id = /obj/item/card/id/gold
+ head = /obj/item/clothing/head/beret/sec/hos/inteq
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
+ suit = /obj/item/clothing/suit/armor/hos/inteq
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
+ belt = /obj/item/storage/belt/security/webbing/inteq
+ gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/inteq/alt/captain
shoes = /obj/item/clothing/shoes/combat
+
r_pocket = /obj/item/assembly/flash/handheld
l_pocket = /obj/item/restraints/handcuffs
- jobtype = /datum/job/captain
- id = /obj/item/card/id/gold
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
-/datum/outfit/job/inteq/captain/geared
- name = "IRMG - Vanguard"
+/datum/outfit/job/inteq/captain/empty
+ name = "IRMG - Vanguard (Naked)"
- head = /obj/item/clothing/head/beret/sec/hos/inteq
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
- belt = /obj/item/storage/belt/security/webbing/inteq
- suit = /obj/item/clothing/suit/armor/hos/inteq
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
- gloves = /obj/item/clothing/gloves/combat
- accessory = null
+ head = null
+ glasses = null
+ mask = null
+ belt = null
+ suit = null
+ dcoat = null
+ gloves = null
+
+ r_pocket = null
+ l_pocket = null
/datum/outfit/job/inteq/captain/honorable
name = "IRMG - Honorable Vanguard"
@@ -71,18 +81,18 @@
///Chief Engineer
/datum/outfit/job/inteq/ce
- name = "IRMG - Artificer Class II"
- id_assignment = "Artificer Class II"
+ name = "IRMG - Honorable Artificer"
+ id_assignment = "Honorable Artificer"
job_icon = "chiefengineer"
jobtype = /datum/job/chief_engineer
ears = /obj/item/radio/headset/inteq
uniform = /obj/item/clothing/under/syndicate/inteq/artificer
head = /obj/item/clothing/head/hardhat/white
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/color/yellow
belt = /obj/item/storage/belt/utility/full
id = /obj/item/card/id/silver
@@ -126,10 +136,11 @@
jobtype = /datum/job/officer
job_icon = "securityofficer"
+ ears = /obj/item/radio/headset/alt
head = /obj/item/clothing/head/helmet/inteq
suit = /obj/item/clothing/suit/armor/vest/alt
belt = /obj/item/storage/belt/security/webbing/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
@@ -140,6 +151,14 @@
satchel = /obj/item/storage/backpack/messenger/inteq
courierbag = /obj/item/storage/backpack/messenger/inteq
+/datum/outfit/job/inteq/security/empty
+ name = "IRMG - Enforcer (Naked)"
+ head = null
+ suit = null
+ belt = null
+ mask = null
+ gloves = null
+
/datum/outfit/job/inteq/security/beluga
name = "IRMG - Enforcer (Beluga)"
@@ -156,14 +175,6 @@
satchel = /obj/item/storage/backpack/messenger/inteq
courierbag = /obj/item/storage/backpack/messenger/inteq
-/datum/outfit/job/inteq/security/empty
- name = "IRMG - Enforcer (Naked)"
- head = null
- suit = null
- belt = null
- mask = null
- gloves = null
-
///engineers
/datum/outfit/job/inteq/engineer
@@ -172,6 +183,7 @@
job_icon = "stationengineer"
jobtype = /datum/job/engineer
+ ears = /obj/item/radio/headset/alt
uniform = /obj/item/clothing/under/syndicate/inteq/artificer
head = /obj/item/clothing/head/soft/inteq
shoes = /obj/item/clothing/shoes/combat
@@ -190,7 +202,7 @@
head = /obj/item/clothing/head/warden/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
belt = /obj/item/storage/belt/military/assault
suit = /obj/item/clothing/suit/armor/vest/security/warden/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
@@ -201,6 +213,17 @@
courierbag = /obj/item/storage/backpack/messenger/inteq
backpack_contents = list(/obj/item/melee/classic_baton=1)
+/datum/outfit/job/inteq/warden/pilot
+ name = "IRMG - Shuttle Pilot"
+ job_icon = "securityofficer"
+ id_assignment = "Shuttle Pilot"
+
+ head = /obj/item/clothing/head/soft/inteq
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ belt = null
+ mask = /obj/item/clothing/mask/breath
+ gloves = /obj/item/clothing/gloves/fingerless
+
// cmo
/datum/outfit/job/inteq/cmo
@@ -212,7 +235,6 @@
belt = /obj/item/storage/belt/medical/webbing/paramedic
ears = /obj/item/radio/headset/inteq/captain
uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
- alt_uniform = /obj/item/clothing/under/syndicate/inteq/skirt/corpsman
shoes = /obj/item/clothing/shoes/combat
suit = /obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt
alt_suit = /obj/item/clothing/suit/armor/inteq/corpsman
diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm
index 5c038b05f18..3f99cc85087 100644
--- a/code/modules/clothing/outfits/factions/minutemen.dm
+++ b/code/modules/clothing/outfits/factions/minutemen.dm
@@ -3,7 +3,6 @@
/datum/outfit/job/clip
name = "CLIP - Base Outfit"
- jobtype = /datum/job/assistant
uniform = /obj/item/clothing/under/clip
alt_uniform = null
@@ -93,6 +92,7 @@
head = /obj/item/clothing/head/hardhat/white
ears = /obj/item/radio/headset/clip
uniform = /obj/item/clothing/under/clip
+ gloves = /obj/item/clothing/gloves/color/yellow
alt_uniform = null
suit = /obj/item/clothing/suit/toggle/lawyer/clip
alt_suit = null
@@ -119,7 +119,7 @@
suit = /obj/item/clothing/suit/toggle/lawyer/clip/fo
alt_suit = null
- shoes = /obj/item/clothing/shoes/combat
+ shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/clip/slouch/officer
backpack = /obj/item/storage/backpack/captain
@@ -222,6 +222,8 @@
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/color/black
+ l_hand = /obj/item/storage/briefcase
+
backpack = /obj/item/storage/backpack/satchel/leather
satchel = /obj/item/storage/backpack/satchel/leather
@@ -232,6 +234,16 @@
/obj/item/detective_scanner=1,\
/obj/item/melee/classic_baton=1)
+/datum/outfit/job/clip/investigator/cm5
+ name = "CLIP GOLD - Investigator (CM-5c)"
+
+ backpack_contents = list(/obj/item/storage/box/evidence=1,\
+ /obj/item/detective_scanner=1,\
+ /obj/item/melee/classic_baton=1,\
+ /obj/item/ammo_box/magazine/cm5_9mm = 2, \
+ /obj/item/gun/ballistic/automatic/smg/cm5/compact
+ )
+
/datum/outfit/job/clip/bureaucrat
name = "CLIP GOLD - Bureaucrat"
job_icon = "scribe"
@@ -272,7 +284,7 @@
backpack = /obj/item/storage/backpack/security/clip
satchel = /obj/item/storage/backpack/satchel/sec/clip
duffelbag = /obj/item/storage/backpack/duffelbag
- courierbag = /obj/item/storage/backpack/messenger
+ courierbag = /obj/item/storage/backpack/satchel/sec/clip
box = /obj/item/storage/box/survival/clip/balaclava
@@ -297,17 +309,12 @@
ears = /obj/item/radio/headset/clip/alt/captain
uniform = /obj/item/clothing/under/clip/officer
alt_uniform = null
- suit = /obj/item/clothing/suit/armor/clip_capcoat
alt_suit = null
+ suit = /obj/item/clothing/suit/armor/clip_capcoat
dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
- shoes = /obj/item/clothing/shoes/combat
+ shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/clip/slouch/officer
- backpack = /obj/item/storage/backpack/captain
- satchel = /obj/item/storage/backpack/satchel/cap
- duffelbag = /obj/item/storage/backpack/duffelbag/captain
- courierbag = /obj/item/storage/backpack/messenger/com
-
backpack_contents = list(/obj/item/storage/box/ids=1,
/obj/item/melee/classic_baton/telescopic=1,
/obj/item/modular_computer/tablet/preset/advanced = 1)
@@ -364,14 +371,9 @@
ears = /obj/item/radio/headset/clip/alt
uniform = /obj/item/clothing/under/clip/formal
alt_uniform = null
- suit = /obj/item/clothing/suit/toggle/lawyer/clip
alt_suit = null
- shoes = /obj/item/clothing/shoes/combat
-
- backpack = /obj/item/storage/backpack/captain
- satchel = /obj/item/storage/backpack/satchel/cap
- duffelbag = /obj/item/storage/backpack/duffelbag/captain
- courierbag = /obj/item/storage/backpack/messenger/com
+ suit = /obj/item/clothing/suit/toggle/lawyer/clip
+ shoes = /obj/item/clothing/shoes/jackboots
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1)
@@ -381,17 +383,9 @@
job_icon = "clip_navy2"
jobtype = /datum/job/doctor
- l_hand = /obj/item/storage/firstaid/medical
-
- backpack = /obj/item/storage/backpack/security/clip
- satchel = /obj/item/storage/backpack/satchel/sec/clip
- duffelbag = /obj/item/storage/backpack/duffelbag
- courierbag = /obj/item/storage/backpack/messenger
-
uniform = /obj/item/clothing/under/clip/medic
shoes = /obj/item/clothing/shoes/sneakers/white
head = /obj/item/clothing/head/clip/corpsman
- gloves = /obj/item/clothing/gloves/color/latex/nitrile/clip
suit = null
suit_store = null
@@ -512,7 +506,7 @@
job_icon = "clip_cmm2"
ears = /obj/item/radio/headset/alt
box = /obj/item/storage/box/survival/clip/balaclava
- shoes = null
+ shoes = /obj/item/clothing/shoes/combat // shoos
backpack = /obj/item/storage/backpack/security/clip
satchel = /obj/item/storage/backpack/satchel/sec/clip
@@ -551,17 +545,22 @@
backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chicken_wings_hot_sauce=1)
+/datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
+ name = "CLIP Minutemen - Minuteman (Spotter Hardsuit)"
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/clip_spotter
+
/datum/outfit/job/clip/minutemen/grunt/dressed/armed
- name = "CLIP Minutemen - Minuteman (Armed - CM-16)"
+ name = "CLIP Minutemen - Minuteman (Armed - CM-82)"
- suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
- belt = /obj/item/storage/belt/military/clip/p16
+ suit_store = /obj/item/gun/ballistic/automatic/assault/cm82
+ belt = /obj/item/storage/belt/military/clip/cm82
-/datum/outfit/job/clip/minutemen/grunt/dressed/armed/f4 //f4 is rename of GAL, don't wanna repath upon adding the clip guns though, if i forget to remove this during then, fucking yell at me
- name = "CLIP Minutemen - Minuteman (Armed - CM-GAL)"
+/datum/outfit/job/clip/minutemen/grunt/dressed/armed/f4
+ name = "CLIP Minutemen - Minuteman (Armed - F4)"
- suit_store = /obj/item/gun/ballistic/automatic/marksman/gal
- belt = /obj/item/storage/belt/military/clip/gal
+ suit_store = /obj/item/gun/ballistic/automatic/marksman/f4
+ belt = /obj/item/storage/belt/military/clip/f4
/datum/outfit/job/clip/minutemen/grunt/dressed/armed/cm5
name = "CLIP Minutemen - Minuteman (Armed - CM-5)"
@@ -580,9 +579,9 @@
belt = /obj/item/storage/belt/military/clip/engi
/datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed
- name = "CLIP Minutemen - Field Engineer (Armed - CM-16)"
+ name = "CLIP Minutemen - Field Engineer (Armed - CM-82)"
- suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
+ suit_store = /obj/item/gun/ballistic/automatic/assault/cm82
backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chili_macaroni=1, /obj/item/grenade/c4=2, /obj/item/ammo_box/magazine/p16=3)
/datum/outfit/job/clip/minutemen/grunt/dressed/med
@@ -598,22 +597,27 @@
suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
- backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/cheese_pizza_slice, /obj/item/defibrillator/compact/loaded=1, /obj/item/storage/firstaid/medical=1, /obj/item/ammo_box/magazine/smgm9mm=3)
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/cheese_pizza_slice, /obj/item/defibrillator/compact/loaded=1, /obj/item/storage/firstaid/medical=1, /obj/item/ammo_box/magazine/cm5_9mm=3)
+
+/obj/item/storage/belt/military/clip/gunner/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/belt/military/clip/gunner/PopulateContents()
for(var/i in 1 to 5)
- new /obj/item/ammo_box/magazine/skm_762_40/extended(src)
+ new /obj/item/ammo_box/magazine/cm40_762_40_box(src)
new /obj/item/grenade/frag(src)
/datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed
- name = "CLIP Minutemen - Field Gunner (Armed - SKM-24u)" //See above, replace with CLIP LMG when added
+ name = "CLIP Minutemen - Field Gunner (Armed - CM-40)"
id_assignment = "Machinegunner"
accessory = /obj/item/clothing/accessory/armband
belt = /obj/item/storage/belt/military/clip/gunner
- suit_store = /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended
+ suit_store = /obj/item/gun/ballistic/automatic/hmg/cm40
- backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1)
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/shredded_beef=1)
///lead, i guess you could reuse this for "Brig Officer"
@@ -629,7 +633,7 @@
head = /obj/item/clothing/head/clip/slouch
suit = /obj/item/clothing/suit/armor/vest/bulletproof
belt = /obj/item/storage/belt/military/clip
- shoes = /obj/item/clothing/shoes/combat
+ shoes = /obj/item/clothing/shoes/jackboots
l_pocket = /obj/item/flashlight/seclite
r_pocket = /obj/item/tank/internals/emergency_oxygen/double
@@ -639,10 +643,10 @@
/datum/outfit/job/clip/minutemen/grunt/lead/armed
name = "CLIP Minutemen - Field Sergeant (Armed)"
- suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
- belt = /obj/item/storage/belt/military/clip/p16
+ suit_store = /obj/item/gun/ballistic/automatic/assault/cm82
+ belt = /obj/item/storage/belt/military/clip/cm82
//replace commander with the cm23 when its impemented, see the cm-f4 above
- backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1, /obj/item/gun/ballistic/automatic/pistol/commander=1)
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/shredded_beef=1, /obj/item/gun/ballistic/automatic/pistol/commander=1)
/datum/outfit/job/clip/minutemen/grunt/commander
name = "CLIP Minutemen - Field Commander"
@@ -656,7 +660,7 @@
head = /obj/item/clothing/head/clip/slouch/officer
suit = /obj/item/clothing/suit/toggle/lawyer/clip
- shoes = /obj/item/clothing/shoes/combat
+ shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/sunglasses
/datum/outfit/job/clip/minutemen/grunt/major
@@ -671,6 +675,6 @@
head = /obj/item/clothing/head/clip/slouch/officer
suit = /obj/item/clothing/suit/armor/clip_trenchcoat
- shoes = /obj/item/clothing/shoes/combat
+ shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/sunglasses
diff --git a/code/modules/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm
index e93c7b4b8e5..3d0a75fd252 100644
--- a/code/modules/clothing/outfits/factions/nanotrasen.dm
+++ b/code/modules/clothing/outfits/factions/nanotrasen.dm
@@ -53,9 +53,13 @@
head = /obj/item/clothing/head/nanotrasen/cap/supply
uniform = /obj/item/clothing/under/nanotrasen/supply/qm
+ suit = null
+ alt_suit = null
dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
shoes = /obj/item/clothing/shoes/sneakers/brown
glasses = /obj/item/clothing/glasses/sunglasses
+ gloves = null
+ neck = null
l_hand = /obj/item/clipboard
chameleon_extras = /obj/item/stamp/qm
@@ -184,7 +188,7 @@
courierbag = /obj/item/storage/backpack/messenger/sec
box = /obj/item/storage/box/survival/security
- chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+ chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/m11
// Engineering //
@@ -312,7 +316,7 @@
backpack_contents = list(
/obj/item/flashlight/seclite=1,
- /obj/item/kitchen/knife/combat/survival=1,
+ /obj/item/melee/knife/survival=1,
/obj/item/stack/marker_beacon/ten=1,
/obj/item/radio/weather_monitor=1,
)
@@ -324,6 +328,12 @@
chameleon_extras = /obj/item/gun/energy/kinetic_accelerator
+/datum/outfit/job/nanotrasen/miner/no_equipment
+ name = "Nanotrasen - Miner (No Equipment)"
+
+ r_pocket = null
+ backpack_contents = null
+
// Cargo Tech
/datum/outfit/job/nanotrasen/cargo_tech
name = "Nanotrasen - Cargo Tech"
@@ -397,6 +407,15 @@
shoes = /obj/item/clothing/shoes/sneakers/black
belt = /obj/item/pda
+// Janitor
+/datum/outfit/job/nanotrasen/janitor
+ name = "Nanotrasen - Janitor"
+ jobtype = /datum/job/janitor
+ job_icon = "janitor"
+
+ uniform = /obj/item/clothing/under/nanotrasen/janitor
+ head = /obj/item/clothing/head/nanotrasen/cap/janitor
+
// Lawyer
/datum/outfit/job/nanotrasen/lawyer
name = "Nanotrasen - Lawyer"
@@ -419,8 +438,6 @@
id_assignment = "Corporate Representative"
job_icon = "nanotrasen"
- uniform = /obj/item/clothing/under/rank/command/head_of_personnel/suit
- suit = null
ears = /obj/item/radio/headset/headset_cent
l_hand = /obj/item/clipboard
r_pocket = /obj/item/pen/fountain
@@ -468,10 +485,10 @@
accessory = /obj/item/clothing/accessory/holster
head = /obj/item/clothing/head/beret/command
-// Mech Pilot
+// Exosuit Pilot
/datum/outfit/job/nanotrasen/security/mech_pilot
- name = "Nanotrasen - Mech Pilot"
- id_assignment = "Mech Pilot"
+ name = "Nanotrasen - Exosuit Pilot"
+ id_assignment = "Exosuit Pilot"
uniform = /obj/item/clothing/under/rank/security/officer/military/eng
head = /obj/item/clothing/head/beret/sec/officer
@@ -491,7 +508,7 @@
gloves = /obj/item/clothing/gloves/color/black
uniform = /obj/item/clothing/under/rank/security/head_of_security/alt/lp
alt_uniform = /obj/item/clothing/under/rank/security/head_of_security/alt/skirt/lp
- dcoat = /obj/item/clothing/suit/jacket
+ dcoat = /obj/item/clothing/suit/armor/nanotrasen/sec_director
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/beret/command
@@ -565,7 +582,7 @@
backpack = /obj/item/storage/backpack/ert/security
belt = /obj/item/storage/belt/military
id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
/datum/outfit/job/nanotrasen/security/ert/engi
@@ -576,7 +593,7 @@
backpack = /obj/item/storage/backpack/ert/engineer
belt = /obj/item/storage/belt/utility/full/ert
id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
accessory = /obj/item/clothing/accessory/armband/engine
glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
@@ -589,7 +606,7 @@
backpack = /obj/item/storage/backpack/ert/medical
belt = /obj/item/storage/belt/medical/webbing/paramedic
id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
accessory = /obj/item/clothing/accessory/armband/med
glasses = /obj/item/clothing/glasses/hud/health/night
diff --git a/code/modules/clothing/outfits/factions/roumain.dm b/code/modules/clothing/outfits/factions/roumain.dm
index fe31fddd904..e7cc57a33a9 100644
--- a/code/modules/clothing/outfits/factions/roumain.dm
+++ b/code/modules/clothing/outfits/factions/roumain.dm
@@ -84,7 +84,7 @@
name = "Saint-Roumain Militia - Hunter"
id_assignment = "Hunter"
jobtype = /datum/job/officer
- job_icon = "hsrm_hunter"
+ job_icon = "srm_hunter"
uniform = /obj/item/clothing/under/suit/roumain
alt_uniform = null
diff --git a/code/modules/clothing/outfits/factions/solgov.dm b/code/modules/clothing/outfits/factions/solgov.dm
index 972b863bbbd..c4aed59c7e2 100644
--- a/code/modules/clothing/outfits/factions/solgov.dm
+++ b/code/modules/clothing/outfits/factions/solgov.dm
@@ -7,7 +7,7 @@
. = ..()
if(visualsOnly)
return
- H.faction |= list(FACTION_PLAYER_SOLGOV)
+ H.faction |= list(FACTION_PLAYER_SOLCON)
/datum/outfit/job/solgov/assistant
name = "SolGov - Scribe"
@@ -47,7 +47,7 @@
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/solgov/alt/captain
uniform = /obj/item/clothing/under/solgov/formal/captain
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain
+ suit = /obj/item/clothing/suit/armor/vest/solgov/captain
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/solgov/captain
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
@@ -69,7 +69,7 @@
id = /obj/item/card/id/solgov
uniform = /obj/item/clothing/under/solgov
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov
+ suit = /obj/item/clothing/suit/armor/vest/solgov
ears = /obj/item/radio/headset/solgov/alt
gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/solgov/sonnensoldner
@@ -101,7 +101,7 @@
implants = list(/obj/item/implant/mindshield)
backpack_contents = list(
- /obj/item/kitchen/knife/letter_opener = 1
+ /obj/item/melee/knife/letter_opener = 1
)
/datum/outfit/job/solgov/overseer
@@ -115,7 +115,7 @@
uniform = /obj/item/clothing/under/solgov/formal
head = /obj/item/clothing/head/solgov
neck = /obj/item/clothing/neck/cloak/overseer
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov/overseer
+ suit = /obj/item/clothing/suit/armor/vest/solgov/overseer
shoes = /obj/item/clothing/shoes/laceup
backpack_contents = list(/obj/item/storage/box/ids=1,\
@@ -159,7 +159,7 @@
r_pocket = /obj/item/storage/bag/ore //causes issues if spawned in backpack
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
- /obj/item/kitchen/knife/combat/survival=1,\
+ /obj/item/melee/knife/survival=1,\
/obj/item/stack/marker_beacon/ten=1)
backpack = /obj/item/storage/backpack/explorer
diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm
index 4dbbe0826e2..af3bc97ac2e 100644
--- a/code/modules/clothing/outfits/factions/syndicate.dm
+++ b/code/modules/clothing/outfits/factions/syndicate.dm
@@ -4,7 +4,7 @@
name = "Syndicate - Base Outfit"
uniform = /obj/item/clothing/under/color/black
- box = /obj/item/storage/box/survival/syndie
+ box = /obj/item/storage/box/survival
id = /obj/item/card/id/syndicate_command/crew_id
faction_icon = "bg_syndicate"
@@ -40,19 +40,14 @@
alt_uniform = null
shoes = /obj/item/clothing/shoes/jackboots
- gloves = /obj/item/clothing/gloves/color/black
+ gloves = null
ears = /obj/item/radio/headset
back = /obj/item/storage/backpack
id = /obj/item/card/id/syndicate_command/crew_id
r_pocket = /obj/item/radio
- backpack = /obj/item/storage/backpack/security
- satchel = /obj/item/storage/backpack/satchel/sec
- duffelbag = /obj/item/storage/backpack/duffelbag/syndie
- courierbag = /obj/item/storage/backpack/messenger/sec
-
- box = /obj/item/storage/box/survival/syndie
+ box = /obj/item/storage/box/survival
/datum/outfit/job/syndicate/assistant/gorlex
name = "Syndicate - Junior Agent (Hardliner)"
@@ -106,8 +101,6 @@
duffelbag = /obj/item/storage/backpack/duffelbag/syndie
courierbag = /obj/item/storage/backpack/messenger/sec
- box = /obj/item/storage/box/survival/syndie
-
/datum/outfit/job/syndicate/assistant/twink/post_equip(mob/living/carbon/human/H)
. = ..()
@@ -246,8 +239,6 @@
duffelbag = /obj/item/storage/backpack/duffelbag/syndie
courierbag = /obj/item/storage/backpack/messenger/sec
- box = /obj/item/storage/box/survival/syndie
-
/datum/outfit/job/syndicate/bartender/twink/post_equip(mob/living/carbon/human/H)
. = ..()
assign_codename(H)
@@ -301,8 +292,6 @@
duffelbag = /obj/item/storage/backpack/duffelbag/sec
courierbag = /obj/item/storage/backpack/messenger/sec
- box = /obj/item/storage/box/survival/syndie
-
/datum/outfit/job/syndicate/captain/aclf
name = "Captain (ACLF)"
@@ -359,7 +348,7 @@
shoes = /obj/item/clothing/shoes/combat/suns
head = /obj/item/clothing/head/suns/captain
gloves = /obj/item/clothing/gloves/suns/captain
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/captain
+ suit = /obj/item/clothing/suit/armor/vest/suns/captain
belt = /obj/item/storage/belt/sabre/suns/captain
mask = /obj/item/clothing/mask/breath/suns
neck = /obj/item/clothing/neck/cloak/suns/cap
@@ -450,7 +439,7 @@
shoes =/obj/item/clothing/shoes/laceup
ears = /obj/item/radio/headset/syndicate/alt/captain
id = /obj/item/card/id/syndicate_command/captain_id
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/color/yellow
/datum/outfit/job/syndicate/ce/ngr
name = "Syndicate - Foreman (New Gorlex Republic)"
@@ -462,7 +451,7 @@
suit = /obj/item/clothing/suit/ngr
alt_suit = null
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/color/red/insulated
//Chief Medical Officer
@@ -483,6 +472,7 @@
l_hand = /obj/item/storage/firstaid/medical
suit_store = /obj/item/flashlight/pen
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+ box = /obj/item/storage/box/survival/medical
/datum/outfit/job/syndicate/cmo/suns
name = "Syndicate - Medical Instructor (SUNS)"
@@ -521,11 +511,25 @@
head = /obj/item/clothing/head/HoS/beret/syndicate
gloves = /obj/item/clothing/gloves/color/white
id = /obj/item/card/id/syndicate_command/crew_id
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
glasses = /obj/item/clothing/glasses/hud/health
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
+/datum/outfit/job/syndicate/head_of_personnel/ngr
+ name = "Syndicate - Ensign (NGR)"
+ id_assignment = "Ensign"
+
+ ears = /obj/item/radio/headset/syndicate
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
+ head = /obj/item/clothing/head/ngr
+ suit = /obj/item/clothing/suit/armor/ngr/lieutenant
+ id = /obj/item/card/id/syndicate_command/crew_id
+ shoes = /obj/item/clothing/shoes/combat
+ glasses = null
+ gloves = null
+
+
/datum/outfit/job/syndicate/head_of_personnel/cybersun
name = "Syndicate - Intelligence Officer (Cybersun)"
id_assignment = "Intelligence Officer"
@@ -537,7 +541,7 @@
head = /obj/item/clothing/head/HoS/cybersun
gloves = /obj/item/clothing/gloves/combat
id = /obj/item/card/id/syndicate_command/crew_id
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
glasses = /obj/item/clothing/glasses/sunglasses
/datum/outfit/job/syndicate/head_of_personnel/suns
@@ -545,7 +549,7 @@
id_assignment = "Academic Staff"
uniform = /obj/item/clothing/under/syndicate/suns/xo
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/xo
+ suit = /obj/item/clothing/suit/armor/vest/suns/xo
belt = /obj/item/storage/belt/sabre/suns
shoes = /obj/item/clothing/shoes/combat/suns
head = /obj/item/clothing/head/suns
@@ -577,6 +581,7 @@
r_pocket = /obj/item/assembly/flash/handheld
l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list(/obj/item/melee/baton/loaded=1)
+ box = /obj/item/storage/box/survival/security
/datum/outfit/job/syndicate/hos/gorlex
name = "Syndicate - Sergeant (Hardliner)"
@@ -587,7 +592,7 @@
suit = /obj/item/clothing/suit/armor/hardliners/sergeant
id = /obj/item/card/id/syndicate_command/crew_id
shoes = /obj/item/clothing/shoes/combat
- suit_store = /obj/item/gun/ballistic/automatic/pistol/syndicate
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/ringneck
/datum/outfit/job/syndicate/hos/ngr
name = "Syndicate - Lieutenant (New Gorlex Republic)"
@@ -598,7 +603,8 @@
suit = /obj/item/clothing/suit/armor/ngr/lieutenant
id = /obj/item/card/id/syndicate_command/crew_id
shoes = /obj/item/clothing/shoes/combat
- suit_store = /obj/item/gun/ballistic/automatic/pistol/syndicate
+ suit_store = null
+ gloves = /obj/item/clothing/gloves/color/black
/datum/outfit/job/syndicate/hos/twink
@@ -628,8 +634,6 @@
duffelbag = /obj/item/storage/backpack/duffelbag/syndie
courierbag = /obj/item/storage/backpack/messenger/sec
- box = /obj/item/storage/box/survival/syndie
-
/datum/outfit/job/syndicate/hos/twink/post_equip(mob/living/carbon/human/H)
. = ..()
assign_codename(H)
@@ -639,8 +643,8 @@
id_assignment = "Senior Peacekeeper"
uniform = /obj/item/clothing/under/syndicate/suns/pkuniform
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/hos
- belt = /obj/item/melee/sabre/suns/telescopic
+ suit = /obj/item/clothing/suit/armor/vest/suns/hos
+ belt = /obj/item/melee/sword/sabre/suns/telescopic
gloves = /obj/item/clothing/gloves/tackler/dolphin/suns
shoes = /obj/item/clothing/shoes/combat/suns
head = /obj/item/clothing/head/welding/suns/hos
@@ -654,7 +658,7 @@
/datum/outfit/job/syndicate/hos/suns/alt
name = "Syndicate - Senior Peacekeeper Alt (SUNS)"
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos
+ suit = /obj/item/clothing/suit/armor/vest/suns/ehos
head = /obj/item/clothing/head/HoS/syndicate/suns
/datum/outfit/job/syndicate/hos/suns/twink
@@ -682,9 +686,12 @@
uniform = /obj/item/clothing/under/syndicate
id = /obj/item/card/id/syndicate_command/crew_id
shoes = /obj/item/clothing/shoes/jackboots
- shoes = /obj/item/clothing/shoes/sneakers/white
alt_suit = /obj/item/clothing/suit/apron/surgical
- l_hand = /obj/item/storage/firstaid/medical
+ box = /obj/item/storage/box/survival/medical
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med
+ courierbag = /obj/item/storage/backpack/messenger/med
/datum/outfit/job/syndicate/doctor/suns
name = "Syndicate - Medical Doctor (SUNS)"
@@ -716,10 +723,10 @@
head = /obj/item/clothing/head/hardliners
suit = /obj/item/clothing/suit/hardliners
glasses = /obj/item/clothing/glasses/hud/health
- r_pocket = /obj/item/kitchen/knife/combat/survival
- back = /obj/item/storage/backpack/duffelbag/syndie/med
+ r_pocket = /obj/item/melee/knife/survival
id = /obj/item/card/id/syndicate_command/crew_id
backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,)
+ shoes = /obj/item/clothing/shoes/combat
/datum/outfit/job/syndicate/doctor/ngr
name = "Syndicate - Medical Doctor (New Gorlex Republic)"
@@ -728,10 +735,9 @@
head = /obj/item/clothing/head/ngr/surgical
suit = /obj/item/clothing/suit/ngr/smock
glasses = /obj/item/clothing/glasses/hud/health
- r_pocket = /obj/item/kitchen/knife/combat/survival
- back = /obj/item/storage/backpack/duffelbag/syndie/med
+ r_pocket = /obj/item/melee/knife/survival
id = /obj/item/card/id/syndicate_command/crew_id
- backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,)
+ shoes = /obj/item/clothing/shoes/combat
//paramedics
@@ -755,6 +761,7 @@
suit_store = /obj/item/flashlight/pen
backpack_contents = list(/obj/item/roller=1)
pda_slot = ITEM_SLOT_LPOCKET
+ box = /obj/item/storage/box/survival/medical
/datum/outfit/job/syndicate/paramedic/gorlex
name = "Syndicate - Paramedic (Gorlex)"
@@ -793,8 +800,6 @@
duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med
courierbag = /obj/item/storage/backpack/messenger/sec
- box = /obj/item/storage/box/survival/syndie
-
/datum/outfit/job/syndicate/paramedic/twink/post_equip(mob/living/carbon/human/H)
. = ..()
assign_codename(H)
@@ -903,7 +908,7 @@
job_icon = "securityofficer"
uniform = /obj/item/clothing/under/syndicate
- r_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/melee/knife/survival
belt = /obj/item/storage/belt/military
back = /obj/item/storage/backpack
suit = /obj/item/clothing/suit/armor/vest
@@ -916,9 +921,7 @@
l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/assembly/flash/handheld
- backpack_contents = list(
- /obj/item/melee/baton/loaded=1,
- )
+ box = /obj/item/storage/box/survival/security
/datum/outfit/job/syndicate/security/gorlex
@@ -935,7 +938,7 @@
l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/assembly/flash/handheld
-/datum/outfit/job/syndicate/security/gorlex
+/datum/outfit/job/syndicate/security/gorlex/pilot
name = "Syndicate - Pilot (Hardliner)"
id_assignment = "Pilot"
job_icon = "securityofficer"
@@ -987,8 +990,6 @@
duffelbag = /obj/item/storage/backpack/duffelbag/syndie
courierbag = /obj/item/storage/backpack/messenger/sec
- box = /obj/item/storage/box/survival/syndie
-
/datum/outfit/job/syndicate/security/twink/post_equip(mob/living/carbon/human/H)
. = ..()
assign_codename(H)
@@ -998,9 +999,9 @@
id_assignment = "Peacekeeper"
uniform = /obj/item/clothing/under/syndicate/suns/pkuniform
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns
+ suit = /obj/item/clothing/suit/armor/vest/suns
alt_suit = /obj/item/clothing/suit/toggle/suns/pkcoat
- belt = /obj/item/melee/sabre/suns/telescopic
+ belt = /obj/item/melee/sword/sabre/suns/telescopic
gloves = /obj/item/clothing/gloves/tackler/dolphin/suns
shoes = /obj/item/clothing/shoes/jackboots/suns/long
head = /obj/item/clothing/head/welding/suns
@@ -1022,13 +1023,14 @@
shoes = /obj/item/clothing/shoes/workboots/mining
gloves = /obj/item/clothing/gloves/explorer
uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland
- l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival
r_pocket = /obj/item/storage/bag/ore
backpack_contents = list(
- /obj/item/flashlight/seclite=1,\
- /obj/item/kitchen/knife/combat/survival=1,\
- /obj/item/mining_voucher=1,\
- /obj/item/stack/marker_beacon/ten=1)
+ /obj/item/flashlight/seclite=1,
+ /obj/item/melee/knife/survival=1,
+ /obj/item/stack/marker_beacon/ten=1,
+ /obj/item/radio/weather_monitor=1,
+ )
+ box = /obj/item/storage/box/survival/mining
/datum/outfit/job/syndicate/miner/gorlex
name = "Syndicate - Wrecker (Hardliner)"
@@ -1121,6 +1123,11 @@
head = /obj/item/clothing/head/hardhat/dblue
r_pocket = /obj/item/t_scanner
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
box = /obj/item/storage/box/survival/engineer
pda_slot = ITEM_SLOT_LPOCKET
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
@@ -1175,8 +1182,6 @@
r_pocket = null
implants = list(/obj/item/implant/weapons_auth)
- box = /obj/item/storage/box/survival/syndie
-
/datum/outfit/job/syndicate/engineer/twink/post_equip(mob/living/carbon/human/H)
. = ..()
assign_codename(H)
diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm
index 05b8c0e1a42..54425960317 100644
--- a/code/modules/clothing/outfits/plasmaman.dm
+++ b/code/modules/clothing/outfits/plasmaman.dm
@@ -17,7 +17,7 @@
head = /obj/item/clothing/head/helmet/space/plasmaman/botany
uniform = /obj/item/clothing/under/plasmaman/botany
- gloves = /obj/item/clothing/gloves/color/botanic_leather/plasmaman
+ gloves = /obj/item/clothing/gloves/botanic_leather/plasmaman
/datum/outfit/plasmaman/curator
name = "Curator Plasmaman"
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 100cc7ff0f5..3687ff2c166 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -1,13 +1,3 @@
-/datum/outfit/centcom
- name = "CentCom Base"
-
-/datum/outfit/centcom/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)//hmm lets have centcom officials become revs
- L.implant(H, null, 1)
-
/datum/outfit/laser_tag
name = "Laser Tag Red"
@@ -59,7 +49,7 @@
var/obj/item/radio/R = H.ears
if(R)
- R.set_frequency(FREQ_SYNDICATE)
+ R.set_frequency(FREQ_PIRATE)
R.freqlock = TRUE
var/obj/item/card/id/W = H.wear_id
@@ -67,43 +57,6 @@
W.registered_name = H.real_name
W.update_label()
-/datum/outfit/centcom/commander
- name = "CentCom Commander"
-
- uniform = /obj/item/clothing/under/rank/centcom/commander
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- ears = /obj/item/radio/headset/headset_cent/commander
- glasses = /obj/item/clothing/glasses/eyepatch
- mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
- head = /obj/item/clothing/head/centcom_cap
- belt = /obj/item/gun/ballistic/revolver/mateba
- r_pocket = /obj/item/lighter
- l_pocket = /obj/item/ammo_box/a357
- back = /obj/item/storage/backpack/satchel/leather
- id = /obj/item/card/id/centcom
-
-/datum/outfit/centcom/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_all_accesses()
- W.access += get_centcom_access("CentCom Commander")
- W.assignment = "CentCom Commander"
- W.registered_name = H.real_name
- W.update_label()
- ..()
-
-/datum/outfit/ghost_cultist
- name = "Cultist Ghost"
-
- uniform = /obj/item/clothing/under/color/black/ghost
- suit = /obj/item/clothing/suit/hooded/cultrobes/alt/ghost
- shoes = /obj/item/clothing/shoes/cult/alt/ghost
- r_hand = /obj/item/melee/cultblade/ghost
-
/datum/outfit/wizard
name = "Blue Wizard"
@@ -126,25 +79,6 @@
if(S)
S.owner = H
-/datum/outfit/wizard/apprentice
- name = "Wizard Apprentice"
- r_hand = null
- l_hand = null
- r_pocket = /obj/item/teleportation_scroll/apprentice
-
-/datum/outfit/wizard/red
- name = "Red Wizard"
-
- suit = /obj/item/clothing/suit/wizrobe/red
- head = /obj/item/clothing/head/wizard/red
-
-/datum/outfit/wizard/weeb
- name = "Marisa Wizard"
-
- suit = /obj/item/clothing/suit/wizrobe/marisa
- shoes = /obj/item/clothing/shoes/sandal/marisa
- head = /obj/item/clothing/head/wizard/marisa
-
/datum/outfit/plasmaman
name = "Plasmaman"
@@ -154,51 +88,6 @@
mask = /obj/item/clothing/mask/breath
gloves = /obj/item/clothing/gloves/color/plasmaman
-
-/datum/outfit/centcom/death_commando
- name = "Death Commando"
-
- uniform = /obj/item/clothing/under/rank/centcom/commander
- suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
- shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- glasses = /obj/item/clothing/glasses/hud/toggle/thermal
- back = /obj/item/storage/backpack/security
- l_pocket = /obj/item/melee/transforming/energy/sword/saber
- r_pocket = /obj/item/shield/energy
- suit_store = /obj/item/tank/internals/emergency_oxygen/double
- belt = /obj/item/gun/ballistic/revolver/mateba
- r_hand = /obj/item/gun/energy/pulse
- id = /obj/item/card/id/ert/deathsquad
- ears = /obj/item/radio/headset/headset_cent/alt
-
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/ammo_box/a357=1,\
- /obj/item/storage/firstaid/regular=1,\
- /obj/item/storage/box/flashbangs=1,\
- /obj/item/flashlight=1,\
- /obj/item/grenade/c4/x4=1)
-
-/datum/outfit/centcom/death_commando/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.set_frequency(FREQ_CENTCOM)
- R.freqlock = TRUE
- var/obj/item/card/id/W = H.wear_id
- W.access = get_all_accesses()//They get full station access.
- W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access.
- W.assignment = "Death Commando"
- W.registered_name = H.real_name
- W.update_label()
- ..()
-
-/datum/outfit/centcom/death_commando/officer
- name = "Death Commando Officer"
- head = /obj/item/clothing/head/helmet/space/beret
-
/datum/outfit/chrono_agent
name = "Timeline Eradication Agent"
uniform = /obj/item/clothing/under/color/white
@@ -224,7 +113,7 @@
box = /obj/item/storage/box/debugtools
internals_slot = ITEM_SLOT_SUITSTORE
backpack_contents = list(
- /obj/item/melee/transforming/energy/axe=1,\
+ /obj/item/melee/energy/axe=1,\
/obj/item/storage/part_replacer/bluespace/tier4=1,\
/obj/item/debug/human_spawner=1,\
/obj/item/debug/omnitool=1
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index 336ac43c7d4..687bf7bf7e7 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -16,6 +16,7 @@
permeability_coefficient = 0.5
slowdown = SHOES_SLOWDOWN
strip_delay = 1 SECONDS
+ blood_overlay_type = "shoe"
var/offset = 0
var/equipped_before_drop = FALSE
@@ -29,15 +30,12 @@
var/atom/movable/screen/alert/our_alert
/obj/item/clothing/shoes/worn_overlays(isinhands = FALSE)
- . = list()
+ . = ..()
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_shoes
- bloody_shoes = mutable_appearance('icons/effects/blood.dmi', "shoeblood")
- bloody_shoes.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_shoes
+ . += setup_blood_overlay()
/obj/item/clothing/shoes/examine(mob/user)
. = ..()
@@ -172,7 +170,7 @@
else // if one of us moved
user.visible_message("[our_guy] stamps on [user]'s hand, mid-shoelace [tied ? "knotting" : "untying"]!", "Ow! [our_guy] stamps on your hand!", list(our_guy))
to_chat(our_guy, "You stamp on [user]'s hand! What the- [user.p_they()] [user.p_were()] [tied ? "knotting" : "untying"] your shoelaces!")
- user.emote("scream")
+ user.force_scream()
if(istype(L))
var/obj/item/bodypart/ouchie = L.get_bodypart(pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
if(ouchie)
diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm
deleted file mode 100644
index 4ed246a587b..00000000000
--- a/code/modules/clothing/shoes/bananashoes.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-//banana flavored chaos and horror ahead
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes
- name = "mk-honk prototype shoes"
- desc = "Lost prototype of advanced clown tech. Powered by bananium, these shoes leave a trail of chaos in their wake."
- icon_state = "clown_prototype_off"
- actions_types = list(/datum/action/item_action/toggle)
- var/on = FALSE
- var/always_noslip = FALSE
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize()
- . = ..()
- if(always_noslip)
- clothing_flags |= NOSLIP
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/ComponentInitialize()
- . = ..()
- AddElement(/datum/element/update_icon_updates_onmob)
- AddComponent(/datum/component/material_container, list(/datum/material/hellstone), 200000, TRUE, /obj/item/stack)
- AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75, falloff_exponent = 20)
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/step_action()
- . = ..()
- var/mob/wearer = loc
- var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
- if(on && istype(wearer))
- if(bananium.get_material_amount(/datum/material/hellstone) < 100)
- on = !on
- if(!always_noslip)
- clothing_flags &= ~NOSLIP
- update_appearance()
- to_chat(loc, "You ran out of bananium!")
- else
- new /obj/item/grown/bananapeel/specialpeel(get_step(src,turn(wearer.dir, 180))) //honk
- bananium.use_amount_mat(100, /datum/material/hellstone)
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/attack_self(mob/user)
- var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
- var/sheet_amount = bananium.retrieve_all()
- if(sheet_amount)
- to_chat(user, "You retrieve [sheet_amount] sheets of bananium from the prototype shoes.")
- else
- to_chat(user, "You cannot retrieve any bananium from the prototype shoes!")
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/examine(mob/user)
- . = ..()
- . += "The shoes are [on ? "enabled" : "disabled"]."
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click(mob/user)
- var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
- if(bananium.get_material_amount(/datum/material/hellstone))
- on = !on
- update_appearance()
- to_chat(user, "You [on ? "activate" : "deactivate"] the prototype shoes.")
- if(!always_noslip)
- if(on)
- clothing_flags |= NOSLIP
- else
- clothing_flags &= ~NOSLIP
- else
- to_chat(user, "You need bananium to turn the prototype shoes on!")
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/update_icon_state()
- if(on)
- icon_state = "clown_prototype_on"
- else
- icon_state = "clown_prototype_off"
- return ..()
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 4c078a7e0ad..839dd3565ad 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -16,23 +16,6 @@
lace_time = 12 SECONDS
greyscale_icon_state = "boots"
-/obj/item/clothing/shoes/combat/sneakboots
- name = "sneakboots"
- desc = "These boots have special noise cancelling soles. Perfect for stealth, if it wasn't for the color scheme."
- icon_state = "sneakboots"
- item_state = "sneakboots"
- w_class = WEIGHT_CLASS_SMALL
- resistance_flags = FIRE_PROOF | ACID_PROOF
-
-/obj/item/clothing/shoes/combat/sneakboots/equipped(mob/living/carbon/human/user, slot)
- . = ..()
- if(slot == ITEM_SLOT_FEET)
- ADD_TRAIT(user, TRAIT_SILENT_FOOTSTEPS, SHOES_TRAIT)
-
-/obj/item/clothing/shoes/combat/sneakboots/dropped(mob/living/carbon/human/user)
- REMOVE_TRAIT(user, TRAIT_SILENT_FOOTSTEPS, SHOES_TRAIT)
- return ..()
-
/obj/item/clothing/shoes/combat/swat //overpowered boots for death squads
name = "\improper SWAT boots"
desc = "High speed, no drag combat boots."
@@ -84,61 +67,6 @@
can_be_tied = FALSE
greyscale_icon_state = "boots"
-/obj/item/clothing/shoes/galoshes/dry
- name = "absorbent galoshes"
- desc = "A pair of orange rubber boots, designed to prevent slipping on wet surfaces while also drying them."
- icon_state = "galoshes_dry"
-
-/obj/item/clothing/shoes/galoshes/dry/step_action()
- var/turf/open/t_loc = get_turf(src)
- SEND_SIGNAL(t_loc, COMSIG_TURF_MAKE_DRY, TURF_WET_WATER, TRUE, INFINITY)
-
-/obj/item/clothing/shoes/clown_shoes
- desc = "The prankster's standard-issue clowning shoes. Damn, they're huge! Ctrl-click to toggle waddle dampeners."
- name = "clown shoes"
- icon_state = "clown"
- item_state = "clown_shoes"
- slowdown = SHOES_SLOWDOWN+1
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes/clown
- var/enabled_waddle = TRUE
- lace_time = 20 SECONDS // how the hell do these laces even work??
-
-/obj/item/clothing/shoes/clown_shoes/Initialize()
- . = ..()
- AddComponent(/datum/component/squeak, list('sound/effects/clownstep1.ogg'=1,'sound/effects/clownstep2.ogg'=1), 50, falloff_exponent = 20) //die off quick please)
-
-/obj/item/clothing/shoes/clown_shoes/equipped(mob/user, slot)
- . = ..()
- if(slot == ITEM_SLOT_FEET)
- if(enabled_waddle)
- user.AddElement(/datum/element/waddling)
- if(user.mind && user.mind.assigned_role == "Clown")
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "clownshoes", /datum/mood_event/clownshoes)
-
-/obj/item/clothing/shoes/clown_shoes/dropped(mob/user)
- . = ..()
- user.RemoveElement(/datum/element/waddling)
- if(user.mind && user.mind.assigned_role == "Clown")
- SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "clownshoes")
-
-/obj/item/clothing/shoes/clown_shoes/CtrlClick(mob/living/user)
- if(!isliving(user))
- return
- if(user.get_active_held_item() != src)
- to_chat(user, "You must hold the [src] in your hand to do this!")
- return
- if (!enabled_waddle)
- to_chat(user, "You switch off the waddle dampeners!")
- enabled_waddle = TRUE
- else
- to_chat(user, "You switch on the waddle dampeners!")
- enabled_waddle = FALSE
-
-/obj/item/clothing/shoes/clown_shoes/jester
- name = "jester shoes"
- desc = "A court jester's shoes, updated with modern squeaking technology."
- icon_state = "jester_shoes"
-
/obj/item/clothing/shoes/jackboots
name = "jackboots"
desc = "Ankle-high combat boots for combat scenarios or combat situations. All combat, all the time."
@@ -198,59 +126,12 @@
icon_state = "explorer"
resistance_flags = FIRE_PROOF
-/obj/item/clothing/shoes/cult
- name = "\improper Nar'Sien invoker boots"
- desc = "A pair of boots worn by the followers of Nar'Sie."
- icon_state = "cult"
- item_state = "cult"
- cold_protection = FEET
- min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
- heat_protection = FEET
- max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
- lace_time = 10 SECONDS
- greyscale_icon_state = "boots"
-
-/obj/item/clothing/shoes/cult/alt
- name = "cultist boots"
- icon_state = "cultalt"
-
-/obj/item/clothing/shoes/cult/alt/ghost
- item_flags = DROPDEL
-
-/obj/item/clothing/shoes/cult/alt/ghost/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
-
-/obj/item/clothing/shoes/cyborg
- name = "cyborg boots"
- desc = "Shoes for a cyborg costume."
- icon_state = "boots"
-
/obj/item/clothing/shoes/laceup
name = "laceup shoes"
desc = "The height of fashion, and they're pre-polished!"
icon_state = "laceups"
equip_delay_other = 50
-/obj/item/clothing/shoes/roman
- name = "roman sandals"
- desc = "Sandals with buckled leather straps on it."
- icon_state = "roman"
- item_state = "roman"
- strip_delay = 100
- equip_delay_other = 100
- permeability_coefficient = 0.9
- can_be_tied = FALSE
-
-/obj/item/clothing/shoes/griffin
- name = "griffon boots"
- desc = "A pair of costume boots fashioned after bird talons."
- icon_state = "griffinboots"
- item_state = "griffinboots"
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
- lace_time = 8 SECONDS
- greyscale_icon_state = "boots"
-
/obj/item/clothing/shoes/bhop
name = "jump boots"
desc = "The EXOCOM's Cortez launch boot line represents a specialized pair of mining boots with a built-in propulsion system, designed for rapid foward movement."
@@ -287,57 +168,6 @@
else
to_chat(user, "Something prevents you from dashing forward!")
-/obj/item/clothing/shoes/bronze
- name = "bronze boots"
- desc = "A giant, clunky pair of shoes crudely made out of bronze. Why would anyone wear these?"
- icon = 'icons/obj/clothing/clockwork_garb.dmi'
- icon_state = "clockwork_treads"
- lace_time = 8 SECONDS
- greyscale_icon_state = "boots"
-
-/obj/item/clothing/shoes/bronze/Initialize()
- . = ..()
- AddComponent(/datum/component/squeak, list('sound/machines/clockcult/integration_cog_install.ogg' = 1, 'sound/magic/clockwork/fellowship_armory.ogg' = 1), 50, extrarange = SHORT_RANGE_SOUND_EXTRARANGE)
-
-/obj/item/clothing/shoes/wheelys
- name = "Wheely-Heels"
- desc = "Uses patented retractable wheel technology. Never sacrifice speed for style - not that this provides much of either." //Thanks Fel
- icon_state = "wheelys"
- item_state = "wheelys"
- actions_types = list(/datum/action/item_action/wheelys)
- var/wheelToggle = FALSE //False means wheels are not popped out
- var/obj/vehicle/ridden/scooter/wheelys/W
-
-/obj/item/clothing/shoes/wheelys/Initialize()
- . = ..()
- W = new /obj/vehicle/ridden/scooter/wheelys(null)
-
-/obj/item/clothing/shoes/wheelys/ui_action_click(mob/user, action)
- if(!isliving(user))
- return
- if(!istype(user.get_item_by_slot(ITEM_SLOT_FEET), /obj/item/clothing/shoes/wheelys))
- to_chat(user, "You must be wearing the wheely-heels to use them!")
- return
- if(!(W.is_occupant(user)))
- wheelToggle = FALSE
- if(wheelToggle)
- W.unbuckle_mob(user)
- wheelToggle = FALSE
- return
- W.forceMove(get_turf(user))
- W.buckle_mob(user)
- wheelToggle = TRUE
-
-/obj/item/clothing/shoes/wheelys/dropped(mob/user)
- if(wheelToggle)
- W.unbuckle_mob(user)
- wheelToggle = FALSE
- ..()
-
-/obj/item/clothing/shoes/wheelys/Destroy()
- QDEL_NULL(W)
- . = ..()
-
/obj/item/clothing/shoes/kindleKicks
name = "Kindle Kicks"
desc = "They'll sure kindle something in you, and it's not childhood nostalgia..."
@@ -351,7 +181,6 @@
var/lightCycle = 0
var/active = FALSE
-
/obj/item/clothing/shoes/kindleKicks/ui_action_click(mob/user, action)
if(active)
return
@@ -388,6 +217,9 @@
var/mob/living/simple_animal/hostile/retaliate/poison/snake/bootsnake = new/mob/living/simple_animal/hostile/retaliate/poison/snake(src)
occupants += bootsnake
+/obj/item/clothing/shoes/cowboy/Destroy()
+ QDEL_LIST(occupants)
+ return ..()
/obj/item/clothing/shoes/cowboy/equipped(mob/living/carbon/user, slot)
. = ..()
@@ -433,21 +265,3 @@
desc = "A pair of authentic haute couture boots. You doubt they have ever been close to cattle."
icon_state = "cowboy_fancy"
permeability_coefficient = 0.08
-
-/obj/item/clothing/shoes/cookflops
- desc = "All this talk of antags, greytiding, and griefing... I just wanna grill for god's sake!"
- name = "grilling sandals"
- icon_state = "cookflops"
- can_be_tied = FALSE
-
-/obj/item/clothing/shoes/yakuza
- name = "tojo clan shoes"
- desc = "Steel-toed and intimidating."
- icon_state = "MajimaShoes"
- item_state = "MajimaShoes_worn"
-
-/obj/item/clothing/shoes/jackbros
- name = "frosty boots"
- desc = "For when you're stepping on up to the plate."
- icon_state = "JackFrostShoes"
- item_state = "JackFrostShoes_worn"
diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
index cb98f607089..f96ad54adb8 100644
--- a/code/modules/clothing/spacesuits/_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -18,7 +18,7 @@
flash_protect = FLASH_PROTECTION_WELDER
strip_delay = 50
equip_delay_other = 50
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
resistance_flags = NONE
dog_fashion = null
content_overlays = FALSE
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 4827186a95c..00e527a3161 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -17,7 +17,7 @@
actions_types = list(/datum/action/item_action/toggle_helmet)
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+ visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
var/rad_count = 0
var/rad_record = 0
var/grace_count = 0
@@ -105,7 +105,7 @@
max_integrity = 300
armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 50, "acid" = 75)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser)
- siemens_coefficient = 0
+ siemens_coefficient = 0.5
var/obj/item/clothing/head/helmet/space/hardsuit/helmet
actions_types = list(/datum/action/item_action/toggle_helmet)
var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
@@ -207,6 +207,7 @@
desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
icon_state = "hardsuit-engineering"
item_state = "eng_hardsuit"
+ siemens_coefficient = 0
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine
@@ -304,7 +305,6 @@
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining/heavy
custom_price = 4500
- slowdown = 0.5
/obj/item/clothing/head/helmet/space/hardsuit/mining/heavy
name = "heavy mining helmet"
@@ -386,13 +386,11 @@
if(on)
linkedsuit.name = initial(linkedsuit.name)
linkedsuit.desc = initial(linkedsuit.desc)
- linkedsuit.slowdown = 1
linkedsuit.clothing_flags |= STOPSPRESSUREDAMAGE
linkedsuit.cold_protection |= CHEST | GROIN | LEGS | FEET | ARMS | HANDS
else
linkedsuit.name += " (combat)"
linkedsuit.desc = linkedsuit.alt_desc
- linkedsuit.slowdown = linkedsuit.combat_slowdown
linkedsuit.clothing_flags &= ~STOPSPRESSUREDAMAGE
linkedsuit.cold_protection &= ~(CHEST | GROIN | LEGS | FEET | ARMS | HANDS)
if(linkedsuit.lightweight)
@@ -413,16 +411,16 @@
item_state = "syndie_hardsuit"
hardsuit_type = "syndi"
armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)
- allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
jetpack = /obj/item/tank/jetpack/suit
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
- var/combat_slowdown = 0 //slowdown when in combat mode
+ slowdown = 0.5
var/lightweight = 0 //used for flags when toggling
//Ramzi Syndie suit
/obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi
- name = "rusted-red hardsuit helmet"
+ name = "rust-red hardsuit helmet"
desc = "A beat-up standardized dual-mode helmet derived from more advanced special operations helmets, its red rusted into a dirty brown. It is in EVA mode. Manufactured by Ramzi Clique."
alt_desc = "A beat-up standardized dual-mode helmet derived from more advanced special operations helmets, its red rusted into a dirty brown. It is in combat mode. Manufactured by Ramzi Clique."
icon_state = "hardsuit1-ramzi"
@@ -431,17 +429,16 @@
armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
/obj/item/clothing/suit/space/hardsuit/syndi/ramzi
- name = "rusted-red hardsuit"
+ name = "rust-red hardsuit"
desc = "A beat-up standardized dual-mode hardsuit derived from more advanced special operations hardsuits, its red rusted into a dirty brown. It is in EVA mode. Manufactured by Ramzi Clique."
alt_desc = "A beat-up standardized dual-mode hardsuit derived from more advanced special operations hardsuits, its red rusted into a dirty brown. It is in combat mode. Manufactured by Ramzi Clique."
icon_state = "hardsuit1-ramzi"
item_state = "hardsuit1-ramzi"
hardsuit_type = "ramzi"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi
- lightweight = 1
jetpack = null
armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
- combat_slowdown = 0.5
+ slowdown = 0.7
jetpack = null
//Elite Syndie suit
@@ -509,7 +506,6 @@
armor = list("melee" = 25, "bullet" = 25, "laser" = 35, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 65, "fire" = 75, "acid" = 40)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed
supports_variations = VOX_VARIATION
- combat_slowdown = 0.4
jetpack = null
/obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed
@@ -666,6 +662,7 @@
item_state = "sec_hardsuit"
armor = list("melee" = 35, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security
+ slowdown = 0.5
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
/obj/item/clothing/suit/space/hardsuit/security/Initialize()
@@ -734,23 +731,6 @@
item_state = "capspacesuit"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/swat/captain
- //Clown
-/obj/item/clothing/head/helmet/space/hardsuit/clown
- name = "cosmohonk hardsuit helmet"
- desc = "A special helmet designed for work in a hazardous, low-humor environment. Has radiation shielding."
- icon_state = "hardsuit0-clown"
- item_state = "hardsuit0-clown"
- armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 30)
- hardsuit_type = "clown"
-
-/obj/item/clothing/suit/space/hardsuit/clown
- name = "cosmohonk hardsuit"
- desc = "A special suit that protects against hazardous, low humor environments. Has radiation shielding. Only a true clown can wear it."
- icon_state = "hardsuit-clown"
- item_state = "clown_hardsuit"
- armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 30)
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/clown
-
//Old Prototype
/obj/item/clothing/head/helmet/space/hardsuit/ancient
name = "prototype RIG hardsuit helmet"
@@ -863,7 +843,7 @@
C.update_inv_wear_suit()
/obj/item/clothing/suit/space/hardsuit/shielded/worn_overlays(isinhands)
- . = list()
+ . = ..()
if(!isinhands)
. += mutable_appearance('icons/effects/effects.dmi', shield_state, MOB_LAYER + 0.01)
@@ -936,9 +916,9 @@
item_state = "syndie_hardsuit"
hardsuit_type = "syndi"
armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100)
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi
- slowdown = 0
+ slowdown = 0.5
shield_state = "shield-red"
shield_on = "shield-red"
jetpack = /obj/item/tank/jetpack/suit
@@ -1045,7 +1025,7 @@
item_state = "independent_sec_helm"
hardsuit_type = "independent-sec"
armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
- supports_variations = VOX_VARIATION
+ supports_variations = VOX_VARIATION | SNOUTED_VARIATION
/obj/item/clothing/suit/space/hardsuit/security/independent
icon_state = "hardsuit-independent-sec"
@@ -1056,7 +1036,7 @@
hardsuit_type = "independent-sec"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent
armor = list("melee" = 35, "bullet" = 25, "laser" = 20, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
- supports_variations = VOX_VARIATION
+ supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION
//Mining
/obj/item/clothing/head/helmet/space/hardsuit/mining/independent
@@ -1082,6 +1062,7 @@
icon_state = "space-independent-eng"
item_state = "space-independent-eng"
desc = "A civilian space suit designed for construction and salvage in hazardous, low-pressure environments. Has shielding against radiation and heat and abundant storage. Though they lack the physical protection of more expensive hardsuits, this type of suit is extremely common wherever construction and salvage work must be done in open space."
+ siemens_coefficient = 0
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 20, "bomb" = 0, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large
resistance_flags = FIRE_PROOF
@@ -1106,7 +1087,7 @@
name = "pilot space suit"
icon_state = "space-pilot"
item_state = "space-pilot"
- desc = "A lightweight, unarmored space suit designed for mech and fighter pilots. Special attachment points make mounting and dismounting from mechs much easier."
+ desc = "A lightweight, unarmored space suit designed for exosuit and shuttle pilots. Special attachment points make mounting and dismounting from exosuits much easier."
clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | FAST_EMBARK
pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large
@@ -1114,7 +1095,7 @@
name = "pilot helmet"
icon_state = "space-pilot-plain0"
item_state = "space-pilot-plain"
- desc = "A specialized space helmet designed for mech and fighter pilots. Offers limited impact protection."
+ desc = "A specialized space helmet designed for exosuit and shuttle pilots. Offers limited impact protection."
var/skin = "plain"
var/blurb = " Its simple design is quite ancient."
up = FALSE
@@ -1147,7 +1128,7 @@
if("corvid")
blurb = " It is sloppily painted with thin teal and red paint. There are some dark stains on the lining..."
- desc = "A specialized space helmet designed for mech and fighter pilots. Offers limited impact protection.[blurb]"
+ desc = "A specialized space helmet designed for exosuit and shuttle pilots. Offers limited impact protection.[blurb]"
update_icon_state()
/obj/item/clothing/head/helmet/space/pilot/random/New()
@@ -1217,7 +1198,8 @@
item_state = "hardsuit_solgov"
armor = list("melee" = 50, "bullet" = 45, "laser" = 40, "energy" = 30, "bomb" = 60, "bio" = 100, "rad" = 60, "fire" = 90, "acid" = 75) //intentionally the fucking strong, this is master chief-tier armor //is this really what you call the strong?? is this the best solgov has to offer??????
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov
- slowdown = 0
+ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ slowdown = 0.5
supports_variations = DIGITIGRADE_VARIATION
/obj/item/clothing/head/helmet/space/hardsuit/quixote
@@ -1241,7 +1223,7 @@
actions_types = list(/datum/action/item_action/toggle_helmet)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/quixote
jetpack = /obj/item/tank/jetpack/suit
- slowdown = 0
+ slowdown = 0.3
max_heat_protection_temperature = 20000
var/datum/action/innate/quixotejump/jump
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 67dc7ce529b..8cf3da8547c 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -36,7 +36,7 @@ Contains:
desc = "A prototype designed to replace the ageing MK.II SWAT suit. Based on the streamlined MK.II model, the traditional ceramic and graphene plate construction was replaced with plasteel, allowing superior armor against most threats. There's room for some kind of energy projection device on the back."
icon_state = "deathsquad"
item_state = "swat_suit"
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/knife/combat)
armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 60, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
strip_delay = 130
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
@@ -50,7 +50,7 @@ Contains:
desc = "A tactical space suit first developed in a joint effort by the defunct IS-ERI and Nanotrasen in 20XX for military space operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!"
icon_state = "heavy"
item_state = "swat_suit"
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/knife/combat)
armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100)
strip_delay = 120
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -153,7 +153,7 @@ Contains:
desc = "Yarr."
w_class = WEIGHT_CLASS_NORMAL
flags_inv = 0
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/saber/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/energy/sword/saber/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
slowdown = 0
armor = list("melee" = 30, "bullet" = 50, "laser" = 30,"energy" = 40, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 60, "acid" = 75)
strip_delay = 40
@@ -363,7 +363,7 @@ Contains:
armor = list("melee" = 30, "bullet" = 10, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 10, "fire" = 100, "acid" = 100)
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife, /obj/item/kinetic_crusher, /obj/item/resonator, /obj/item/melee/transforming/cleaving_saw)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/melee/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kinetic_crusher, /obj/item/resonator, /obj/item/melee/cleaving_saw)
/obj/item/clothing/suit/space/hardsuit/berserker/RemoveHelmet()
var/obj/item/clothing/head/helmet/space/hardsuit/berserker/helm = helmet
@@ -489,7 +489,7 @@ Contains:
desc = "A custom version of the MK.II SWAT suit, modified to look rugged and tough. Works as a space suit, if you can find a helmet."
icon_state = "hunter"
item_state = "swat_suit"
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/knife/combat)
armor = list("melee" = 60, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
strip_delay = 130
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -525,7 +525,7 @@ Contains:
icon_state = "vacsuit_solgov"
desc = "Originally designed by independent contractors on Luna for the purposes of survival in hazardous environments, the lightweight Tortoise Microlite Armored Suit now sees widespread use by SolGov's exploration teams."
item_state = "vacsuit_solgov"
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy, /obj/item/tank/internals)
armor = list("bio" = 100, "rad" = 50, "fire" = 60, "acid" = 75)
slowdown = 0.5
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 43dc5a5dd8d..6f8269357eb 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -4,7 +4,7 @@
/obj/item/clothing/suit/space/eva/plasmaman
name = "EVA plasma envirosuit"
desc = "A special plasma containment suit designed to be space-worthy, as well as worn over other clothing. Like its smaller counterpart, it can automatically extinguish the wearer in a crisis, and holds twice as many charges."
- allowed = list(/obj/item/gun, /obj/item/ammo_casing, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank)
+ allowed = list(/obj/item/gun, /obj/item/ammo_casing, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75)
resistance_flags = FIRE_PROOF
icon_state = "plasmaman_suit"
@@ -58,7 +58,7 @@
actions_types = list(/datum/action/item_action/toggle_helmet_light)
visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF
+ flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF | SEALS_EYES
visor_flags_inv = HIDEEYES|HIDEFACE
// WS Begin - plasmeme command helmets buff - used for RD bomb scanner
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index e5a98c7215e..2b2660af4f9 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -4,7 +4,7 @@
icon_state = "syndicate"
item_state = "syndicate"
desc = "An advanced, lightweight space helmet made of durable composites. Almost matches integrated hardsuit helmets for protection. Almost."
- armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
+ armor = list("melee" = 30, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
supports_variations = VOX_VARIATION
/obj/item/clothing/suit/space/syndicate
@@ -13,8 +13,11 @@
item_state = "space_suit_syndicate"
desc = "A space suit made of high-grade ballistic fabric with integrated armor plates. More compact than a normal space suit while almost matching powered hardsuits for protection. Almost."
w_class = WEIGHT_CLASS_NORMAL
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
- armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
+ armor = list("melee" = 30, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
+
+/obj/item/clothing/suit/space/syndicate/Initialize()
+ . = ..()
+ allowed = GLOB.security_hardsuit_allowed
//Green syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/green
@@ -105,6 +108,7 @@
icon_state = "syndicate-helm-black-med"
item_state = "syndicate-helm-black"
+
/obj/item/clothing/suit/space/syndicate/black/med
name = "green space suit"
icon_state = "syndicate-black-med"
@@ -164,6 +168,7 @@
icon_state = "syndicate-black-engie"
item_state = "syndicate-black"
desc = "A space suit made of high-grade ballistic fabric with thermal and radiation shielding. More compact than a normal space suit while amost matching powered hardsuits for protection. Almost."
+ siemens_coefficient = 0
armor = list("melee" = 30, "bullet" = 10, "laser" = 10, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser)
resistance_flags = FIRE_PROOF
diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm
index 0e7edb63f06..cd8a24e20ae 100644
--- a/code/modules/clothing/suits/_suits.dm
+++ b/code/modules/clothing/suits/_suits.dm
@@ -9,7 +9,7 @@
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
slot_flags = ITEM_SLOT_OCLOTHING
- var/blood_overlay_type = "suit"
+ blood_overlay_type = "suit"
var/togglename = null
var/suittoggled = FALSE
pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo //WS Edit - Exowear Pockets
@@ -19,14 +19,13 @@
mob_overlay_icon = 'icons/mob/clothing/suit.dmi'
/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
- . = list()
+ . = ..()
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_armor = mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood")
- bloody_armor.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_armor
+ . += setup_blood_overlay()
+
var/mob/living/carbon/human/M = loc
if(ishuman(M) && M.w_uniform)
var/obj/item/clothing/under/U = M.w_uniform
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 9dfd23210d9..f3fd5dc403a 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -2,7 +2,7 @@
icon = 'icons/obj/clothing/suits/armor.dmi'
mob_overlay_icon = 'icons/mob/clothing/suits/armor.dmi'
allowed = null
- body_parts_covered = CHEST
+ body_parts_covered = CHEST|GROIN
cold_protection = CHEST|GROIN
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN
@@ -11,7 +11,7 @@
equip_delay_other = 40
max_integrity = 250
resistance_flags = NONE
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
greyscale_colors = list(list(18, 19), list(13, 18), list(20, 15))
greyscale_icon_state = "armor"
@@ -47,22 +47,32 @@
icon_state = "marine_light"
item_state = "armor"
clothing_flags = THICKMATERIAL
- body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- armor = list("melee" = 50, "bullet" = 75, "laser" = 55, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50)
- cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
+ body_parts_covered = CHEST|GROIN
+ armor = list("melee" = 20, "bullet" = 45, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 65, "fire" = 40, "acid" = 50)
+ cold_protection = CHEST|GROIN
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
- heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ heat_protection = CHEST|GROIN
resistance_flags = FIRE_PROOF | ACID_PROOF
supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
- slowdown = 0.5
+ slowdown = 0 //one day...
/obj/item/clothing/suit/armor/vest/marine/medium
name = "medium tactical armor vest"
icon_state = "marine_medium"
+ body_parts_covered = CHEST|GROIN|LEGS|ARMS
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ heat_protection = CHEST|GROIN|LEGS|ARMS
+ armor = list("melee" = 35, "bullet" = 50, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50)
+ slowdown = 0.4
/obj/item/clothing/suit/armor/vest/marine/heavy
- name = "large tactical armor vest"
+ name = "heavy tactical armor vest"
icon_state = "marine_heavy"
+ body_parts_covered = CHEST|GROIN|LEGS|ARMS
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ heat_protection = CHEST|GROIN|LEGS|ARMS
+ armor = list("melee" = 60, "bullet" = 60, "laser" = 55, "energy" = 25, "bomb" = 50, "bio" = 75, "fire" = 40, "acid" = 50)
+ slowdown = 0.8
/obj/item/clothing/suit/armor/vest/old
name = "degrading armor vest"
@@ -81,7 +91,6 @@
desc = "A long, intimidating black coat. This one is reinforced and ideal for protecting its wearer from rain, sun, dust, and bullets."
icon_state = "armor_duster"
item_state = "duster_sec"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
@@ -90,8 +99,7 @@
desc = "A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence."
icon_state = "armor_hos"
item_state = "greatcoat"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
- armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
strip_delay = 80
@@ -108,7 +116,6 @@
desc = "A black armored jacket with silver shoulder designations and '/Warden/' stitched into one of the chest pockets."
icon_state = "armor_warden"
item_state = "armor"
- body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS|HANDS
heat_protection = CHEST|GROIN|ARMS|HANDS
strip_delay = 70
@@ -135,7 +142,6 @@
desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Nanotrasen Security."
icon_state = "armor_leathercoat-sec"
item_state = "hostrench"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
dog_fashion = null
@@ -145,7 +151,6 @@
desc = "A fireproof armored chestpiece reinforced with ceramic plates and plasteel pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to NT's finest, although it does chafe your nipples."
icon_state = "carapace_nt"
item_state = "armor"
- body_parts_covered = CHEST|GROIN
armor = list("melee" = 50, "bullet" = 40, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
dog_fashion = null
resistance_flags = FIRE_PROOF
@@ -209,7 +214,6 @@
icon_state = "laserproof"
item_state = "armor_reflec"
blood_overlay_type = "armor"
- body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
heat_protection = CHEST|GROIN|ARMS
armor = list("melee" = 10, "bullet" = 10, "laser" = 60, "energy" = 60, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
@@ -283,7 +287,7 @@
desc = "A classic suit of plate armour, highly effective at stopping melee attacks."
icon_state = "riot_knight_green"
item_state = "riot_knight_green"
- allowed = list(/obj/item/nullrod, /obj/item/claymore, /obj/item/banner, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/melee/sword/claymore, /obj/item/banner, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen, /obj/item/tank/internals/plasmaman)
/obj/item/clothing/suit/armor/riot/knight/yellow
icon_state = "riot_knight_yellow"
@@ -330,7 +334,7 @@
icon_state = "armor_inteq_honorable_battlecoat"
item_state = "inteq_honorable_battlecoat"
armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
- supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+ supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
/obj/item/clothing/suit/armor/inteq/corpsman
name = "inteq corpsman vest"
@@ -360,28 +364,37 @@
/obj/item/melee/baton,
)
-/obj/item/clothing/suit/armor/vest/bulletproof/solgov
+/obj/item/clothing/suit/armor/vest/solgov
name = "\improper Sonnensoldner gambison"
desc = "A standard armor vest fielded for SolGov's Sonnensoldners."
icon_state = "solgov_gambison"
item_state = "solgov_gambison"
supports_variations = DIGITIGRADE_VARIATION
+ body_parts_covered = CHEST|GROIN
+ cold_protection = CHEST|GROIN|ARMS
+ heat_protection = CHEST|GROIN|ARMS
-/obj/item/clothing/suit/armor/vest/bulletproof/solgov/overseer
+/obj/item/clothing/suit/armor/vest/solgov/overseer
name = "\improper SolGov Overseer robe"
desc = "An elaborately designed robe utilized by SolGov overseers."
icon_state = "solgov_overseer_robe"
item_state = "solgov_overseer_robe"
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ heat_protection = CHEST|GROIN|LEGS|ARMS
-/obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain
+/obj/item/clothing/suit/armor/vest/solgov/captain
name = "\improper SolGov Captain coat"
desc = "An armored coat typically used by SolGov captains."
icon_state = "solgov_coat"
item_state = "solgov_coat"
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ heat_protection = CHEST|GROIN|LEGS|ARMS
-/obj/item/clothing/suit/armor/vest/bulletproof/solgov/Initialize()
+/obj/item/clothing/suit/armor/vest/solgov/Initialize()
. = ..()
allowed |= list(/obj/item/gun/ballistic/automatic/assault/swiss_cheese, /obj/item/tank)
@@ -397,13 +410,6 @@
icon_state = "armor_syndie"
item_state = "syndiearmor"
-/obj/item/clothing/suit/armor/vest/scrap_armor
- name = "scrap armor"
- desc = "An 'armor' vest consisting of sheet metal held together with cable. Who thought this was a good idea?"
- icon_state = "scraparmor"
- item_state = "scraparmor"
- armor = list("melee" = 5)
-
/obj/item/clothing/suit/armor/curator
name = "treasure hunter's coat"
desc = "Both fashionable and lightly armoured, this jacket is favoured by treasure hunters the galaxy over."
@@ -421,7 +427,6 @@
desc = "A solgov official's trenchcoat. Has a lot of pockets."
icon_state = "armor_solgov_trenchcoat"
item_state = "trenchcoat_solgov"
- body_parts_covered = CHEST|LEGS|ARMS
armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
cold_protection = CHEST|LEGS|ARMS
heat_protection = CHEST|LEGS|ARMS
@@ -430,7 +435,6 @@
//JACKETS
/obj/item/clothing/suit/armor/vest/security
item_state = "armor"
- body_parts_covered = CHEST|ARMS
cold_protection = CHEST|GROIN|ARMS|HANDS
heat_protection = CHEST|GROIN|ARMS|HANDS
strip_delay = 70
@@ -441,32 +445,27 @@
name = "security officer's jacket"
desc = "This jacket is for those special occasions when a security officer isn't required to wear their armor."
icon_state = "armor_officerjacket"
- body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/armor/vest/security/warden
name = "warden's jacket"
desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig."
icon_state = "armor_warden"
- body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/armor/vest/security/hos
name = "head of security's jacket"
desc = "This piece of clothing was specifically designed for asserting superior authority."
icon_state = "armor_hosjacket"
- body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/armor/vest/security/brig_phys
name = "brig physician's jacket"
desc = "A black jacket with dark blue and silver accents, for the brig physician to prove they're a real member of security in style."
icon_state = "armor_brigphysjacket"
- body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/toggle/armor/vest/centcom_formal
name = "\improper CentCom formal coat"
desc = "A stylish coat given to CentCom Commanders. Perfect for sending ERTs to suicide missions with style!"
icon_state = "centcom_formal"
item_state = "centcom"
- body_parts_covered = CHEST|GROIN|ARMS
armor = list("melee" = 35, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 60)
togglename = "buttons"
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 1131c4e9166..c62d0e92b8c 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -8,7 +8,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 30, "acid" = 100)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
resistance_flags = ACID_PROOF
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
/obj/item/clothing/suit/bio_suit
name = "bio suit"
@@ -98,4 +98,4 @@
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit/Initialize()
. = ..()
- allowed += list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/cane)
+ allowed += list(/obj/item/storage/book/bible, /obj/item/cane)
diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm
index 58802e01b8a..30436045da2 100644
--- a/code/modules/clothing/suits/chaplainsuits.dm
+++ b/code/modules/clothing/suits/chaplainsuits.dm
@@ -1,73 +1,7 @@
//Chaplain Suit Subtypes
//If any new staple chaplain items get added, put them in these lists
/obj/item/clothing/suit/chaplainsuit
- allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = list(/obj/item/storage/book/bible, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
/obj/item/clothing/suit/hooded/chaplainsuit
- allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
-
-//Suits
-/obj/item/clothing/suit/chaplainsuit/holidaypriest
- name = "holiday priest"
- desc = "This is a nice holiday, my son."
- icon_state = "holidaypriest"
- item_state = "w_suit"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
-
-/obj/item/clothing/suit/chaplainsuit/nun
- name = "nun robe"
- desc = "Maximum piety in this star system."
- icon_state = "nun"
- item_state = "nun"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
- flags_inv = HIDESHOES|HIDEJUMPSUIT
-
-/obj/item/clothing/suit/chaplainsuit/bishoprobe
- name = "bishop's robes"
- desc = "Glad to see the tithes you collected were well spent."
- icon_state = "bishoprobe"
- item_state = "bishoprobe"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
-
-/obj/item/clothing/suit/hooded/chaplainsuit/monkhabit
- name = "monk's habit"
- desc = "A few steps above rended sackcloth."
- icon_state = "monkfrock"
- item_state = "monkfrock"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- hoodtype = /obj/item/clothing/head/hooded/monkhabit
-
-/obj/item/clothing/head/hooded/monkhabit
- name = "monk's hood"
- desc = "For when a man wants to cover up his tonsure."
- icon_state = "monkhood"
- item_state = "monkhood"
- body_parts_covered = HEAD
- flags_inv = HIDEHAIR|HIDEEARS
-
-/obj/item/clothing/suit/chaplainsuit/monkrobeeast
- name = "eastern monk's robes"
- desc = "Best combined with a shaved head."
- icon_state = "monkrobeeast"
- item_state = "monkrobeeast"
- body_parts_covered = GROIN|LEGS
- flags_inv = HIDEJUMPSUIT
-
-/obj/item/clothing/suit/chaplainsuit/whiterobe
- name = "white robe"
- desc = "Good for clerics and sleepy crewmembers."
- icon_state = "whiterobe"
- item_state = "whiterobe"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
-
-/obj/item/clothing/suit/chaplainsuit/clownpriest
- name = "Robes of the Honkmother"
- desc = "Meant for a clown of the cloth."
- icon_state = "clownpriest"
- item_state = "clownpriest"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
- allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/reagent_containers/food/snacks/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/reagent_containers/food/snacks/grown/banana)
+ allowed = list(/obj/item/storage/book/bible, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm
index 4e3f6d5e3a9..1524a4aa646 100644
--- a/code/modules/clothing/suits/cloaks.dm
+++ b/code/modules/clothing/suits/cloaks.dm
@@ -5,7 +5,6 @@
desc = "It's a cape that can be worn around your neck."
icon = 'icons/obj/clothing/cloaks.dmi'
icon_state = "qmcloak"
- item_state = "qmcloak"
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDESUITSTORAGE
@@ -76,7 +75,7 @@
name = "goliath cloak"
icon_state = "goliath_cloak"
desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits."
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/melee/spear, /obj/item/organ/regenerative_core/legion, /obj/item/melee/knife/bone, /obj/item/melee/knife/survival)
armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot
hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath
body_parts_covered = CHEST|GROIN|ARMS
@@ -94,7 +93,7 @@
name = "drake armour"
icon_state = "dragon"
desc = "A suit of armour fashioned from the remains of an ash drake."
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/spear)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/melee/spear)
armor = list("melee" = 50, "bullet" = 10, "laser" = 40, "energy" = 50, "bomb" = 50, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100)
hoodtype = /obj/item/clothing/head/hooded/cloakhood/drake
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
@@ -180,19 +179,3 @@
resistance_flags = NONE
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = HEADCOVERSEYES
-
-/obj/item/clothing/suit/hooded/cloak/goliath/polar
- name = "polar cloak"
- icon_state = "polarcloak"
- hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath/polar
- desc = "A tribal hood made from a polar bears pelt. Keeps it's wearer warm and looks badass while doing it."
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- cold_protection = CHEST|GROIN|LEGS|FEET|ARMS
-
-/obj/item/clothing/head/hooded/cloakhood/goliath/polar
- name = "polar cloak"
- icon_state = "hoodie_gray"
- mob_overlay_state = "polhood"
- desc = "Wear bear on head show little man you big man, kill bear for cloak."
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- cold_protection = HEAD
diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm
index f58d445c53f..e1507af5c22 100644
--- a/code/modules/clothing/suits/hoodies.dm
+++ b/code/modules/clothing/suits/hoodies.dm
@@ -1,6 +1,7 @@
/obj/item/clothing/suit/hooded/hoodie
name = "hoodie"
desc = "HOW"
+ icon_state = null
hoodtype = /obj/item/clothing/head/hooded/hood
body_parts_covered = CHEST|ARMS
pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large
@@ -11,6 +12,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/lighter,
/obj/item/radio,
+ /obj/item/storage/pill_bottle
)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) //it's just a hoodie.
supports_variations = KEPORI_VARIATION
@@ -18,6 +20,9 @@
/obj/item/clothing/head/hooded/hood
name = "hood"
desc = "HOW"
+ icon_state = null
+ icon = 'icons/obj/clothing/head/winterhood.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/head/winterhood.dmi'
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) //it's just a hoodie.
@@ -115,3 +120,9 @@
icon_state = "hoodie_rilena"
item_state = "hoodie_rilena"
+/obj/item/clothing/suit/hooded/hoodie/blackwa
+ name = "black and white hoodie"
+ desc = "A hoodie that is black, with a white hood. It has a comfy pocket for keeping your hands warm."
+ icon_state = "hoodie_bwa"
+ item_state = "hoodie_bwa"
+ hoodtype = /obj/item/clothing/head/hooded/hood/gray
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 56018c288b6..03822d3f7a1 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -114,6 +114,8 @@
item_state = "highvis"
blood_overlay_type = "coat"
body_parts_covered = CHEST|ARMS
+ cold_protection = CHEST|ARMS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
togglename = "zipper"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/radio)
resistance_flags = NONE
@@ -194,7 +196,7 @@
//Mime
/obj/item/clothing/suit/toggle/suspenders
name = "suspenders"
- desc = "They suspend the illusion of the mime's play."
+ desc = "The symbol of hard labor and dirty jobs."
icon = 'icons/obj/clothing/belts.dmi'
icon_state = "suspenders"
blood_overlay_type = "armor" //it's the less thing that I can put here
@@ -205,7 +207,7 @@
name = "surgical apron"
desc = "A sterile blue surgical apron."
icon_state = "surgical"
- allowed = list(/obj/item/scalpel, /obj/item/cautery, /obj/item/hemostat, /obj/item/retractor)
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
//SolGov suits
@@ -268,24 +270,6 @@
icon_state = "coat_terragov"
item_state = "coat_terragov"
-/obj/item/clothing/suit/hooded/enginseer
- name = "enginseer regalia"
- desc = "You hold the secrets of the Machine."
- icon_state = "enginseer"
- item_state = "enginseer"
- hoodtype = /obj/item/clothing/head/hooded/enginseer
- body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
- flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDEGLOVES
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/gun, /obj/item/melee, /obj/item/nullrod, /obj/item/radio, /obj/item/storage/book)
-
-/obj/item/clothing/head/hooded/enginseer
- name = "enginseer's hood"
- desc = "You are honored that they require your skills."
- icon_state = "enginseerhood"
- item_state = "enginseerhood"
- body_parts_covered = HEAD
- flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDEFACIALHAIR
-
/obj/item/clothing/suit/armor/witchhunter
name = "witchunter garb"
desc = "This worn outfit saw much use back in the day."
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 858b494564e..51d0f1eb08b 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -5,7 +5,7 @@
item_state = "labcoat"
blood_overlay_type = "coat"
body_parts_covered = CHEST|ARMS|GROIN
- allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"
@@ -59,11 +59,11 @@
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0, fire = 50, acid = 50)
/obj/item/clothing/suit/toggle/labcoat/raincoat
- name = "\improper Cybersun labcoat"
- desc = {"A translucent, uniquely designed labcoat from Cybersun Solutions. It's made from a special material that actively repels fluids.
+ name = "translucent labcoat"
+ desc = {"A uniquely designed, translucent labcoat. It's made from a special material that actively repels fluids.
You're pretty sure this is just a raincoat.
-Wearing a raincoat inside is like wearing sunglasses at night. A good Cybersun exec does both.
+Wearing a raincoat inside is like wearing sunglasses at night. A good chemist does both.
"}
icon_state = "raincoat"
item_state = "raincoat"
@@ -75,7 +75,7 @@ You're pretty sure this is just a raincoat.
mob_overlay_icon = 'icons/mob/clothing/suits/utility.dmi'
icon_state = "labcoat_long"
item_state = "labcoat"
- allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index c049402c550..4238e45dbce 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -31,27 +31,13 @@
/*
* Costume
*/
-/obj/item/clothing/suit/hooded/flashsuit
- name = "flashy costume"
- desc = "What did you expect?"
- icon_state = "flashsuit"
- item_state = "armor"
- body_parts_covered = CHEST|GROIN
- hoodtype = /obj/item/clothing/head/hooded/flashsuit
-
-/obj/item/clothing/head/hooded/flashsuit
- name = "flash button"
- desc = "You will learn to fear the flash."
- icon_state = "flashsuit"
- body_parts_covered = HEAD
- flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK
/obj/item/clothing/suit/pirate
name = "pirate coat"
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
- allowed = list(/obj/item/melee/transforming/energy/sword/saber/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+ allowed = list(/obj/item/melee/energy/sword/saber/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
/obj/item/clothing/suit/pirate/captain
name = "pirate captain coat"
@@ -59,27 +45,6 @@
icon_state = "hgpirate"
item_state = "hgpirate"
-
-/obj/item/clothing/suit/cyborg_suit
- name = "cyborg suit"
- desc = "Suit for a cyborg costume."
- icon_state = "death"
- item_state = "death"
- mob_overlay_state = "cardborg"
- flags_1 = CONDUCT_1
- fire_resist = T0C+5200
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
-
-/obj/item/clothing/suit/justice
- name = "justice suit"
- desc = "this pretty much looks ridiculous" //Needs no fixing
- icon_state = "justice"
- item_state = "justice"
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-
-
/obj/item/clothing/suit/judgerobe
name = "judge's robe"
desc = "This robe commands authority."
@@ -116,42 +81,6 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
resistance_flags = NONE
-/obj/item/clothing/suit/hastur
- name = "\improper Hastur's robe"
- desc = "Robes not meant to be worn by man."
- icon_state = "hastur"
- item_state = "hastur"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
-
-/obj/item/clothing/suit/imperium_monk
- name = "\improper Imperium monk suit"
- desc = "Have YOU killed a xeno today?"
- icon_state = "imperium_monk"
- item_state = "imperium_monk"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDESHOES|HIDEJUMPSUIT
- allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
-
-
-/obj/item/clothing/suit/chickensuit
- name = "chicken suit"
- desc = "A suit made long ago by the ancient empire KFC."
- icon_state = "chickensuit"
- item_state = "chickensuit"
- body_parts_covered = CHEST|ARMS|GROIN|LEGS|FEET
- flags_inv = HIDESHOES|HIDEJUMPSUIT
-
-
-/obj/item/clothing/suit/monkeysuit
- name = "monkey suit"
- desc = "A suit that looks like a primate."
- icon_state = "monkeysuit"
- item_state = "monkeysuit"
- body_parts_covered = CHEST|ARMS|GROIN|LEGS|FEET|HANDS
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
/obj/item/clothing/suit/toggle/owlwings
name = "owl cloak"
desc = "A soft brown cloak made of synthetic feathers. Soft to the touch, stylish, and a 2 meter wing span that will drive the ladies mad."
@@ -208,42 +137,6 @@
body_parts_covered = CHEST|GROIN
flags_inv = HIDEJUMPSUIT
-/obj/item/clothing/suit/poncho
- name = "poncho"
- desc = "Your classic, non-racist poncho."
- icon_state = "classicponcho"
- item_state = "classicponcho"
-
-/obj/item/clothing/suit/poncho/green
- name = "green poncho"
- desc = "Your classic, non-racist poncho. This one is green."
- icon_state = "greenponcho"
- item_state = "greenponcho"
-
-/obj/item/clothing/suit/poncho/red
- name = "red poncho"
- desc = "Your classic, non-racist poncho. This one is red."
- icon_state = "redponcho"
- item_state = "redponcho"
-
-/obj/item/clothing/suit/poncho/ponchoshame
- name = "poncho of shame"
- desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseparable. Literally."
- icon_state = "ponchoshame"
- item_state = "ponchoshame"
-
-/obj/item/clothing/suit/poncho/ponchoshame/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT)
-
-/obj/item/clothing/suit/whitedress
- name = "white dress"
- desc = "A fancy white dress."
- icon_state = "white_dress"
- item_state = "w_suit"
- body_parts_covered = CHEST|GROIN|LEGS|FEET
- flags_inv = HIDEJUMPSUIT|HIDESHOES
-
/obj/item/clothing/suit/hooded/carp_costume
name = "carp costume"
desc = "A costume made from 'synthetic' carp scales, it smells."
@@ -274,44 +167,6 @@
if (user.head == src)
user.faction -= "carp"
-/obj/item/clothing/suit/hooded/ian_costume //It's Ian, rub his bell- oh god what happened to his inside parts?
- name = "corgi costume"
- desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs."
- icon_state = "ian"
- item_state = "labcoat"
- body_parts_covered = CHEST|GROIN|ARMS
- //cold_protection = CHEST|GROIN|ARMS
- //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- allowed = list()
- hoodtype = /obj/item/clothing/head/hooded/ian_hood
- dog_fashion = /datum/dog_fashion/back
-
-/obj/item/clothing/head/hooded/ian_hood
- name = "corgi hood"
- desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits."
- icon_state = "ian"
- body_parts_covered = HEAD
- //cold_protection = HEAD
- //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- flags_inv = HIDEHAIR|HIDEEARS
-
-/obj/item/clothing/suit/hooded/bee_costume // It's Hip!
- name = "bee costume"
- desc = "Bee the true Queen!"
- icon_state = "bee"
- item_state = "labcoat"
- body_parts_covered = CHEST|GROIN|ARMS
- clothing_flags = THICKMATERIAL
- hoodtype = /obj/item/clothing/head/hooded/bee_hood
-
-/obj/item/clothing/head/hooded/bee_hood
- name = "bee hood"
- desc = "A hood attached to a bee costume."
- icon_state = "bee"
- body_parts_covered = HEAD
- clothing_flags = THICKMATERIAL
- flags_inv = HIDEHAIR|HIDEEARS
-
/obj/item/clothing/suit/hooded/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!?
name = "bloated human suit"
desc = "A horribly bloated suit made from human skins."
@@ -333,14 +188,6 @@
flags_cover = HEADCOVERSEYES
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-/obj/item/clothing/suit/shrine_maiden
- name = "shrine maiden's outfit"
- desc = "Makes you want to exterminate some troublesome youkai."
- icon_state = "shrine_maiden"
- item_state = "shrine_maiden"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEJUMPSUIT
-
/*
* Misc
*/
@@ -378,18 +225,6 @@
icon_state = "nerdshirt"
item_state = "nerdshirt"
-/obj/item/clothing/suit/vapeshirt //wearing this is asking to get beat.
- name = "Vape Naysh shirt"
- desc = "A cheap white T-shirt with a big tacky \"VN\" on the front, Why would you wear this unironically?"
- icon_state = "vapeshirt"
- item_state = "vapeshirt"
-
-/obj/item/clothing/suit/striped_sweater
- name = "striped sweater"
- desc = "Reminds you of someone, but you just can't put your finger on it..."
- icon_state = "waldo_shirt"
- item_state = "waldo_shirt"
-
/obj/item/clothing/suit/jacket
name = "bomber jacket"
desc = "Aviators not included."
@@ -409,13 +244,6 @@
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/revolver/detective, /obj/item/radio)
-/obj/item/clothing/suit/jacket/leather/overcoat
- name = "leather overcoat"
- desc = "That's a damn fine coat."
- icon_state = "leathercoat"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
- cold_protection = CHEST|GROIN|ARMS|LEGS
-
/obj/item/clothing/suit/jacket/leather/duster
name = "leather duster"
desc = "A long, utilitarian leather coat. Ideal for protecting its wearer from rain, sun, and dust."
@@ -484,40 +312,12 @@
icon_state = "letterman_n"
item_state = "letterman_n"
-/obj/item/clothing/suit/dracula
- name = "dracula coat"
- desc = "Looks like this belongs in a very old movie set."
- icon_state = "draculacoat"
- item_state = "draculacoat"
-
-/obj/item/clothing/suit/drfreeze_coat
- name = "doctor freeze's labcoat"
- desc = "A labcoat imbued with the power of features and freezes."
- icon_state = "drfreeze_coat"
- item_state = "drfreeze_coat"
-
/obj/item/clothing/suit/gothcoat
name = "gothic coat"
desc = "Perfect for those who want to stalk around a corner of a bar."
icon_state = "gothcoat"
item_state = "gothcoat"
-/obj/item/clothing/suit/xenos
- name = "xenos suit"
- desc = "A suit made out of chitinous alien hide."
- icon_state = "xenos"
- item_state = "xenos_helm"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- allowed = list(/mob/living/simple_animal/hostile/facehugger/toy)
-
-/obj/item/clothing/suit/nemes
- name = "pharoah tunic"
- desc = "Lavish space tomb not included."
- icon_state = "pharoah"
- item_state = "pharoah"
- body_parts_covered = CHEST|GROIN
-
/obj/item/clothing/suit/caution
name = "wet floor sign"
desc = "No running."
@@ -534,34 +334,6 @@
attack_verb = list("warned", "cautioned", "smashed")
armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-/obj/item/clothing/suit/changshan_red
- name = "red changshan"
- desc = "A gorgeously embroidered silk shirt."
- icon_state = "changshan_red"
- item_state = "changshan_red"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
-
-/obj/item/clothing/suit/changshan_blue
- name = "blue changshan"
- desc = "A gorgeously embroidered silk shirt."
- icon_state = "changshan_blue"
- item_state = "changshan_blue"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
-
-/obj/item/clothing/suit/cheongsam_red
- name = "red cheongsam"
- desc = "A gorgeously embroidered silk dress."
- icon_state = "cheongsam_red"
- item_state = "cheongsam_red"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
-
-/obj/item/clothing/suit/cheongsam_blue
- name = "blue cheongsam"
- desc = "A gorgeously embroidered silk dress."
- icon_state = "cheongsam_blue"
- item_state = "cheongsam_blue"
- body_parts_covered = CHEST|GROIN|ARMS|LEGS
-
/obj/item/clothing/head/hooded/ablative
name = "ablative hood"
desc = "Hood hopefully belonging to an ablative trenchcoat. Includes a visor for cool-o-vision."
@@ -612,20 +384,6 @@
if (prob(hit_reflect_chance))
return TRUE
-/obj/item/clothing/suit/spookyghost
- name = "spooky ghost"
- desc = "This is obviously just a bedsheet, but maybe try it on?"
- icon_state = "bedsheet"
- user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150)
- alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire
-
-/obj/item/clothing/suit/bronze
- name = "bronze suit"
- desc = "A big and clanky suit made of bronze that offers no protection and looks very unfashionable. Nice."
- icon = 'icons/obj/clothing/clockwork_garb.dmi'
- icon_state = "clockwork_cuirass_old"
- armor = list("melee" = 5, "bullet" = 0, "laser" = -5, "energy" = -15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20)
-
/obj/item/clothing/suit/ghost_sheet
name = "ghost sheet"
desc = "The hands float by themselves, so it's extra spooky."
@@ -650,40 +408,8 @@
icon = 'icons/obj/clothing/belts.dmi'
icon_state = "suspenders_gray"
-/obj/item/clothing/suit/hooded/mysticrobe
- name = "mystic's robe"
- desc = "Wearing this makes you feel more attuned with the nature of the universe... as well as a bit more irresponsible. "
- icon_state = "mysticrobe"
- item_state = "mysticrobe"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- allowed = list(/obj/item/spellbook, /obj/item/storage/book/bible)
- flags_inv = HIDEJUMPSUIT
- hoodtype = /obj/item/clothing/head/hooded/mysticrobe
-
-/obj/item/clothing/head/hooded/mysticrobe
- name = "mystic's hood"
- desc = "The balance of reality tips towards order."
- icon_state = "mystichood"
- item_state = "mystichood"
- body_parts_covered = HEAD
- flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK
-
/obj/item/clothing/suit/hawaiian
name = "floral shirt"
desc = "From grills to guns, this shirt's seen it all."
icon_state = "hawaiian_blue"
item_state = "hawaiian_blue"
-
-/obj/item/clothing/suit/yakuza
- name = "tojo clan jacket"
- desc = "The jacket of a mad dog."
- icon_state = "MajimaJacket"
- item_state = "MajimaJacket"
- body_parts_covered = ARMS
-
-/obj/item/clothing/suit/dutch
- name = "dutch's jacket"
- desc = "For those long nights on the beach in Tahiti."
- icon_state = "DutchJacket"
- item_state = "DutchJacket"
- body_parts_covered = ARMS
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index ac91351c232..88661d6b835 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -67,7 +67,7 @@
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
strip_delay = 70
equip_delay_other = 70
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
resistance_flags = NONE
@@ -126,7 +126,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 60, "rad" = 100, "fire" = 30, "acid" = 30)
strip_delay = 60
equip_delay_other = 60
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
resistance_flags = NONE
flags_1 = RAD_PROTECT_CONTENTS_1
supports_variations = VOX_VARIATION
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
index 9b141148e5a..29faddfdd49 100644
--- a/code/modules/clothing/suits/wintercoats.dm
+++ b/code/modules/clothing/suits/wintercoats.dm
@@ -12,14 +12,16 @@
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- allowed = list(
- /obj/item/flashlight,
- /obj/item/tank/internals/emergency_oxygen,
- /obj/item/tank/internals/plasmaman,
- /obj/item/toy,
- /obj/item/storage/fancy/cigarettes,
- /obj/item/lighter,
- )
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo/large
+ allowed = list( /obj/item/flashlight,
+ /obj/item/tank/internals/emergency_oxygen,
+ /obj/item/tank/internals/plasmaman,
+ /obj/item/toy,
+ /obj/item/storage/fancy/cigarettes,
+ /obj/item/lighter,
+ /obj/item/radio,
+ /obj/item/storage/pill_bottle
+ )
/obj/item/clothing/head/hooded/winterhood
name = "winter hood"
@@ -63,28 +65,7 @@
icon_state = "coatmedical"
item_state = "coatmedical"
hoodtype = /obj/item/clothing/head/hooded/winterhood/medical
- allowed = list(
- /obj/item/analyzer,
- /obj/item/sensor_device,
- /obj/item/stack/medical,
- /obj/item/dnainjector,
- /obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/syringe,
- /obj/item/reagent_containers/hypospray,
- /obj/item/healthanalyzer,
- /obj/item/flashlight/pen,
- /obj/item/reagent_containers/glass/bottle,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/pill,
- /obj/item/storage/pill_bottle,
- /obj/item/paper,
- /obj/item/melee/classic_baton/telescopic,
- /obj/item/toy,
- /obj/item/storage/fancy/cigarettes,
- /obj/item/lighter,
- /obj/item/tank/internals/emergency_oxygen,
- /obj/item/tank/internals/plasmaman,
- )
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
/obj/item/clothing/head/hooded/winterhood/medical
icon_state = "hood_medical"
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index 451d428760f..e0d7f1c7e12 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -11,47 +11,6 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
dog_fashion = /datum/dog_fashion/head/blue_wizard
-/obj/item/clothing/head/wizard/red
- name = "red wizard hat"
- desc = "Strange-looking red hat-wear that most certainly belongs to a real magic user."
- icon_state = "redwizard"
- dog_fashion = /datum/dog_fashion/head/red_wizard
-
-/obj/item/clothing/head/wizard/yellow
- name = "yellow wizard hat"
- desc = "Strange-looking yellow hat-wear that most certainly belongs to a powerful magic user."
- icon_state = "yellowwizard"
- dog_fashion = null
-
-/obj/item/clothing/head/wizard/black
- name = "black wizard hat"
- desc = "Strange-looking black hat-wear that most certainly belongs to a real skeleton. Spooky."
- icon_state = "blackwizard"
- dog_fashion = null
-
-/obj/item/clothing/head/wizard/fake
- name = "wizard hat"
- desc = "It has WIZZARD written across it in sequins. Comes with a cool beard."
- icon_state = "wizard-fake"
- gas_transfer_coefficient = 1
- permeability_coefficient = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- resistance_flags = FLAMMABLE
- dog_fashion = /datum/dog_fashion/head/blue_wizard
-
-/obj/item/clothing/head/wizard/marisa
- name = "witch hat"
- desc = "Strange-looking hat-wear. Makes you want to cast fireballs."
- icon_state = "marisa"
- dog_fashion = null
-
-/obj/item/clothing/head/wizard/magus
- name = "\improper Magus helm"
- desc = "A mysterious helmet that hums with an unearthly power."
- icon_state = "magus"
- item_state = "magus"
- dog_fashion = null
-
/obj/item/clothing/head/wizard/santa
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
@@ -76,78 +35,12 @@
equip_delay_other = 50
resistance_flags = FIRE_PROOF | ACID_PROOF
-/obj/item/clothing/suit/wizrobe/red
- name = "red wizard robe"
- desc = "A magnificent red gem-lined robe that seems to radiate power."
- icon_state = "redwizard"
- item_state = "redwizrobe"
-
-/obj/item/clothing/suit/wizrobe/yellow
- name = "yellow wizard robe"
- desc = "A magnificent yellow gem-lined robe that seems to radiate power."
- icon_state = "yellowwizard"
- item_state = "yellowwizrobe"
-
-/obj/item/clothing/suit/wizrobe/black
- name = "black wizard robe"
- desc = "An unnerving black gem-lined robe that reeks of death and decay."
- icon_state = "blackwizard"
- item_state = "blackwizrobe"
-
-/obj/item/clothing/suit/wizrobe/marisa
- name = "witch robe"
- desc = "Magic is all about the spell power, ZE!"
- icon_state = "marisa"
- item_state = "marisarobe"
-
-/obj/item/clothing/suit/wizrobe/magusblue
- name = "\improper Magus robe"
- desc = "A set of armored robes that seem to radiate a dark power."
- icon_state = "magusblue"
- item_state = "magusblue"
-
-/obj/item/clothing/suit/wizrobe/magusred
- name = "\improper Magus robe"
- desc = "A set of armored robes that seem to radiate a dark power."
- icon_state = "magusred"
- item_state = "magusred"
-
-
/obj/item/clothing/suit/wizrobe/santa
name = "Santa's suit"
desc = "Festive!"
icon_state = "santa"
item_state = "santa"
-/obj/item/clothing/suit/wizrobe/fake
- name = "wizard robe"
- desc = "A rather dull blue robe meant to mimic real wizard robes."
- icon_state = "wizard-fake"
- item_state = "wizrobe"
- gas_transfer_coefficient = 1
- permeability_coefficient = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- resistance_flags = FLAMMABLE
-
-/obj/item/clothing/head/wizard/marisa/fake
- name = "witch hat"
- desc = "Strange-looking hat-wear, makes you want to cast fireballs."
- icon_state = "marisa"
- gas_transfer_coefficient = 1
- permeability_coefficient = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- resistance_flags = FLAMMABLE
-
-/obj/item/clothing/suit/wizrobe/marisa/fake
- name = "witch robe"
- desc = "Magic is all about the spell power, ZE!"
- icon_state = "marisa"
- item_state = "marisarobe"
- gas_transfer_coefficient = 1
- permeability_coefficient = 1
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- resistance_flags = FLAMMABLE
-
/obj/item/clothing/suit/space/hardsuit/shielded/wizard
name = "battlemage armour"
desc = "Not all wizards are afraid of getting up close and personal."
diff --git a/code/modules/clothing/towels.dm b/code/modules/clothing/towels.dm
index 22c1b29976f..f35c608a042 100644
--- a/code/modules/clothing/towels.dm
+++ b/code/modules/clothing/towels.dm
@@ -32,7 +32,7 @@
item_flags = NOBLUDGEON
resistance_flags = FLAMMABLE
flags_inv = HIDEHAIR // Only relevant when in head shape, but useful to keep around regardless.
- supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+ supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
/// The shape we're currently in.
var/shape = TOWEL_FOLDED
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index a28d6d323a8..7445eb2ad55 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -15,6 +15,7 @@
clothamnt = 3
greyscale_colors = list(list(15, 17), list(10, 19), list(15, 10))
greyscale_icon_state = "under"
+
var/has_sensor = HAS_SENSORS // For the crew computer
var/random_sensor = TRUE
var/sensor_mode = NO_SENSORS
@@ -24,20 +25,25 @@
var/obj/item/clothing/accessory/attached_accessory
var/mutable_appearance/accessory_overlay
var/freshly_laundered = FALSE
+
supports_variations = VOX_VARIATION
+ blood_overlay_type = "uniform"
/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
- . = list()
+ . = ..()
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_uniform = mutable_appearance('icons/effects/blood.dmi', "uniformblood")
- bloody_uniform.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_uniform
+ . += setup_blood_overlay()
if(accessory_overlay)
. += accessory_overlay
+/obj/item/clothing/under/Destroy()
+ . = ..()
+ if(attached_accessory)
+ attached_accessory.detach(src)
+
/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = I
@@ -45,6 +51,9 @@
has_sensor = HAS_SENSORS
to_chat(user,"You repair the suit sensors on [src] with [C].")
return 1
+ if(attached_accessory && ispath(attached_accessory.pocket_storage_component_path) && loc == user)
+ attached_accessory.attackby(I,user)
+ return
if(!attach_accessory(I, user))
return ..()
@@ -179,7 +188,9 @@
if(SENSOR_COORDS)
. += "Its vital tracker and tracking beacon appear to be enabled."
if(attached_accessory)
- . += "\A [attached_accessory] is attached to it."
+ . += "\A [attached_accessory] is attached to it. You could Ctrl-click on it to remove it."
+ if(attached_accessory.pocket_storage_component_path)
+ . += "You could open the storage of \the [attached_accessory] with Alt-click."
/obj/item/clothing/under/rank
dying_key = DYE_REGISTRY_UNDER
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index f7710d52a12..db5037bbbec 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -92,10 +92,11 @@
if(initial(above_suit))
above_suit = !above_suit
to_chat(user, "[src] will be worn [above_suit ? "above" : "below"] your suit.")
+ return ..()
/obj/item/clothing/accessory/examine(mob/user)
. = ..()
- . += "\The [src] can be attached to a uniform. Alt-click to remove it once attached."
+ . += "\The [src] can be attached to a uniform. Ctrl-click to remove it once attached."
if(initial(above_suit))
. += "\The [src] can be worn above or below your suit. Alt-click to toggle."
@@ -103,7 +104,7 @@
name = "waistcoat"
desc = "For some classy, murderous fun."
icon_state = "waistcoat"
- item_state = "waistcoat"
+ item_state = "det_suit"
minimize_when_attached = FALSE
attachment_slot = null
@@ -115,18 +116,6 @@
minimize_when_attached = FALSE
attachment_slot = null
-/obj/item/clothing/accessory/maidapron/syndicate
- name = "syndicate maid apron"
- desc = "Practical? No. Tactical? Also no. Cute? Most definitely yes."
- icon_state = "maidapronsynd"
- item_state = "maidapronsynd"
-
-/obj/item/clothing/accessory/maidapron/inteq
- name = "inteq maid apron"
- desc = "A 'tactical' apron to protect you from all sorts of spills, from dough to blood!"
- icon_state = "inteqmaidapron"
- item_state = "inteqmaidapron"
-
//////////
//Medals//
//////////
@@ -137,6 +126,7 @@
icon_state = "bronze"
custom_materials = list(/datum/material/iron=1000)
resistance_flags = FIRE_PROOF
+ attachment_slot = null
var/medaltype = "medal" //Sprite used for medalbox
var/commended = FALSE
@@ -184,7 +174,7 @@
/obj/item/clothing/accessory/medal/conduct
name = "distinguished conduct medal"
- desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew."
+ desc = "A bronze medal awarded for distinguished conduct. While an honor to be awarded, it is one of the most common medals next to the bronze heart."
/obj/item/clothing/accessory/medal/bronze_heart
name = "bronze heart medal"
@@ -198,7 +188,7 @@
/obj/item/clothing/accessory/medal/ribbon/cargo
name = "\"cargo tech of the shift\" award"
- desc = "An award bestowed only upon those cargotechs who have exhibited devotion to their duty in keeping with the highest traditions of Cargonia."
+ desc = "A common award bestowed by cargo quartermasters everywhere to their outperforming employees. Often paired with Unpaid Time Off."
/obj/item/clothing/accessory/medal/silver
name = "silver medal"
@@ -212,8 +202,8 @@
desc = "A silver medal awarded for acts of exceptional valor."
/obj/item/clothing/accessory/medal/silver/security
- name = "robust security award"
- desc = "An award for distinguished combat and sacrifice in defence of Nanotrasen's commercial interests. Often awarded to security staff."
+ name = "exceptional service award"
+ desc = "A silver medal awarded for exceptional service within one's roles, often ranging from combat operations to triage and first aid."
/obj/item/clothing/accessory/medal/silver/excellence
name = "\proper the head of personnel award for outstanding achievement in the field of excellence"
@@ -221,7 +211,7 @@
/obj/item/clothing/accessory/medal/silver/bureaucracy
name = "\improper Excellence in Bureaucracy Medal"
- desc = "Awarded for exemplary managerial services rendered while under contract with Nanotrasen."
+ desc = "An award for excellent bureaucratic work, often seen pinned to the uniforms of middle-managers."
/obj/item/clothing/accessory/medal/gold
name = "gold medal"
@@ -266,7 +256,7 @@
/obj/item/clothing/accessory/medal/gold/heroism
name = "medal of exceptional heroism"
- desc = "An extremely rare golden medal awarded only by CentCom. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
+ desc = "An extremely rare golden medal awarded only by the highest echelons of military service. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded."
/obj/item/clothing/accessory/medal/plasma
name = "plasma medal"
@@ -393,7 +383,6 @@
desc = "A legion skull fitted to a codpiece, intended to protect the important things in life."
icon_state = "skull"
above_suit = TRUE
- armor = list("melee" = 10, "bullet" = 10, "laser" = 5, "energy" = 5, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 40, "acid" = 40)
attachment_slot = GROIN
/obj/item/clothing/accessory/skilt
@@ -402,15 +391,14 @@
icon_state = "skilt"
above_suit = TRUE
minimize_when_attached = FALSE
- armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 0, "acid" = 25)
attachment_slot = GROIN
/obj/item/clothing/accessory/holster
name = "shoulder holster"
desc = "A holster to carry a handgun and ammo. WARNING: Badasses only."
icon_state = "holster"
- item_state = "holster"
pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster
+ attachment_slot = null
/obj/item/clothing/accessory/holster/detective
name = "detective's shoulder holster"
@@ -434,7 +422,6 @@
name = "syndicate holster"
desc = "A two pouched hip holster that uses chameleon technology to disguise itself and any guns in it."
var/datum/action/item_action/chameleon/change/chameleon_action
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster/chameleon
/obj/item/clothing/accessory/holster/chameleon/Initialize()
. = ..()
@@ -444,6 +431,10 @@
chameleon_action.chameleon_name = "Accessory"
chameleon_action.initialize_disguises()
+/obj/item/clothing/accessory/holster/chameleon/Destroy()
+ QDEL_NULL(chameleon_action)
+ return ..()
+
/obj/item/clothing/accessory/holster/chameleon/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
@@ -479,7 +470,7 @@
icon_state = "rilena_pin"
above_suit = FALSE
minimize_when_attached = TRUE
- attachment_slot = CHEST
+ attachment_slot = null
/obj/item/clothing/accessory/rilena_pin/on_uniform_equip(obj/item/clothing/under/U, user)
var/mob/living/L = user
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index bbd0d962601..7ac32c9c129 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -11,11 +11,11 @@
/obj/item/clothing/under/color/random
icon_state = "random_jumpsuit"
- mob_overlay_state = "rainbow" // if you somehow equip it like that
+ mob_overlay_state = "white" // if you somehow equip it like that
/obj/item/clothing/under/color/random/Initialize()
..()
- var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - typesof(/obj/item/clothing/under/color/jumpskirt) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/ancient - /obj/item/clothing/under/color/black/ghost)
+ var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - typesof(/obj/item/clothing/under/color/jumpskirt) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/ancient)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
H.equip_to_slot_or_del(new C(H), ITEM_SLOT_ICLOTHING) //or else you end up with naked assistants running around everywhere...
@@ -25,7 +25,7 @@
/obj/item/clothing/under/color/jumpskirt/random
icon_state = "random_jumpsuit" //Skirt variant needed
- mob_overlay_state = "rainbow"
+ mob_overlay_state = "white"
/obj/item/clothing/under/color/jumpskirt/random/Initialize()
..()
@@ -48,13 +48,6 @@
icon_state = "black_skirt"
item_state = "bl_suit"
-/obj/item/clothing/under/color/black/ghost
- item_flags = DROPDEL
-
-/obj/item/clothing/under/color/black/ghost/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
-
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
desc = "A tasteful grey jumpsuit that reminds you of the good old days."
@@ -193,15 +186,6 @@
icon_state = "lightbrown_skirt"
item_state = "lb_suit"
-/obj/item/clothing/under/color/khaki
- name = "khaki jumpsuit"
- icon_state = "khakij"
- item_state = "lb_suit"
-
-/obj/item/clothing/under/color/khaki/buster
- name = "buster jumpsuit"
- desc = "There seems to be a large stain in the left pocket. Someone must have squashed a really big twinkie."
-
/obj/item/clothing/under/color/brown
name = "brown jumpsuit"
icon_state = "brown"
@@ -221,17 +205,3 @@
name = "maroon jumpskirt"
icon_state = "maroon_skirt"
item_state = "r_suit"
-
-/obj/item/clothing/under/color/rainbow
- name = "rainbow jumpsuit"
- desc = "A multi-colored jumpsuit!"
- icon_state = "rainbow"
- item_state = "rainbow"
- can_adjust = FALSE
-
-/obj/item/clothing/under/color/jumpskirt/rainbow
- name = "rainbow jumpskirt"
- desc = "A multi-colored jumpskirt!"
- icon_state = "rainbow_skirt"
- item_state = "rainbow"
- can_adjust = FALSE
diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm
index bfc7524149c..ac7eeea5dc2 100644
--- a/code/modules/clothing/under/costume.dm
+++ b/code/modules/clothing/under/costume.dm
@@ -167,7 +167,7 @@
can_adjust = FALSE
resistance_flags = NONE
-/obj/item/clothing/under/costume/mech_suit
+/obj/item/clothing/under/costume/mech_suit //these still have "mech" in the name because they're costumes, not serious utility wear
name = "red mech pilot's suit"
desc = "A red mech pilot's suit. Might make your butt look big."
icon_state = "red_mech_suit"
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 46a1ff275d1..03f1cf19580 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -55,7 +55,6 @@
desc = "Someone who wears this means business."
icon_state = "detective"
item_state = "det"
- armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
strip_delay = 50
alt_covers_chest = TRUE
sensor_mode = 3
diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm
index f74748f71fb..091a584f117 100644
--- a/code/modules/clothing/under/skirt_dress.dm
+++ b/code/modules/clothing/under/skirt_dress.dm
@@ -1,9 +1,13 @@
/obj/item/clothing/under/dress
+ name = "strange broken dress"
+ desc = "Tell a coder!"
+ icon = 'icons/obj/clothing/under/dress.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/under/dresses/dress.dmi'
+ kepori_override_icon = 'icons/mob/clothing/under/dresses/dress_kepori.dmi'
+
can_adjust = FALSE
body_parts_covered = CHEST|GROIN
- icon = 'icons/obj/clothing/under/dress.dmi'
- mob_overlay_icon = 'icons/mob/clothing/under/dress.dmi'
- supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION //Doesn't require a new icon.
+ supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION | KEPORI_VARIATION
/obj/item/clothing/under/dress/sundress
name = "sundress"
@@ -13,19 +17,19 @@
/obj/item/clothing/under/dress/blacktango
name = "black tango dress"
- desc = "Filled with Latin fire."
+ desc = "A silky black satin dress, traditionally made for dancing. It's light and easy to move in."
icon_state = "black_tango"
item_state = "wcoat"
/obj/item/clothing/under/dress/striped
name = "striped dress"
- desc = "Fashion in space."
+ desc = "A simple blue striped dress."
icon_state = "striped_dress"
item_state = "striped_dress"
/obj/item/clothing/under/dress/sailor
name = "sailor dress"
- desc = "Formal wear for a leading lady."
+ desc = "A traditional dress with roots in Far Eastern Cantonal culture, later popularized by the Solarian Confederacy's Naval Forces. However, due to its roots as a formal uniform, it would later be used by civilians in occasions outside of its naval context. The crisp cloth evokes feelings of order and discipline."
icon_state = "sailor_dress"
item_state = "sailor_dress"
@@ -35,62 +39,86 @@
icon_state = "red_evening_gown"
item_state = "red_evening_gown"
-/obj/item/clothing/under/dress/skirt
+/obj/item/clothing/under/dress/one_shoulder
+ name = "one shoulder dress"
+ desc = "A modern black dress with only one shoulder strap. Comes with a matching pair of arm warmers."
+ icon_state = "one_shoulder_dress"
+ can_adjust = TRUE
+
+/obj/item/clothing/under/dress/iko_ikssoal
+ name = "iko ikssoal"
+ desc = "The “iko-ikssoal”, translating to “long-dress”, is a traditional Kalixcian garment for formal gatherings."
+ icon_state = "iko_ikssoal"
+
+/obj/item/clothing/under/dress/skirt/color
name = "black skirt"
- desc = "A black skirt, very fancy!"
+ desc = "A black, casual skirt."
icon_state = "blackskirt"
+ can_adjust = TRUE
-/obj/item/clothing/under/dress/skirt/blue
+/obj/item/clothing/under/dress/skirt/color/blue
name = "blue skirt"
desc = "A blue, casual skirt."
icon_state = "blueskirt"
item_state = "b_suit"
- custom_price = 60
-/obj/item/clothing/under/dress/skirt/red
+/obj/item/clothing/under/dress/skirt/color/red
name = "red skirt"
desc = "A red, casual skirt."
icon_state = "redskirt"
item_state = "r_suit"
- custom_price = 60
-/obj/item/clothing/under/dress/skirt/purple
+/obj/item/clothing/under/dress/skirt/color/purple
name = "purple skirt"
desc = "A purple, casual skirt."
icon_state = "purpleskirt"
item_state = "p_suit"
- custom_price = 60
-/obj/item/clothing/under/dress/skirt/plaid
- name = "red plaid skirt"
- desc = "A preppy red skirt with a white blouse."
- icon_state = "plaid_red"
- item_state = "plaid_red"
+/obj/item/clothing/under/dress/skirt/color/white
+ name = "white skirt"
+ desc = "A white, casual skirt."
+ icon_state = "whiteskirt"
+
+/obj/item/clothing/under/dress/skirt/pinafore
+ name = "black pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is black."
+ icon_state = "black_pinafore"
can_adjust = TRUE
alt_covers_chest = TRUE
- custom_price = 60
-
-/obj/item/clothing/under/dress/skirt/plaid/blue
- name = "blue plaid skirt"
- desc = "A preppy blue skirt with a white blouse."
- icon_state = "plaid_blue"
- item_state = "plaid_blue"
-
-/obj/item/clothing/under/dress/skirt/plaid/purple
- name = "purple plaid skirt"
- desc = "A preppy purple skirt with a white blouse."
- icon_state = "plaid_purple"
- item_state = "plaid_purple"
-
-/obj/item/clothing/under/dress/skirt/plaid/green
- name = "green plaid skirt"
- desc = "A preppy green skirt with a white blouse."
- icon_state = "plaid_green"
- item_state = "plaid_green"
+
+/obj/item/clothing/under/dress/skirt/pinafore/maroon
+ name = "maroon pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is maroon."
+ icon_state = "maroon_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/cerulean
+ name = "cerulean pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is cerulean."
+ icon_state = "cerulean_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/plaid
+ name = "red plaid pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is in red plaid."
+ icon_state = "red_plaid_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/plaid/green
+ name = "green plaid pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is in green plaid."
+ icon_state = "green_plaid_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/plaid/brown
+ name = "brown plaid pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is in brown plaid."
+ icon_state = "brown_plaid_pinafore"
/obj/item/clothing/under/dress/rilena
name = "RILENA: LMR Ri cosplay"
desc = "A pretty red dress with big pink ribbons attached. Intended to be worn by Kepori cosplayers, but also fits other species."
icon_state = "rilena_dress"
item_state = "rilena_dress"
- //supports_variations = KEPORI_VARIATION
+
+/obj/item/clothing/under/dress/white_dress
+ name = "white dress"
+ desc = "A breezy white dress."
+ icon_state = "white_dress"
+ item_state = "white_dress"
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 5e8ca1bd7ac..09d841902ac 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -194,17 +194,6 @@
icon_state = "gec_ce"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 80, "acid" = 40)
-/obj/item/clothing/under/syndicate/skirt/maid
- name = "tactical maid outfit"
- desc = "A 'tactical' turtleneck fashioned to the likeness of a maid outfit. Why the Syndicate has these, you'll never know."
- icon_state = "syndimaid"
- item_state = "syndimaid"
-
-/obj/item/clothing/under/syndicate/skirt/maid/Initialize()
- . = ..()
- var/obj/item/clothing/accessory/maidapron/syndicate/A = new (src)
- attach_accessory(A)
-
/datum/outfit/syndicate/intern
name = "Syndicate Operative - Intern"
@@ -214,10 +203,10 @@
head = /obj/item/clothing/head/helmet/space/syndicate/surplus
mask = /obj/item/clothing/mask/breath
shoes = /obj/item/clothing/shoes/laceup
- r_hand = /obj/item/gun/ballistic/automatic/marksman/ebr
+ r_hand = /obj/item/gun/ballistic/automatic/assault/hydra/dmr
gloves = null
l_pocket = /obj/item/pinpointer/nuke/syndicate
- r_pocket = /obj/item/ammo_box/magazine/ebr
+ r_pocket = /obj/item/ammo_box/magazine/m556_42_hydra/small
belt = null
back = /obj/item/tank/jetpack/oxygen/harness
backpack_contents = null
@@ -259,10 +248,11 @@
icon_state = "inteqeng"
supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION
-/obj/item/clothing/under/syndicate/inteq/skirt/artificer
+/obj/item/clothing/under/syndicate/inteq/artificer/skirt
name = "inteq artificer overall skirt"
desc = "A black set of overalls in the likeness of a skirt atop a standard issue turtleneck, for the IRMG's support division Artificers."
icon_state = "inteqeng_skirt"
+ body_parts_covered = CHEST|GROIN|ARMS
supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
/obj/item/clothing/under/syndicate/inteq/corpsman
@@ -271,25 +261,13 @@
icon_state = "inteqmed"
supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION
-/obj/item/clothing/under/syndicate/inteq/skirt/corpsman
+/obj/item/clothing/under/syndicate/inteq/corpsman/skirt
name = "inteq corpsman skirtleneck"
desc = "A sterile white turtleneck with a free flowing black skirt, it is emblazoned with the lettering 'IRMG' on the shoulder. For the IRMG's support division Corpsmen."
icon_state = "inteqmed_skirt"
- supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/under/syndicate/inteq/skirt/maid
- name = "inteq tactical maid outfit"
- desc = "A 'tactical' turtleneck fashioned to the likeness of a maid outfit. This one is lovingly knitted in the colors of the IRMG."
- icon_state = "inteqmaid"
- item_state = "inteqmaid"
- can_adjust = FALSE
+ body_parts_covered = CHEST|GROIN|ARMS
supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
-/obj/item/clothing/under/syndicate/inteq/skirt/maid/Initialize()
- . = ..()
- var/obj/item/clothing/accessory/maidapron/inteq/A = new (src)
- attach_accessory(A)
-
/obj/item/clothing/under/syndicate/inteq/honorable
name = "honorable vanguard turtleneck"
desc = "a midnight black turtleneck worn by honorable Vanguards of the IRMG."
diff --git a/code/modules/donator/_donator.dm b/code/modules/donator/_donator.dm
index dd4df369cfe..218c7292c28 100644
--- a/code/modules/donator/_donator.dm
+++ b/code/modules/donator/_donator.dm
@@ -8,19 +8,6 @@ GLOBAL_PROTECT(donators)
/client/var/datum/donator/donator
-/client/New(TopicData)
- . = ..()
- donator = GLOB.donators[ckey] || new /datum/donator(src)
- donator.owner = src
- add_verb(src, /client/proc/do_donator_redemption)
- add_verb(src, /client/proc/do_donator_wcir)
-
-/client/Destroy()
- . = ..()
- if(donator) // it's possible that a client was qdel'd inside the initializer
- donator.owner = null
- donator = null
-
/client/proc/do_donator_redemption()
set name = "Redeem Donator Reward"
set category = "OOC.Donator"
@@ -46,23 +33,20 @@ GLOBAL_PROTECT(donators)
/datum/donator
/// ckey of the client who this datum belongs to
var/ckey
- /// reference to the client
- var/client/owner
+
+ /// Whether or not this datum actually is a real donator
+ var/is_donator = FALSE
/// typecache of eligible rewards for this donator
- var/list/flat_rewards = list(
- /obj/item/reagent_containers/food/snacks/cookie = TRUE
- )
+ var/list/flat_rewards = list()
/// list of conversion rewards for this donator
/// Expected format: base type -> list of convertible types
- var/list/conversion_rewards = list(
- )
+ var/list/conversion_rewards = list()
/// list of reskin rewards for this donator
/// Should be an assosciative list indexed by type with a value which is a list of skins
- var/list/reskin_rewards = list(
- )
+ var/list/reskin_rewards = list()
/// list of redeemed conversion types
var/list/conversions_redeemed = list()
@@ -70,22 +54,22 @@ GLOBAL_PROTECT(donators)
/datum/donator/New(client/owner)
. = ..()
src.ckey = owner.ckey
- src.owner = owner
load_information()
GLOB.donators[ckey] = src
-/datum/donator/Destroy(force, ...)
+/datum/donator/Destroy(force)
if(!force)
return QDEL_HINT_LETMELIVE
. = ..()
GLOB.donators -= ckey
- owner.donator = null
- owner = null
/datum/donator/proc/load_information() //todo: db support with config files being a backup method
var/json_file = file(REWARD_JSON_PATH + "[ckey].json")
if(!fexists(json_file))
return
+
+ is_donator = TRUE
+
var/list/json = safe_json_decode(file2text(json_file))
if(!json || !("ckey" in json))
@@ -180,6 +164,10 @@ GLOBAL_PROTECT(donators)
. += rinstance
/datum/donator/proc/what_can_i_redeem(mob/user)
+ if(!is_donator)
+ to_chat(user, span_notice("You are not a donator! If you are, please contact an admin on the discord."))
+ return
+
var/resp = list()
resp += "----------"
resp += "Your current redeemable rewards are as follows:"
diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm
index 4213ae91376..367b299107e 100644
--- a/code/modules/economy/account.dm
+++ b/code/modules/economy/account.dm
@@ -29,7 +29,7 @@
/datum/bank_account/proc/has_money(amt)
return account_balance >= amt
-/datum/bank_account/proc/adjust_money(amt, reason = "cash")
+/datum/bank_account/proc/adjust_money(amt, reason = CREDIT_LOG_WITHDRAW)
if((amt < 0 && has_money(-amt)) || amt > 0)
SSblackbox.record_feedback("tally", "credits", amt, reason)
SSeconomy.bank_money += amt
@@ -39,10 +39,10 @@
/datum/bank_account/proc/transfer_money(datum/bank_account/from, amount)
if(from.has_money(amount))
- adjust_money(amount, "transfer")
+ adjust_money(amount, CREDIT_LOG_TRANSFER_IN)
SSblackbox.record_feedback("amount", "credits_transferred", amount)
log_econ("[amount] credits were transferred from [from.account_holder]'s account to [src.account_holder]")
- from.adjust_money(-amount, "transfer_out")
+ from.adjust_money(-amount, CREDIT_LOG_TRANSFER_OUT)
return TRUE
return FALSE
@@ -83,4 +83,4 @@
/datum/bank_account/ship/New(newname, budget)
account_holder = newname
- adjust_money(budget, "starting_money")
+ adjust_money(budget, CREDIT_LOG_STARTING_MONEY)
diff --git a/code/modules/economy/pay_stand.dm b/code/modules/economy/pay_stand.dm
index 9382a03d062..1007f25fe40 100644
--- a/code/modules/economy/pay_stand.dm
+++ b/code/modules/economy/pay_stand.dm
@@ -54,7 +54,7 @@
if(momsdebitcard < 1)
to_chat(user, "ERROR: Invalid amount designated.")
return
- if(vbucks.registered_account.adjust_money(-momsdebitcard, "transfer"))
+ if(vbucks.registered_account.adjust_money(-momsdebitcard, CREDIT_LOG_TRANSFER_IN))
purchase(vbucks.registered_account.account_holder, momsdebitcard)
to_chat(user, "Thanks for purchasing! The vendor has been informed.")
return
@@ -117,7 +117,7 @@
return ..()
/obj/machinery/paystand/proc/purchase(buyer, price)
- my_card.registered_account.adjust_money(price, "transfer")
+ my_card.registered_account.adjust_money(price, CREDIT_LOG_TRANSFER_IN)
my_card.registered_account.bank_card_talk("Purchase made at your vendor by [buyer] for [price] credits.")
amount_deposited = amount_deposited + price
if(signaler && amount_deposited >= signaler_threshold)
diff --git a/code/modules/economy/selling_pad.dm b/code/modules/economy/selling_pad.dm
index cf155ad251b..e70dab4dcb7 100644
--- a/code/modules/economy/selling_pad.dm
+++ b/code/modules/economy/selling_pad.dm
@@ -36,7 +36,7 @@
/obj/machinery/computer/selling_pad_control/attackby(obj/item/I, mob/user)
var/value = I.get_item_credit_value()
if(value)
- sell_account.adjust_money(value, "selling_pad")
+ sell_account.adjust_money(value, CREDIT_LOG_SELLING_PAD)
to_chat(user, "You deposit [I]. The Vessel Budget is now [sell_account.account_balance] cr.")
qdel(I)
return TRUE
@@ -150,7 +150,7 @@
total_report.total_amount[E] += ex.total_amount[E]
total_report.total_value[E] += ex.total_value[E]
- sell_account.adjust_money(value, "selling_pad")
+ sell_account.adjust_money(value, CREDIT_LOG_SELLING_PAD)
if(!value)
status_report += "Nothing"
diff --git a/code/modules/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
index 185341d294c..16e1eeef6c9 100644
--- a/code/modules/emoji/emoji_parse.dm
+++ b/code/modules/emoji/emoji_parse.dm
@@ -2,7 +2,7 @@
. = text
if(!CONFIG_GET(flag/emojis))
return
- var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
+ var/static/list/emojis = icon_states(icon(EMOJI_SET))
var/parsed = ""
var/pos = 1
var/search = 0
@@ -34,7 +34,7 @@
. = text
if(!CONFIG_GET(flag/emojis))
return
- var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
+ var/static/list/emojis = icon_states(icon(EMOJI_SET))
var/final = "" //only tags are added to this
var/pos = 1
var/search = 0
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
deleted file mode 100644
index 18131e6ed9c..00000000000
--- a/code/modules/events/blob.dm
+++ /dev/null
@@ -1,30 +0,0 @@
-/datum/round_event_control/blob
- name = "Blob"
- typepath = /datum/round_event/ghost_role/blob
- weight = 10
- max_occurrences = 1
-
- min_players = 20
-
- gamemode_blacklist = list("blob") //Just in case a blob survives that long
-
-/datum/round_event/ghost_role/blob
- announceChance = 0
- role_name = "blob overmind"
- fakeable = TRUE
-
-/datum/round_event/ghost_role/blob/announce(fake)
- priority_announce("Confirmed outbreak of level 5 biohazard in the vicinity of [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak5.ogg')
-
-/datum/round_event/ghost_role/blob/spawn_role()
- if(!GLOB.blobstart.len)
- return MAP_ERROR
- var/list/candidates = get_candidates(ROLE_BLOB, null, ROLE_BLOB)
- if(!candidates.len)
- return NOT_ENOUGH_PLAYERS
- var/mob/dead/observer/new_blob = pick(candidates)
- var/mob/camera/blob/BC = new_blob.become_overmind()
- spawned_mobs += BC
- message_admins("[ADMIN_LOOKUPFLW(BC)] has been made into a blob overmind by an event.")
- log_game("[key_name(BC)] was spawned as a blob overmind by an event.")
- return SUCCESSFUL_SPAWN
diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm
index f7324e3c57d..3c68b18d50f 100644
--- a/code/modules/events/brain_trauma.dm
+++ b/code/modules/events/brain_trauma.dm
@@ -27,7 +27,7 @@
15;TRAUMA_RESILIENCE_LOBOTOMY,
5;TRAUMA_RESILIENCE_MAGIC)
- var/trauma_type = pickweight(list(
+ var/trauma_type = pick_weight(list(
BRAIN_TRAUMA_MILD = 60,
BRAIN_TRAUMA_SEVERE = 30,
BRAIN_TRAUMA_SPECIAL = 10
diff --git a/code/modules/events/devil.dm b/code/modules/events/devil.dm
deleted file mode 100644
index 656888f068b..00000000000
--- a/code/modules/events/devil.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-/datum/round_event_control/devil
- name = "Create Devil"
- typepath = /datum/round_event/ghost_role/devil
- max_occurrences = 0
-
-/datum/round_event/ghost_role/devil
- var/success_spawn = 0
- role_name = "devil"
- fakeable = FALSE
-
-/datum/round_event/ghost_role/devil/kill()
- if(!success_spawn && control)
- control.occurrences--
- return ..()
-
-/datum/round_event/ghost_role/devil/spawn_role()
- //selecting a candidate player
- var/list/candidates = get_candidates(ROLE_DEVIL, null, ROLE_DEVIL)
- if(!candidates.len)
- return NOT_ENOUGH_PLAYERS
-
- var/mob/dead/selected_candidate = pick_n_take(candidates)
- var/key = selected_candidate.key
-
- var/datum/mind/Mind = create_devil_mind(key)
- Mind.active = 1
-
- var/mob/living/carbon/human/devil = create_event_devil()
- Mind.transfer_to(devil)
- add_devil(devil, ascendable = FALSE)
-
- spawned_mobs += devil
- message_admins("[ADMIN_LOOKUPFLW(devil)] has been made into a devil by an event.")
- log_game("[key_name(devil)] was spawned as a devil by an event.")
- var/datum/job/jobdatum = new /datum/job/assistant()
- devil.job = jobdatum.name
- jobdatum.equip(devil)
- return SUCCESSFUL_SPAWN
-
-
-/proc/create_event_devil(spawn_loc)
- var/mob/living/carbon/human/new_devil = new(spawn_loc)
- var/datum/preferences/A = new() //Randomize appearance for the devil.
- A.copy_to(new_devil)
- new_devil.dna.update_dna_identity()
- return new_devil
-
-/proc/create_devil_mind(key)
- var/datum/mind/Mind = new /datum/mind(key)
- Mind.assigned_role = ROLE_DEVIL
- Mind.special_role = ROLE_DEVIL
- SSticker.mode.devils |= Mind
- return Mind
diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm
index 35d8c4b141e..73e3b721c06 100644
--- a/code/modules/events/heart_attack.dm
+++ b/code/modules/events/heart_attack.dm
@@ -18,7 +18,7 @@
heart_attack_contestants[victim] = 1
if(LAZYLEN(heart_attack_contestants))
- var/mob/living/carbon/human/winner = pickweight(heart_attack_contestants)
+ var/mob/living/carbon/human/winner = pick_weight(heart_attack_contestants)
var/datum/disease/D = new /datum/disease/heart_failure()
winner.ForceContractDisease(D, FALSE, TRUE)
announce_to_ghosts(winner)
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index f38d21b868c..1fbb017b7dd 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -42,7 +42,7 @@
/obj/effect/spawner/xmastree
name = "christmas tree spawner"
- icon = 'icons/effects/landmarks_static.dmi'
+ icon = 'icons/effects/mapping/landmarks_static.dmi'
icon_state = "x2"
layer = FLY_LAYER
@@ -74,13 +74,3 @@
/datum/round_event/santa/announce(fake)
priority_announce("Santa is coming to town!", "Unknown Transmission")
-
-/datum/round_event/santa/start()
- var/list/candidates = pollGhostCandidates("Santa is coming to town! Do you want to be Santa?", poll_time=150)
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- santa = new /mob/living/carbon/human(pick(GLOB.blobstart))
- santa.key = C.key
-
- var/datum/antagonist/santa/A = new
- santa.mind.add_antag_datum(A)
diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm
index adde1124935..4ba2d878ad4 100644
--- a/code/modules/events/immovable_rod.dm
+++ b/code/modules/events/immovable_rod.dm
@@ -62,7 +62,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
z_original = z
destination = end
special_target = aimed_at
- GLOB.poi_list += src
+ SSpoints_of_interest.make_point_of_interest(src)
var/special_target_valid = FALSE
if(special_target)
@@ -81,7 +81,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
ghost.ManualFollow(src)
/obj/effect/immovablerod/Destroy()
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
. = ..()
/obj/effect/immovablerod/Moved()
diff --git a/code/modules/events/major_dust.dm b/code/modules/events/major_dust.dm
deleted file mode 100644
index 7fb00124a94..00000000000
--- a/code/modules/events/major_dust.dm
+++ /dev/null
@@ -1,19 +0,0 @@
-/datum/round_event_control/meteor_wave/major_dust
- name = "Major Space Dust"
- typepath = /datum/round_event/meteor_wave/major_dust
- weight = 8
-
-/datum/round_event/meteor_wave/major_dust
- wave_name = "space dust"
-
-/datum/round_event/meteor_wave/major_dust/announce(fake)
- var/reason = pick(
- "The station is passing through a debris cloud, expect minor damage \
- to external fittings and fixtures.",
- "Nanotrasen Superweapons Division is testing a new prototype \
- [pick("field","projection","nova","super-colliding","reactive")] \
- [pick("cannon","artillery","tank","cruiser","\[REDACTED\]")], \
- some mild debris is expected.",
- "A neighbouring station is throwing rocks at you. (Perhaps they've \
- grown tired of your messages.)")
- priority_announce(pick(reason), "Collision Alert")
diff --git a/code/modules/events/meateor_wave.dm b/code/modules/events/meateor_wave.dm
deleted file mode 100644
index 11af56526c8..00000000000
--- a/code/modules/events/meateor_wave.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-/datum/round_event_control/meteor_wave/meaty
- name = "Meteor Wave: Meaty"
- typepath = /datum/round_event/meteor_wave/meaty
- weight = 2
- max_occurrences = 1
-
-/datum/round_event/meteor_wave/meaty
- wave_name = "meaty"
-
-/datum/round_event/meteor_wave/meaty/announce(fake)
- priority_announce("Meaty ores have been detected on collision course with the station.", "Oh crap, get the mop.",'sound/ai/meteors.ogg')
diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm
deleted file mode 100644
index a8ddab5aa76..00000000000
--- a/code/modules/events/meteor_wave.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-// Normal strength
-
-/datum/round_event_control/meteor_wave
- name = "Meteor Wave: Normal"
- typepath = /datum/round_event/meteor_wave
- weight = 4
- min_players = 15
- max_occurrences = 3
- earliest_start = 25 MINUTES
-
-/datum/round_event/meteor_wave
- startWhen = 6
- endWhen = 66
- announceWhen = 1
- var/list/wave_type
- var/wave_name = "normal"
-
-/datum/round_event/meteor_wave/New()
- ..()
- if(!wave_type)
- determine_wave_type()
-
-/datum/round_event/meteor_wave/proc/determine_wave_type()
- if(!wave_name)
- wave_name = pickweight(list(
- "normal" = 50,
- "threatening" = 40,
- "catastrophic" = 10))
- switch(wave_name)
- if("normal")
- wave_type = GLOB.meteors_normal
- if("threatening")
- wave_type = GLOB.meteors_threatening
- if("catastrophic")
- if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
- wave_type = GLOB.meteorsSPOOKY
- else
- wave_type = GLOB.meteors_catastrophic
- if("meaty")
- wave_type = GLOB.meteorsB
- if("space dust")
- wave_type = GLOB.meteorsC
- if("halloween")
- wave_type = GLOB.meteorsSPOOKY
- else
- WARNING("Wave name of [wave_name] not recognised.")
- kill()
-
-/datum/round_event/meteor_wave/announce(fake)
- priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg')
-
-/datum/round_event/meteor_wave/tick()
- if(ISMULTIPLE(activeFor, 3))
- spawn_meteors(5, wave_type) //meteor list types defined in gamemode/meteor/meteors.dm
-
-/datum/round_event_control/meteor_wave/threatening
- name = "Meteor Wave: Threatening"
- typepath = /datum/round_event/meteor_wave/threatening
- weight = 5
- min_players = 20
- max_occurrences = 3
- earliest_start = 35 MINUTES
-
-/datum/round_event/meteor_wave/threatening
- wave_name = "threatening"
-
-/datum/round_event_control/meteor_wave/catastrophic
- name = "Meteor Wave: Catastrophic"
- typepath = /datum/round_event/meteor_wave/catastrophic
- weight = 7
- min_players = 25
- max_occurrences = 3
- earliest_start = 45 MINUTES
-
-/datum/round_event/meteor_wave/catastrophic
- wave_name = "catastrophic"
diff --git a/code/modules/events/stray_cargo.dm b/code/modules/events/stray_cargo.dm
deleted file mode 100644
index 182ea658a7a..00000000000
--- a/code/modules/events/stray_cargo.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-///Spawns a cargo pod containing a random cargo supply pack on a random area of the station
-/datum/round_event_control/stray_cargo
- name = "Stray Cargo Pod"
- typepath = /datum/round_event/stray_cargo
- weight = 20
- max_occurrences = 4
- earliest_start = 10 MINUTES
-
-///Spawns a cargo pod containing a random cargo supply pack on a random area of the station
-/datum/round_event/stray_cargo
- var/area/impact_area ///Randomly picked area
- announceChance = 75
- var/list/possible_pack_types = list() ///List of possible supply packs dropped in the pod, if empty picks from the cargo list
- var/static/list/stray_spawnable_supply_packs = list() ///List of default spawnable supply packs, filtered from the cargo list
-
-/datum/round_event/stray_cargo/announce(fake)
- priority_announce("Stray cargo pod detected on long-range scanners. Expected location of impact: [impact_area.name].", "Collision Alert", zlevel = impact_area.virtual_z())
-
-/**
-* Tries to find a valid area, throws an error if none are found
-* Also randomizes the start timer
-*/
-/datum/round_event/stray_cargo/setup()
- startWhen = rand(20, 40)
- impact_area = find_event_area()
- if(!impact_area)
- CRASH("No valid areas for cargo pod found.")
- var/list/turf_test = get_area_turfs(impact_area)
- if(!turf_test.len)
- CRASH("Stray Cargo Pod : No valid turfs found for [impact_area] - [impact_area.type]")
-
- if(!stray_spawnable_supply_packs.len)
- stray_spawnable_supply_packs = SSshuttle.supply_packs.Copy()
-
-///Spawns a random supply pack, puts it in a pod, and spawns it on a random tile of the selected area
-/datum/round_event/stray_cargo/start()
- var/list/turf/valid_turfs = get_area_turfs(impact_area)
- //Only target non-dense turfs to prevent wall-embedded pods
- for(var/i in valid_turfs)
- var/turf/T = i
- if(T.density)
- valid_turfs -= T
- var/turf/LZ = pick(valid_turfs)
- var/pack_type
- if(possible_pack_types.len)
- pack_type = pick(possible_pack_types)
- else
- pack_type = pick(stray_spawnable_supply_packs)
- var/datum/supply_pack/SP = new pack_type
- var/obj/structure/closet/crate/crate = SP.generate(null)
- crate.locked = FALSE //Unlock secure crates
- crate.update_appearance()
- var/obj/structure/closet/supplypod/pod = make_pod()
- new /obj/effect/pod_landingzone(LZ, pod, crate)
-
-///Handles the creation of the pod, in case it needs to be modified beforehand
-/datum/round_event/stray_cargo/proc/make_pod()
- var/obj/structure/closet/supplypod/S = new
- return S
-
-///Picks an area that wouldn't risk critical damage if hit by a pod explosion
-/datum/round_event/stray_cargo/proc/find_event_area()
- var/static/list/allowed_areas
- if(!allowed_areas)
- ///Places that shouldn't explode
- var/list/safe_area_types = typecacheof(list(
- /area/ship/science/ai_chamber,
- /area/ship/engineering
- ))
-
- ///Subtypes from the above that actually should explode.
- var/list/unsafe_area_subtypes = typecacheof(list())
- allowed_areas = make_associative(typesof(/area/ship)) - safe_area_types + unsafe_area_subtypes
- var/list/possible_areas = typecache_filter_list(GLOB.sortedAreas,allowed_areas)
- if (length(possible_areas))
- return pick(possible_areas)
diff --git a/code/modules/events/wizard/blobies.dm b/code/modules/events/wizard/blobies.dm
deleted file mode 100644
index 7438b462f60..00000000000
--- a/code/modules/events/wizard/blobies.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/datum/round_event_control/wizard/blobies //avast!
- name = "Zombie Outbreak"
- weight = 3
- typepath = /datum/round_event/wizard/blobies
- max_occurrences = 3
-
-/datum/round_event/wizard/blobies/start()
-
- for(var/mob/living/carbon/human/H in GLOB.dead_mob_list)
- new /mob/living/simple_animal/hostile/blob/blobspore(H.loc)
diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm
deleted file mode 100644
index e99b0d75491..00000000000
--- a/code/modules/events/wizard/curseditems.dm
+++ /dev/null
@@ -1,60 +0,0 @@
-/datum/round_event_control/wizard/cursed_items //fashion disasters
- name = "Cursed Items"
- weight = 3
- typepath = /datum/round_event/wizard/cursed_items
- max_occurrences = 3
- earliest_start = 0 MINUTES
-
-//Note about adding items to this: Because of how NODROP_1 works if an item spawned to the hands can also be equiped to a slot
-//it will be able to be put into that slot from the hand, but then get stuck there. To avoid this make a new subtype of any
-//item you want to equip to the hand, and set its slots_flags = null. Only items equiped to hands need do this.
-
-/datum/round_event/wizard/cursed_items/start()
- var/item_set = pick("wizardmimic", "swords", "bigfatdoobie", "boxing", "voicemodulators", "catgirls2015")
- var/list/loadout[SLOTS_AMT]
- var/ruins_spaceworthiness
- var/ruins_wizard_loadout
-
- switch(item_set)
- if("wizardmimic")
- loadout[ITEM_SLOT_OCLOTHING] = /obj/item/clothing/suit/wizrobe
- loadout[ITEM_SLOT_FEET] = /obj/item/clothing/shoes/sandal/magic
- loadout[ITEM_SLOT_HEAD] = /obj/item/clothing/head/wizard
- ruins_spaceworthiness = 1
- if("swords")
- loadout[ITEM_SLOT_HANDS] = /obj/item/katana/cursed
- if("bigfatdoobie")
- loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/cigarette/rollie/trippy
- ruins_spaceworthiness = 1
- if("boxing")
- loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/luchador
- loadout[ITEM_SLOT_GLOVES] = /obj/item/clothing/gloves/boxing
- ruins_spaceworthiness = 1
- if("voicemodulators")
- loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/chameleon
- if("catgirls2015")
- loadout[ITEM_SLOT_HEAD] = /obj/item/clothing/head/kitty
- ruins_spaceworthiness = 1
- ruins_wizard_loadout = 1
-
- for(var/mob/living/carbon/human/H as anything in GLOB.human_list)
- if(ruins_spaceworthiness && isspaceturf(H.loc) || isplasmaman(H))
- continue //#savetheminers
- if(ruins_wizard_loadout && iswizard(H))
- continue
- if(item_set == "catgirls2015") //Wizard code means never having to say you're sorry
- H.gender = FEMALE
- for(var/i in 1 to loadout.len)
- if(loadout[i])
- var/obj/item/J = loadout[i]
- var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list
- H.dropItemToGround(H.get_item_by_slot(i), TRUE)
- H.equip_to_slot_or_del(I, i)
- ADD_TRAIT(I, TRAIT_NODROP, CURSED_ITEM_TRAIT)
- I.item_flags |= DROPDEL
- I.name = "cursed " + I.name
-
- for(var/mob/living/carbon/human/H as anything in GLOB.human_list)
- var/datum/effect_system/smoke_spread/smoke = new
- smoke.set_up(0, H.loc)
- smoke.start()
diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm
index 890bbc0f1f2..8e4baab893f 100644
--- a/code/modules/events/wizard/greentext.dm
+++ b/code/modules/events/wizard/greentext.dm
@@ -34,7 +34,7 @@
/obj/item/greentext/Initialize(mapload)
. = ..()
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
roundend_callback = CALLBACK(src, PROC_REF(check_winner))
SSticker.OnRoundend(roundend_callback)
@@ -83,7 +83,7 @@
if(!(resistance_flags & ON_FIRE) && !force)
return QDEL_HINT_LETMELIVE
- GLOB.poi_list.Remove(src)
+ SSpoints_of_interest.remove_point_of_interest(src)
LAZYREMOVE(SSticker.round_end_events, roundend_callback)
roundend_callback = null //This ought to free the callback datum, and prevent us from harddeling
for(var/i in GLOB.player_list)
diff --git a/code/modules/faction/faction_datum.dm b/code/modules/faction/faction_datum.dm
new file mode 100644
index 00000000000..487d4f9c781
--- /dev/null
+++ b/code/modules/faction/faction_datum.dm
@@ -0,0 +1,104 @@
+/datum/faction
+ var/name
+ /// Primarly to be used for backend stuff.
+ var/short_name
+ var/parent_faction
+ /// List of prefixes that ships of this faction uses
+ var/list/prefixes
+ /// list of factions that are "allowed" with this faction, used for factional cargo
+ var/list/allowed_factions
+
+/datum/faction/New()
+ if(!short_name)
+ short_name = name
+
+/// Easy way to check if something is "allowed", checks to see if it matches the name or faction typepath because factions are a fucking mess
+/datum/faction/proc/allowed_faction(value_to_check)
+ ///Are we the same datum?
+ if(istype(value_to_check, src))
+ return TRUE
+ ///Allow if we share a parent faction
+ if(istype(value_to_check, parent_faction))
+ return TRUE
+ //do we have the same faction even if one is a define?
+ if(value_to_check == name)
+ return TRUE
+ if(value_to_check in allowed_factions)
+ return TRUE
+ return FALSE
+
+/datum/faction/syndicate
+ name = FACTION_SYNDICATE
+ parent_faction = /datum/faction/syndicate
+ prefixes = PREFIX_SYNDICATE
+
+/datum/faction/syndicate/ngr
+ name = FACTION_NGR
+ short_name = "NGR"
+ prefixes = PREFIX_NGR
+
+/datum/faction/syndicate/cybersun
+ name = FACTION_CYBERSUN
+ prefixes = PREFIX_CYBERSUN
+
+/datum/faction/syndicate/hardliners
+ name = FACTION_HARDLINERS
+ prefixes = PREFIX_HARDLINERS
+
+/datum/faction/syndicate/suns
+ name = FACTION_SUNS
+ short_name = "SUNS"
+ prefixes = PREFIX_SUNS
+
+/datum/faction/solgov
+ name = FACTION_SOLGOV
+ prefixes = PREFIX_SOLGOV
+
+/datum/faction/srm
+ name = FACTION_SRM
+ short_name = "SRM"
+ prefixes = PREFIX_SRM
+
+/datum/faction/inteq
+ name = FACTION_INTEQ
+ short_name = "INTEQ"
+ prefixes = PREFIX_INTEQ
+
+/datum/faction/clip
+ name = FACTION_CLIP
+ short_name = "CLIP"
+ prefixes = PREFIX_CLIP
+
+/datum/faction/nt
+ name = FACTION_NT
+ short_name = "NT"
+ parent_faction = /datum/faction/nt
+ prefixes = PREFIX_NT
+
+/datum/faction/nt/ns_logi
+ name = FACTION_NS_LOGI
+ prefixes = PREFIX_NS_LOGI
+
+/datum/faction/nt/vigilitas
+ name = FACTION_VIGILITAS
+ prefixes = PREFIX_VIGILITAS
+
+/datum/faction/frontier
+ name = FACTION_FRONTIER
+ prefixes = PREFIX_FRONTIER
+
+/datum/faction/pgf
+ name = FACTION_PGF
+ short_name = "PGF"
+ prefixes = PREFIX_PGF
+
+/datum/faction/independent
+ name = FACTION_INDEPENDENT
+ short_name = "Indie"
+ prefixes = PREFIX_INDEPENDENT
+
+/datum/faction/syndicate/scarborough_arms
+ name = "Scarborough Arms"
+ parent_faction = /datum/faction/syndicate
+ prefixes = PREFIX_INDEPENDENT
+ allowed_factions = list(/datum/faction/syndicate)
diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm
index 229924eee7b..42fc90d0cc1 100644
--- a/code/modules/fishing/aquarium/aquarium_kit.dm
+++ b/code/modules/fishing/aquarium/aquarium_kit.dm
@@ -4,7 +4,7 @@
desc = "Autogenerates nutritious fish feed based on sample inside."
icon = 'icons/obj/aquarium.dmi'
icon_state = "fish_feed"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/fish_feed/Initialize(mapload)
. = ..()
@@ -32,13 +32,12 @@
desc = "Everything you need to build your own aquarium. Raw materials sold separately."
icon = 'icons/obj/aquarium.dmi'
icon_state = "construction_kit"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/aquarium_kit/attack_self(mob/user)
. = ..()
to_chat(user,span_notice("There's instruction and tools necessary to build aquarium inside. All you need is to start crafting."))
-
/obj/item/aquarium_prop
name = "generic aquarium prop"
desc = "very boring"
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index f474018739d..40b979a8957 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -1,6 +1,6 @@
// Fish path used for autogenerated fish
/obj/item/fish
- name = "generic looking aquarium fish"
+ name = "generic fish"
desc = "very bland"
icon = 'icons/obj/aquarium.dmi'
icon_state = "trout" //Replace this with "bugfish" from tg please
@@ -386,6 +386,6 @@
if(initial(fish.available_in_random_cases) || !case_fish_only)
chance_table[fish] = initial(fish.random_case_rarity)
probability_table[argkey] = chance_table
- return pickweight(probability_table[argkey])
+ return pick_weight(probability_table[argkey])
diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm
index eeb0696315e..bf4df70be8e 100644
--- a/code/modules/fishing/fishing_minigame.dm
+++ b/code/modules/fishing/fishing_minigame.dm
@@ -64,7 +64,7 @@
if(rod.hook.fishing_hook_traits & FISHING_HOOK_WEIGHTED)
special_effects += FISHING_MINIGAME_RULE_WEIGHTED_BAIT
-/datum/fishing_challenge/Destroy(force, ...)
+/datum/fishing_challenge/Destroy(force)
if(!completed)
complete(win = FALSE)
if(fishing_line)
diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm
index 136a650148c..db051d69175 100644
--- a/code/modules/fishing/sources/_fish_source.dm
+++ b/code/modules/fishing/sources/_fish_source.dm
@@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(preset_fish_sources,init_fishing_configurations())
/// In case you want more complex rules for specific spots
/datum/fish_source/proc/roll_reward(obj/item/fishing_rod/rod, mob/fisherman)
- return pickweight(get_modified_fish_table(rod,fisherman))
+ return pick_weight(get_modified_fish_table(rod,fisherman))
/// Gives out the reward if possible
/datum/fish_source/proc/dispense_reward(reward_path, mob/fisherman)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index ced086e1dfc..30b768e702b 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -29,17 +29,19 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if(!hallucination)
return
- hallucination--
+ hallucination = max(hallucination - 1, 0)
if(world.time < next_hallucination)
return
- var/halpick = pickweight(GLOB.hallucination_list)
+ var/halpick = pick_weight(GLOB.hallucination_list)
new halpick(src, FALSE)
next_hallucination = world.time + rand(100, 600)
/mob/living/carbon/proc/set_screwyhud(hud_type)
+ if(HAS_TRAIT(src, TRAIT_ANALGESIA))
+ hud_type = SCREWYHUD_HEALTHY
hal_screwyhud = hud_type
update_health_hud()
@@ -476,15 +478,15 @@ GLOBAL_LIST_INIT(hallucination_list, list(
A = image(image_file,H,"dualsaberred1", layer=ABOVE_MOB_LAYER)
if("taser")
if(side == "right")
- image_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ image_file = GUN_RIGHTHAND_ICON
else
- image_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
+ image_file = GUN_LEFTHAND_ICON
A = image(image_file,H,"advtaserstun4", layer=ABOVE_MOB_LAYER)
if("ebow")
if(side == "right")
- image_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ image_file = GUN_RIGHTHAND_ICON
else
- image_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
+ image_file = GUN_LEFTHAND_ICON
A = image(image_file,H,"crossbow", layer=ABOVE_MOB_LAYER)
if("baton")
if(side == "right")
@@ -1023,11 +1025,11 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if(prob(25))
target.halitem.icon_state = "plasticx40"
if(3) //sword
- target.halitem.icon = 'icons/obj/transforming_energy.dmi'
+ target.halitem.icon = 'icons/obj/weapon/energy.dmi'
target.halitem.icon_state = "sword0"
target.halitem.name = "Energy Sword"
if(4) //stun baton
- target.halitem.icon = 'icons/obj/items_and_weapons.dmi'
+ target.halitem.icon = 'icons/obj/items.dmi'
target.halitem.icon_state = "stunbaton"
target.halitem.name = "Stun Baton"
if(5) //emag
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 32c4b1a9a09..1caa3bcb14f 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -233,7 +233,7 @@
/obj/item/reagent_containers/food/drinks/ice
name = "ice cup"
desc = "Careful, cold ice, do not chew."
- custom_price = 15
+ custom_price = 5
icon_state = "coffee"
list_reagents = list(/datum/reagent/consumable/ice = 30)
spillable = TRUE
@@ -268,21 +268,21 @@
list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5)
foodtype = SUGAR
resistance_flags = FREEZE_PROOF
- custom_price = 120
+ custom_price = 5
/obj/item/reagent_containers/food/drinks/cafelatte
name = "cafe latte"
desc = "A nice, strong and refreshing beverage while you're reading."
icon_state = "cafe_latte"
list_reagents = list(/datum/reagent/consumable/cafe_latte = 30)
- custom_price = 200
+ custom_price = 5
/obj/item/reagent_containers/food/drinks/soylatte
name = "soy latte"
desc = "A nice and refreshing beverage while you're reading."
icon_state = "soy_latte"
list_reagents = list(/datum/reagent/consumable/soy_latte = 30)
- custom_price = 200
+ custom_price = 5
/obj/item/reagent_containers/food/drinks/dry_ramen
name = "cup ramen"
@@ -291,7 +291,7 @@
list_reagents = list(/datum/reagent/consumable/dry_ramen = 15, /datum/reagent/consumable/sodiumchloride = 3)
foodtype = GRAIN
isGlass = FALSE
- custom_price = 95
+ custom_price = 5
/obj/item/reagent_containers/food/drinks/waterbottle
name = "Ryuunosuke Reserve" //we still have to find a way to make multiple variants as per the plan
@@ -305,7 +305,7 @@
amount_per_transfer_from_this = 10
fill_icon_thresholds = list(0, 10, 25, 50, 75, 80, 90)
isGlass = FALSE
- custom_price = 30
+ custom_price = 8
can_have_cap = TRUE
// The 2 bottles have separate cap overlay icons because if the bottle falls over while bottle flipping the cap stays fucked on the moved overlay
cap_icon_state = "bottle_cap_small"
@@ -373,8 +373,8 @@
desc = "A popular Gezenan drink made of fermented honey and spices, known as Gezenan Dark Mead, or GDM for short."
icon_state = "beer"
list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
- foodtype = GRAIN | ALCOHOL
- custom_price = 60
+ foodtype = SUGAR | ALCOHOL
+ custom_price = 10
/obj/item/reagent_containers/food/drinks/beer/light
name = "Carp Lite"
@@ -388,7 +388,7 @@
item_state = "beer"
list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30)
foodtype = GRAIN | ALCOHOL
- custom_price = 60
+ custom_price = 15
/obj/item/reagent_containers/food/drinks/sillycup
name = "paper cup"
@@ -512,7 +512,7 @@
/obj/item/reagent_containers/food/drinks/flask
name = "flask"
desc = "Every good spacer knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
- custom_price = 200
+ custom_price = 20
icon_state = "flask"
custom_materials = list(/datum/material/iron=250)
volume = 60
@@ -554,7 +554,7 @@
reagent_flags = NONE
spillable = FALSE
isGlass = FALSE
- custom_price = 45
+ custom_price = 5
var/pierced = FALSE
obj_flags = CAN_BE_HIT
@@ -593,6 +593,7 @@
broh.losebreath++
switch(broh.losebreath)
if(-INFINITY to 0)
+ EMPTY_BLOCK_GUARD
if(1 to 2)
if(prob(30))
user.visible_message("[broh]'s eyes water as [broh.p_they()] chug the can of [src]!")
@@ -762,7 +763,7 @@
desc = "If you ever wondered where air came from..."
list_reagents = list(/datum/reagent/oxygen = 6, /datum/reagent/nitrogen = 24)
icon = 'icons/obj/food/ration.dmi'
- icon_state = "ration_package"
+ icon_state = "ration_drink"
drop_sound = 'sound/items/handling/cardboardbox_drop.ogg'
pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg'
in_container = TRUE
@@ -773,7 +774,7 @@
/obj/item/reagent_containers/food/drinks/ration/proc/open_ration(mob/user)
to_chat(user, "You tear open \the [src].")
- playsound(user.loc, 'sound/effects/rip3.ogg', 50)
+ playsound(user.loc, 'sound/items/glass_cap.ogg', 50)
reagents.flags |= OPENCONTAINER
spillable = TRUE
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 48744fac95d..1a3a7833d0f 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -9,7 +9,7 @@
desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents."
icon_state = "glassbottle"
fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90)
- custom_price = 65
+ custom_price = 15
amount_per_transfer_from_this = 10
volume = 100
force = 15 //Smashing bottles over someone's head hurts.
@@ -32,7 +32,7 @@
desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents."
icon_state = "glassbottlesmall"
volume = 50
- custom_price = 55
+ custom_price = 1
/obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user)
if(!target)
@@ -135,11 +135,6 @@
icon_state = "whiskeybottle"
list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 100)
-/obj/item/reagent_containers/food/drinks/bottle/kong
- name = "Kong"
- desc = "Makes You Go Ape!"
- list_reagents = list(/datum/reagent/consumable/ethanol/whiskey/kong = 100)
-
/obj/item/reagent_containers/food/drinks/bottle/candycornliquor
name = "candy corn liquor"
desc = "Like they drank in 2D speakeasies."
@@ -202,10 +197,10 @@
/obj/item/reagent_containers/food/drinks/bottle/kahlua
name = "Keh'Lu'Tex Liqueur"
- desc = "An adapted recipe of a caffeine-mixed liqueur originating from Reh'himl, which replaces it's original ingredient with coffee from Terra."
+ desc = "An adapted recipe of a caffeine-mixed liqueur originating from Reh'himl, which replaces its original ingredient with coffee from Terra."
icon_state = "kahluabottle"
list_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 100)
- foodtype = VEGETABLES
+ foodtype = SUGAR | ALCOHOL //it's coffee and rum .
/obj/item/reagent_containers/food/drinks/bottle/goldschlager
name = "Student-Union's Gold Standard"
@@ -297,7 +292,7 @@
/obj/item/reagent_containers/food/drinks/bottle/orangejuice
name = "orange juice"
desc = "Sweet and tart orange juice. Usually found fortified to make it more nutritious. Full of vitamin C!"
- custom_price = 100
+ custom_price = 10
icon_state = "orangejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -309,7 +304,7 @@
/obj/item/reagent_containers/food/drinks/bottle/lemonjuice
name = "lemon juice"
desc = "Lemonade for everyone!"
- custom_price = 100
+ custom_price = 10
icon_state = "lemonjuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -321,7 +316,7 @@
/obj/item/reagent_containers/food/drinks/bottle/cream
name = "milk cream"
desc = "Cream made from milk. It's thicker than milk, which hopefully prevents any mixups."
- custom_price = 100
+ custom_price = 10
icon_state = "cream"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -333,7 +328,7 @@
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
name = "tomato juice"
desc = "Juice from tomatoes and salt. You'll often find some technicians soaking in this if they've been working with plasma."
- custom_price = 100
+ custom_price = 10
icon_state = "tomatojuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -345,7 +340,7 @@
/obj/item/reagent_containers/food/drinks/bottle/limejuice
name = "lime juice"
desc = "Lime juice. You might want to mix something with this instead of drinking it straight..."
- custom_price = 100
+ custom_price = 10
icon_state = "limejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -357,7 +352,7 @@
/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice
name = "pineapple juice"
desc = "Tart, sweet juice from the tropical pineapple."
- custom_price = 100
+ custom_price = 10
icon_state = "pineapplejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -370,7 +365,7 @@
/obj/item/reagent_containers/food/drinks/bottle/menthol
name = "menthol"
desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
- custom_price = 100
+ custom_price = 10
icon_state = "mentholbox"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -381,7 +376,7 @@
/obj/item/reagent_containers/food/drinks/bottle/grenadine
name = "Three-Star Grenadine"
desc = "A commonly seen bottle of grenadine - or sweet fruit syrup. It might even contain real cherries, as well as some blackcurrant for color."
- custom_price = 100
+ custom_price = 10
icon_state = "grenadine"
isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/grenadine = 100)
@@ -391,7 +386,7 @@
/obj/item/reagent_containers/food/drinks/bottle/applejack
name = "Mars Lightning"
desc = "A strong brandy originating from apples, considered the older sibling to hard cider. Mars Lightning is often partnered with anti-gravity racing companies, leading to it often being served straight or for impromptu mixes."
- custom_price = 100
+ custom_price = 15
icon_state = "applejack_bottle"
isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100)
@@ -400,7 +395,7 @@
/obj/item/reagent_containers/food/drinks/bottle/champagne
name = "Treu Champagne"
desc = "Finely sourced from entire canton planets dedicated to faithful reproduction of pre-Night Of Fire vineyards. Typically enjoyed for celebrations and the turn of new years."
- custom_premium_price = 250
+ custom_premium_price = 25
icon_state = "champagne_bottle"
isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100)
@@ -414,7 +409,7 @@
/obj/item/reagent_containers/food/drinks/bottle/trappist
name = "Roumain Trapper's"
desc = "Traditionally (and heavily monitored for authenticity) made beer brewed on Illestren. Trapper's beer must be brewed by Saint Roumain Hunters or Shadows, made to fit the needs of their community first, and must never be made for profit... which makes it a common sight in the Frontier."
- custom_premium_price = 170
+ custom_premium_price = 17
icon_state = "trappistbottle"
volume = 50
list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50)
@@ -453,14 +448,27 @@
isGlass = TRUE
////////////////////////// MOLOTOV ///////////////////////
-/obj/item/reagent_containers/food/drinks/bottle/molotov
+/obj/item/reagent_containers/food/drinks/molotov
name = "molotov cocktail"
desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by desperate militias and revolutionaries. Light and toss."
icon_state = "vodkabottle"
+ fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90)
+ amount_per_transfer_from_this = 10
+ volume = 100
+ force = 15 //Smashing bottles over someone's head hurts.
+ throwforce = 15
+ item_state = "broken_beer" //Generic held-item sprite until unique ones are made.
+ lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
+ pickup_sound = 'sound/items/handling/bottle_pickup.ogg'
+ drop_sound = 'sound/items/handling/bottle_drop.ogg'
+ var/const/duration = 13 //Directly relates to the 'knockdown' duration. Lowered by armor (i.e. helmets)
+ isGlass = TRUE
+ foodtype = ALCOHOL
list_reagents = list()
var/active = 0
-/obj/item/reagent_containers/food/drinks/bottle/molotov/CheckParts(list/parts_list)
+/obj/item/reagent_containers/food/drinks/molotov/CheckParts(list/parts_list)
..()
var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents
if(B)
@@ -471,7 +479,7 @@
isGlass = FALSE
return
-/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/reagent_containers/food/drinks/molotov/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
var/firestarter = FALSE
for(var/datum/reagent/reagent as anything in reagents.reagent_list)
if(reagent.accelerant_quality)
@@ -479,10 +487,16 @@
break
if(firestarter && active)
hit_atom.fire_act()
- new /obj/effect/hotspot(get_turf(hit_atom))
+ var/turf/T = get_turf(hit_atom)
+ T.IgniteTurf(30)
+ var/turf/otherT
+ for(var/direction in GLOB.cardinals)
+ otherT = get_step(T, direction)
+ otherT.IgniteTurf(30)
+ new /obj/effect/hotspot(otherT)
..()
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
+/obj/item/reagent_containers/food/drinks/molotov/attackby(obj/item/I, mob/user, params)
if(I.get_temperature() && !active)
active = TRUE
log_bomber(user, "has primed a", src, "for detonation")
@@ -492,7 +506,7 @@
if(!isGlass)
addtimer(CALLBACK(src, PROC_REF(explode)), 5 SECONDS)
-/obj/item/reagent_containers/food/drinks/bottle/molotov/proc/explode()
+/obj/item/reagent_containers/food/drinks/molotov/proc/explode()
if(!active)
return
if(get_turf(src))
@@ -504,7 +518,7 @@
target.fire_act()
qdel(src)
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attack_self(mob/user)
+/obj/item/reagent_containers/food/drinks/molotov/attack_self(mob/user)
if(active)
if(!isGlass)
to_chat(user, "The flame's spread too far on it!")
@@ -513,6 +527,9 @@
cut_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay)
active = 0
+/obj/item/reagent_containers/food/drinks/molotov/full
+ list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100)
+
/obj/item/reagent_containers/food/drinks/bottle/pruno
name = "pruno mix"
desc = "A trash bag filled with fruit, sugar, yeast, and water, pulped together into a pungent slurry to be fermented in an enclosed space, traditionally the toilet."
@@ -600,9 +617,9 @@
/obj/item/sandstar
name = "SandBlast Sarsaparilla star"
desc = "Legend says something amazing happens when you collect enough of these."
- custom_price = 100
- custom_premium_price = 110
- icon = 'icons/obj/items_and_weapons.dmi'
+ custom_price = 10
+ custom_premium_price = 11
+ icon = 'icons/obj/items.dmi'
icon_state = "sandstar"
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/gold = 200)
@@ -618,6 +635,10 @@
custom_materials = list(/datum/material/wood = 800)
w_class = WEIGHT_CLASS_BULKY
var/sealed = FALSE
+ var/max_bottles = 6
+ var/list/valid_bottles = list(/obj/item/reagent_containers/food/drinks/beer,
+ /obj/item/reagent_containers/food/drinks/ale,
+ /obj/item/reagent_containers/food/drinks/bottle)
/obj/item/storage/bottles/Initialize()
. = ..()
@@ -628,12 +649,8 @@
var/datum/component/storage/S = GetComponent(/datum/component/storage)
S.max_w_class = WEIGHT_CLASS_NORMAL
S.max_combined_w_class = 16
- S.max_items = 6
- S.set_holdable(list(
- /obj/item/reagent_containers/food/drinks/beer,
- /obj/item/reagent_containers/food/drinks/ale,
- /obj/item/reagent_containers/food/drinks/bottle
- ))
+ S.max_items = max_bottles
+ S.set_holdable(valid_bottles)
S.locked = sealed
/obj/item/storage/bottles/update_icon_state()
@@ -668,3 +685,17 @@
/obj/item/storage/bottles/sandblast/PopulateContents()
for(var/i in 1 to 6)
new /obj/item/reagent_containers/food/drinks/bottle/sarsaparilla(src)
+
+/obj/item/storage/bottles/moonshine
+ name = "moonshine bottle crate"
+ desc = "Holds four bottles of the strongest hooch this side of the Frontier."
+ icon_state = "hoochcrate"
+ max_bottles = 4
+ valid_bottles = list(/obj/item/reagent_containers/food/drinks/bottle/moonshine)
+
+/obj/item/storage/bottles/moonshine/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/reagent_containers/food/drinks/bottle/moonshine(src)
+
+/obj/item/storage/bottles/moonshine/sealed
+ sealed = TRUE
diff --git a/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm b/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm
index 922e74ee9a3..45dc05531ba 100644
--- a/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm
@@ -1,6 +1,6 @@
/obj/item/reagent_containers/food/drinks/breakawayflask
name = "breakaway flask"
- desc = "A special flask designed to stabilize trick wines and shatter violently on contact."
+ desc = "A special flask designed to stabilize Illestren Bacterium and shatter violently on contact."
icon_state = "breakawayflask"
item_state = "breakawayflask"
w_class = WEIGHT_CLASS_SMALL
@@ -15,7 +15,7 @@
obj_flags = UNIQUE_RENAME
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
- custom_price = 25
+ custom_price = 15
can_have_cap = TRUE
cap_icon_state = "baflask_cap"
cap_on = TRUE
@@ -41,7 +41,7 @@
else
icon_state = "breakawayflask"
name = "breakaway flask"
- desc = "A special flask designed to stabilize trick wines and shatter violently on contact."
+ desc = "A special flask designed to stabilize Illestren Bacterium and shatter violently on contact."
return
/obj/item/reagent_containers/food/drinks/breakawayflask/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
@@ -54,31 +54,21 @@
vintage = TRUE
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine
- name = "Vintage Saint-Roumain Ashwine"
+ name = "Vintage Wine of Ash"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/ash_wine = 45, /datum/reagent/consumable/ethanol/absinthe = 5)
- desc = "Ashwine was originally created using herbs native to Illestren, as a means of relaxing after a long hunt. The Saint-Roumain Militia has no prohibition on a little fun."
+ desc = "Wine of Ash was originally created using herbs native to Illestren, as a means of relaxing after a long hunt. The Saint-Roumain Militia has no prohibition on a little fun."
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine
- name = "Vintage Saint-Roumain Icewine"
+ name = "Vintage Wine Of Ice"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/ice_wine = 45, /datum/reagent/consumable/ethanol/sake = 5)
- desc = "Icewine, inspired by the frigid slopes of the 'Godforsaken Precipice' that forged the group's reputation as valiant survivalists, was engineered to both soothe overheated Hunters and freeze their foes in their tracks."
+ desc = "Wine Of Ice, inspired by the frigid slopes of the 'Godforsaken Precipice' that forged the group's reputation as valiant survivalists, was engineered to both soothe overheated Hunters and freeze their foes in their tracks."
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine
- name = "Vintage Saint-Roumain Shockwine"
+ name = "Vintage Lightnings' Blessing"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/shock_wine = 45, /datum/reagent/consumable/ethanol/vodka = 5)
- desc = "Shockwine, made to invigorate consumers and incapacitate targets, took inspiration from an incident early in the Saint-Roumain Militia's history, when a young Shadow stopped a rampaging beast by plunging an electrical cable that had been dislodged in the fighting into its side."
+ desc = "Lightnings' Blessing, made to invigorate consumers and incapacitate targets, took inspiration from an incident early in the Saint-Roumain Militia's history, when a young Shadow stopped a rampaging beast by plunging an electrical cable that had been dislodged in the fighting into its side."
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine
- name = "Vintage Saint-Roumain Hearthwine"
+ name = "Vintage Hearthflame"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/hearth_wine = 45, /datum/reagent/consumable/ethanol/hcider = 5)
- desc = "Hearthwine is one of the most important tonics devised by the SRM – both for its potent abilities in staunching wounds or setting enemies aflame, and for its closeness to the divine fire associated with the Ashen Huntsman."
-
-/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine
- name = "Vintage Saint-Roumain Forcewine"
- list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/force_wine = 45, /datum/reagent/consumable/ethanol/tequila = 5)
- desc = "Forcewine was originally created as a means to create temporary shelters during long tracking expeditions. While the structures proved to be not as versatile in shape as its brewers had hoped, its utility in creating barricades or heming in hostiles was still greatly appreciated."
-
-/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine
- name = "Vintage Saint-Roumain Prismwine"
- list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/prism_wine = 45, /datum/reagent/consumable/ethanol/gin = 5)
- desc = "Prismwine is one of the most recent additions to the Saint-Roumain Militia's reserve of trickwines. It was purpose-created for fighting hostiles that utilized more advanced energy projection attacks, such as the cryonic beams of watchers or the laser guns of interstellar pirates."
+ desc = "Hearthflame is one of the most important tonics devised by the SRM – both for its potent abilities in staunching wounds or setting enemies aflame, and for its closeness to the divine fire associated with the Ashen Huntsman."
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 2f73f7678e3..79dccfc28f4 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -13,7 +13,7 @@
obj_flags = UNIQUE_RENAME
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
- custom_price = 25
+ custom_price = 2
/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype)
cut_overlays()
@@ -33,6 +33,32 @@
icon_state = "glass_empty"
renamedByPlayer = FALSE //so new drinks can rename the glass
+/obj/item/reagent_containers/food/drinks/beaglemug
+ name = "beagle mug"
+ desc = "A beloved edifice of a Dog, now as a mug!"
+ icon_state = "beaglemug"
+ amount_per_transfer_from_this = 10
+ volume = 30
+ custom_materials = list(/datum/material/glass=500)
+ max_integrity = 20
+ spillable = TRUE
+ resistance_flags = ACID_PROOF
+ obj_flags = UNIQUE_RENAME
+ drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
+ pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
+ custom_price = 15
+
+/obj/item/reagent_containers/food/drinks/beaglemug/on_reagent_change(changetype)
+ cut_overlays()
+ if(reagents.reagent_list.len)
+ var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "beaglemug_overlay")
+ icon_state = "beaglemug"
+ reagent_overlay.color = mix_color_from_reagents(reagents.reagent_list)
+ add_overlay(reagent_overlay)
+ else
+ icon_state = "beaglemug"
+ renamedByPlayer = FALSE
+
//Shot glasses!//
// This lets us add shots in here instead of lumping them in with drinks because >logic //
// The format for shots is the exact same as iconstates for the drinking glass, except you use a shot glass instead. //
@@ -49,7 +75,7 @@
possible_transfer_amounts = list()
volume = 15
custom_materials = list(/datum/material/glass=100)
- custom_price = 20
+ custom_price = 1
var/filled_desc = "The challenge is not taking as many as you can, but guessing what it is before you pass out."
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change(changetype)
diff --git a/code/modules/food_and_drinks/drinks/drinks/modglass.dm b/code/modules/food_and_drinks/drinks/drinks/modglass.dm
index 056ece3409a..2ac2a22870b 100644
--- a/code/modules/food_and_drinks/drinks/drinks/modglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/modglass.dm
@@ -35,7 +35,7 @@ GLOBAL_LIST_EMPTY(glass_variants)
obj_flags = UNIQUE_RENAME
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
- custom_price = 25
+ custom_price = 5
//rim defines the size of rim the glass has, used to decide which skins are available, and which garnish sprites to use
var/rim = RIM_MEDIUM
//stores the number of variations this glass sprite has to select from
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 0adf98ba566..bd24a21d1a1 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -5,7 +5,7 @@
// to mixed-drinks code. If you want an object that starts pre-loaded, you need to make it in addition to the other code.
//Food items that aren't eaten normally and leave an empty container behind.
-/obj/item/reagent_containers/food/condiment
+/obj/item/reagent_containers/condiment
name = "condiment bottle"
desc = "Just your average condiment bottle."
icon = 'icons/obj/food/containers.dmi'
@@ -36,23 +36,25 @@
var/icon_empty = ""
fill_icon_thresholds = list(0, 10, 25, 50, 75, 100)
-/obj/item/reagent_containers/food/condiment/Initialize()
+/obj/item/reagent_containers/condiment/Initialize()
. = ..()
possible_states = typelist("possible_states", possible_states)
update_appearance()
-/obj/item/reagent_containers/food/condiment/update_icon()
+/obj/item/reagent_containers/condiment/update_icon()
cut_overlays()
if(reagents.reagent_list.len > 0 && possible_states.len)
- var/main_reagent = reagents.get_master_reagent_id()
- if(main_reagent in possible_states)
- icon_state = possible_states[main_reagent]["icon_state"]
- item_state = possible_states[main_reagent]["item_state"]
- icon_empty = possible_states[main_reagent]["icon_empty"]
- name = possible_states[main_reagent]["name"]
- desc = possible_states[main_reagent]["desc"]
+
+ var/datum/reagent/main_reagent_ref = reagents.get_master_reagent()
+ var/main_reagent_id = main_reagent_ref.type
+ if(main_reagent_id in possible_states)
+ icon_state = possible_states[main_reagent_id]["icon_state"]
+ item_state = possible_states[main_reagent_id]["item_state"]
+ icon_empty = possible_states[main_reagent_id]["icon_empty"]
+ name = possible_states[main_reagent_id]["name"]
+ desc = possible_states[main_reagent_id]["desc"]
return ..(TRUE) // Don't fill normally
else
name = "condiment bottle"
@@ -64,7 +66,7 @@
. = ..()
-/obj/item/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/condiment/attack(mob/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
to_chat(user, "None of [src] left, oh no!")
@@ -90,7 +92,7 @@
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
return 1
-/obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity)
+/obj/item/reagent_containers/condiment/afterattack(obj/target, mob/user , proximity)
. = ..()
if(!proximity)
return
@@ -119,23 +121,23 @@
to_chat(user, "You transfer [trans] units of the condiment to [target].")
playsound(src, 'sound/items/glass_transfer.ogg', 50, 1)
-/obj/item/reagent_containers/food/condiment/on_reagent_change(changetype)
+/obj/item/reagent_containers/condiment/on_reagent_change(changetype)
update_appearance()
-/obj/item/reagent_containers/food/condiment/enzyme
+/obj/item/reagent_containers/condiment/enzyme
name = "universal enzyme"
desc = "Used in cooking various dishes."
icon_state = "enzyme"
list_reagents = list(/datum/reagent/consumable/enzyme = 50)
-/obj/item/reagent_containers/food/condiment/sugar
+/obj/item/reagent_containers/condiment/sugar
name = "sugar sack"
desc = "Tasty spacey sugar!"
icon_state = "sugar"
item_state = "flour"
list_reagents = list(/datum/reagent/consumable/sugar = 50)
-/obj/item/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then
+/obj/item/reagent_containers/condiment/saltshaker //Separate from above since it's a small shaker rather then
name = "salt shaker" // a large one.
desc = "Salt. From space oceans, presumably."
icon_state = "saltshakersmall"
@@ -145,7 +147,7 @@
volume = 20
list_reagents = list(/datum/reagent/consumable/sodiumchloride = 20)
-/obj/item/reagent_containers/food/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity)
+/obj/item/reagent_containers/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity)
. = ..()
if(!proximity)
return
@@ -158,7 +160,7 @@
new/obj/effect/decal/cleanable/food/salt(target)
return
-/obj/item/reagent_containers/food/condiment/peppermill
+/obj/item/reagent_containers/condiment/peppermill
name = "pepper mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
@@ -168,7 +170,7 @@
volume = 20
list_reagents = list(/datum/reagent/consumable/blackpepper = 20)
-/obj/item/reagent_containers/food/condiment/milk
+/obj/item/reagent_containers/condiment/milk
name = "space milk"
desc = "It's milk. White and nutritious goodness!"
icon_state = "milk"
@@ -177,14 +179,14 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
list_reagents = list(/datum/reagent/consumable/milk = 50)
-/obj/item/reagent_containers/food/condiment/flour
+/obj/item/reagent_containers/condiment/flour
name = "flour sack"
desc = "A big bag of flour. Good for baking!"
icon_state = "flour"
item_state = "flour"
list_reagents = list(/datum/reagent/consumable/flour = 30)
-/obj/item/reagent_containers/food/condiment/soymilk
+/obj/item/reagent_containers/condiment/soymilk
name = "soy milk"
desc = "It's soy milk. White and nutritious goodness!"
icon_state = "soymilk"
@@ -193,20 +195,20 @@
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
list_reagents = list(/datum/reagent/consumable/soymilk = 50)
-/obj/item/reagent_containers/food/condiment/rice
+/obj/item/reagent_containers/condiment/rice
name = "rice sack"
desc = "A big bag of rice. Good for cooking!"
icon_state = "rice"
item_state = "flour"
list_reagents = list(/datum/reagent/consumable/rice = 30)
-/obj/item/reagent_containers/food/condiment/soysauce
+/obj/item/reagent_containers/condiment/soysauce
name = "soy sauce"
desc = "A salty soy-based flavoring."
icon_state = "soysauce"
list_reagents = list(/datum/reagent/consumable/soysauce = 50)
-/obj/item/reagent_containers/food/condiment/mayonnaise
+/obj/item/reagent_containers/condiment/mayonnaise
name = "mayonnaise"
desc = "An oily condiment made from egg yolks."
icon_state = "mayonnaise"
@@ -214,7 +216,7 @@
//Food packs. To easily apply deadly toxi... delicious sauces to your food!
-/obj/item/reagent_containers/food/condiment/pack
+/obj/item/reagent_containers/condiment/pack
name = "condiment pack"
desc = "A small plastic pack with condiments to put on your food."
icon_state = "condi_empty"
@@ -234,14 +236,19 @@
/datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
)
-/obj/item/reagent_containers/food/condiment/pack/update_icon()
+/obj/item/reagent_containers/condiment/pack/create_reagents(max_vol, flags)
+ . = ..()
+ RegisterSignals(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_add), TRUE)
+ RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, PROC_REF(on_reagent_del), TRUE)
+
+/obj/item/reagent_containers/condiment/pack/update_icon()
SHOULD_CALL_PARENT(FALSE)
- return ..()
+ return
-/obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
+/obj/item/reagent_containers/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
return
-/obj/item/reagent_containers/food/condiment/pack/afterattack(obj/target, mob/user , proximity)
+/obj/item/reagent_containers/condiment/pack/afterattack(obj/target, mob/user , proximity)
. = ..()
if(!proximity)
return
@@ -257,67 +264,74 @@
src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
qdel(src)
-/obj/item/reagent_containers/food/condiment/pack/on_reagent_change(changetype)
- if(reagents.reagent_list.len > 0)
- var/main_reagent = reagents.get_master_reagent_id()
- if(main_reagent in possible_states)
- var/list/temp_list = possible_states[main_reagent]
- icon_state = temp_list[1]
- desc = temp_list[3]
- else
- icon_state = "condi_mixed"
- desc = "A small condiment pack. The label says it contains [originalname]"
+/// Handles reagents getting added to the condiment pack.
+/obj/item/reagent_containers/condiment/pack/proc/on_reagent_add(datum/reagents/reagents)
+ SIGNAL_HANDLER
+
+ var/datum/reagent/main_reagent = reagents.get_master_reagent()
+
+ var/main_reagent_type = main_reagent?.type
+ if(main_reagent_type in possible_states)
+ var/list/temp_list = possible_states[main_reagent_type]
+ icon_state = temp_list[1]
+ desc = temp_list[3]
else
- icon_state = "condi_empty"
- desc = "A small condiment pack. It is empty."
+ icon_state = "condi_mixed"
+ desc = "A small condiment pack. The label says it contains [originalname]"
+
+/// Handles reagents getting removed from the condiment pack.
+/obj/item/reagent_containers/condiment/pack/proc/on_reagent_del(datum/reagents/reagents)
+ SIGNAL_HANDLER
+ icon_state = "condi_empty"
+ desc = "A small condiment pack. It is empty."
//Ketchup
-/obj/item/reagent_containers/food/condiment/pack/ketchup
+/obj/item/reagent_containers/condiment/pack/ketchup
name = "ketchup pack"
originalname = "ketchup"
list_reagents = list(/datum/reagent/consumable/ketchup = 10)
//Hot sauce
-/obj/item/reagent_containers/food/condiment/pack/hotsauce
+/obj/item/reagent_containers/condiment/pack/hotsauce
name = "hotsauce pack"
originalname = "hotsauce"
list_reagents = list(/datum/reagent/consumable/capsaicin = 10)
-/obj/item/reagent_containers/food/condiment/pack/astrotame
+/obj/item/reagent_containers/condiment/pack/astrotame
name = "astrotame pack"
originalname = "astrotame"
list_reagents = list(/datum/reagent/consumable/astrotame = 5)
-/obj/item/reagent_containers/food/condiment/pack/bbqsauce
+/obj/item/reagent_containers/condiment/pack/bbqsauce
name = "bbq sauce pack"
originalname = "bbq sauce"
list_reagents = list(/datum/reagent/consumable/bbqsauce = 10)
-/obj/item/reagent_containers/food/condiment/ketchup
+/obj/item/reagent_containers/condiment/ketchup
name = "ketchup bottle"
desc = "You feel more american already"
icon_state = "ketchup"
list_reagents = list(/datum/reagent/consumable/ketchup = 50)
-/obj/item/reagent_containers/food/condiment/bbqsauce
+/obj/item/reagent_containers/condiment/bbqsauce
name = "bbq sauce bottle"
desc = "Hand wipes not included"
icon_state = "bbqsauce"
list_reagents = list(/datum/reagent/consumable/bbqsauce = 50)
-/obj/item/reagent_containers/food/condiment/hotsauce
+/obj/item/reagent_containers/condiment/hotsauce
name = "hot sauce bottle"
desc = "You can almost TASTE the stomach ulcers now!"
icon_state = "hotsauce"
list_reagents = list(/datum/reagent/consumable/capsaicin = 50)
-/obj/item/reagent_containers/food/condiment/coldsauce
+/obj/item/reagent_containers/condiment/coldsauce
name = "cold sauce bottle"
desc = "Leaves the tounge numb in it's passage"
icon_state = "coldsauce"
list_reagents = list(/datum/reagent/consumable/frostoil = 50)
-/obj/item/reagent_containers/food/condiment/oliveoil
+/obj/item/reagent_containers/condiment/oliveoil
name = "olive oil bottle"
desc = "A delicious oil used in cooking"
icon_state = "oliveoil"
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index fc3df2f7471..aa55dd6ebc0 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -45,7 +45,7 @@
to_chat(user, "The ingredient is too big for [src]!")
else if((ingredients.len >= ingMax) || (reagents.total_volume >= volume))
to_chat(user, "You can't add more ingredients to [src]!")
- else if(istype(I, /obj/item/reagent_containers/food/snacks/pizzaslice/custom) || istype(I, /obj/item/reagent_containers/food/snacks/cakeslice/custom))
+ else if(istype(I, /obj/item/reagent_containers/food/snacks/pizzaslice/custom))
to_chat(user, "Adding [I.name] to [src] would make a mess.")
else
if(!user.transferItemToLoc(I, src))
@@ -148,9 +148,9 @@
slice.update_customizable_overlays(src)
-/obj/item/reagent_containers/food/snacks/customizable/Destroy()
- for(. in ingredients)
- qdel(.)
+/obj/item/reagent_containers/food/snacks/customizable/deconstruct(disassembled)
+ for(var/ingredient in ingredients)
+ qdel(ingredient)
return ..()
@@ -170,26 +170,6 @@
foodtype = GRAIN
-/obj/item/reagent_containers/food/snacks/customizable/bread
- name = "bread"
- ingMax = 6
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice/custom
- slices_num = 5
- icon = 'icons/obj/food/burgerbread.dmi'
- icon_state = "tofubread"
- foodtype = GRAIN
-
-
-/obj/item/reagent_containers/food/snacks/customizable/cake
- name = "cake"
- ingMax = 6
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/custom
- slices_num = 5
- icon = 'icons/obj/food/piecake.dmi'
- icon_state = "plaincake"
- foodtype = GRAIN | DAIRY
-
-
/obj/item/reagent_containers/food/snacks/customizable/kebab
name = "kebab"
desc = "Delicious food on a stick."
@@ -199,15 +179,6 @@
ingMax = 6
icon_state = "rod"
-/obj/item/reagent_containers/food/snacks/customizable/pasta
- name = "spaghetti"
- desc = "Noodles. With stuff. Delicious."
- ingredients_placement = INGREDIENTS_SCATTER
- ingMax = 6
- icon = 'icons/obj/food/pizzaspaghetti.dmi'
- icon_state = "spaghettiboiled"
- foodtype = GRAIN
-
/obj/item/reagent_containers/food/snacks/customizable/pie
name = "pie"
@@ -238,43 +209,6 @@
icon_state = "bowl"
-/obj/item/reagent_containers/food/snacks/customizable/sandwich
- name = "toast"
- desc = "A timeless classic."
- ingredients_placement = INGREDIENTS_STACK
- icon = 'icons/obj/food/burgerbread.dmi'
- icon_state = "breadslice"
- var/finished = 0
- foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/customizable/sandwich/initialize_custom_food(obj/item/reagent_containers/BASE, obj/item/I, mob/user)
- icon_state = BASE.icon_state
- ..()
-
-/obj/item/reagent_containers/food/snacks/customizable/sandwich/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/food/snacks/breadslice)) //we're finishing the custom food.
- var/obj/item/reagent_containers/food/snacks/breadslice/BS = I
- if(finished)
- return
- to_chat(user, "You finish the [src.name].")
- finished = 1
- name = "[customname] sandwich"
- BS.reagents.trans_to(src, BS.reagents.total_volume, transfered_by = user)
- ingMax = ingredients.len //can't add more ingredients after that
- var/mutable_appearance/TOP = mutable_appearance(icon, "[BS.icon_state]")
- TOP.pixel_y = 2 * ingredients.len + 3
- add_overlay(TOP)
- if(istype(BS, /obj/item/reagent_containers/food/snacks/breadslice/custom))
- var/mutable_appearance/filling = new(icon, "[initial(BS.icon_state)]_filling")
- filling.color = BS.filling_color
- filling.pixel_y = 2 * ingredients.len + 3
- add_overlay(filling)
- qdel(BS)
- return
- else
- ..()
-
-
/obj/item/reagent_containers/food/snacks/customizable/soup
name = "soup"
desc = "A bowl with liquid and... stuff in it."
diff --git a/code/modules/food_and_drinks/food/ration.dm b/code/modules/food_and_drinks/food/ration.dm
index 261fe707ed7..6766a6aedbd 100644
--- a/code/modules/food_and_drinks/food/ration.dm
+++ b/code/modules/food_and_drinks/food/ration.dm
@@ -83,7 +83,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
/obj/item/reagent_containers/food/snacks/ration/snack
- icon_state = "ration_side"
+ icon_state = "ration_snack"
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 3)
/obj/item/reagent_containers/food/snacks/ration/bar
@@ -92,7 +92,7 @@
/obj/item/reagent_containers/food/snacks/ration/condiment
name = "condiment pack"
- desc = "Just your average condiment pacl."
+ desc = "Just your average condiment pack."
icon_state = "ration_condi"
volume = 10
amount_per_transfer_from_this = 10
@@ -126,7 +126,7 @@
/obj/item/reagent_containers/food/snacks/ration/pack
name = "powder pack"
desc = "Mix into a bottle of water and shake."
- icon_state = "ration_condi"
+ icon_state = "ration_pack"
volume = 10
amount_per_transfer_from_this = 10
possible_transfer_amounts = list()
@@ -742,84 +742,105 @@
/obj/item/reagent_containers/food/snacks/ration/condiment/cheese_spread
name = "cheese spread pack"
+ filling_color = "#ffcc00"
list_reagents = list(/datum/reagent/consumable/cheese_spread = 8)
/obj/item/reagent_containers/food/snacks/ration/condiment/hot_cheese_spread
name = "jalapeno cheddar cheese spread pack"
+ filling_color = "#ffaa00"
list_reagents = list(/datum/reagent/consumable/cheese_spread = 5 , /datum/reagent/consumable/capsaicin = 3)
/obj/item/reagent_containers/food/snacks/ration/condiment/garlic_cheese_spread
name = "garlic parmesan cheese spread pack"
+ filling_color = "#ffff00"
list_reagents = list(/datum/reagent/consumable/cheese_spread = 8)
/obj/item/reagent_containers/food/snacks/ration/condiment/bacon_cheddar_cheese_spread
name = "bacon cheddar cheese spread pack"
+ filling_color = "#ff9900"
list_reagents = list(/datum/reagent/consumable/cheese_spread = 8)
/obj/item/reagent_containers/food/snacks/ration/condiment/peanut_butter
name = "peanut butter pack"
+ filling_color = "#664400"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/peanut_butter = 5)
/obj/item/reagent_containers/food/snacks/ration/condiment/chunky_peanut_butter
name = "chunky peanut butter pack"
+ filling_color = "#663300"
list_reagents = list(/datum/reagent/consumable/peanut_butter = 10)
/obj/item/reagent_containers/food/snacks/ration/condiment/maple_syrup
name = "maple syrup pack"
+ filling_color = "#661100"
list_reagents = list(/datum/reagent/consumable/sugar = 10)
/obj/item/reagent_containers/food/snacks/ration/pack/chocolate_protein_beverage
name = "chocolate hazelnut protein drink powder pack"
+ filling_color = "#664400"
list_reagents = list(/datum/reagent/consumable/coco = 5, /datum/reagent/consumable/eggyolk = 5)
/obj/item/reagent_containers/food/snacks/ration/pack/fruit_beverage
name = "fruit punch beverage powder, carb-electrolyte pack"
+ filling_color = "#ff4400"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/applejuice = 2, /datum/reagent/consumable/orangejuice = 2)
/obj/item/reagent_containers/food/snacks/ration/pack/fruit_smoothie_beverage
name = "tropical blend fruit and vegetable smoothie powder pack"
+ filling_color = "#ffaa00"
list_reagents = list(/datum/reagent/consumable/pineapplejuice = 3, /datum/reagent/consumable/orangejuice = 3, /datum/reagent/consumable/eggyolk = 3)
/obj/item/reagent_containers/food/snacks/ration/pack/grape_beverage
name = "grape beverage powder, carb-fortified pack"
+ filling_color = "#9900ff"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/grapejuice = 5)
/obj/item/reagent_containers/food/snacks/ration/pack/grape_beverage_sugar_free
name = "sugar-free grape beverage base powder"
+ filling_color = "#9900ff"
list_reagents = list(/datum/reagent/consumable/grapejuice = 10)
/obj/item/reagent_containers/food/snacks/ration/pack/lemonade_beverage
name = "lemonade drink powder pack"
+ filling_color = "#ffff80"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/lemonjuice = 5)
/obj/item/reagent_containers/food/snacks/ration/pack/lemonade_beverage_suger_free
name = "lemonade sugar-free beverage base pack"
+ filling_color = "#ffff00"
list_reagents = list(/datum/reagent/consumable/lemonjuice = 10)
/obj/item/reagent_containers/food/snacks/ration/pack/orange_beverage
name = "orange beverage powder, carb-fortified pack"
+ filling_color = "#ffbb00"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/orangejuice = 5)
/obj/item/reagent_containers/food/snacks/ration/pack/orange_beverage_sugar_free
name = "orange beverage base, sugar-free pack"
+ filling_color = "#ff9900"
list_reagents = list(/datum/reagent/consumable/orangejuice = 10)
/obj/item/reagent_containers/food/snacks/ration/pack/cherry_beverage
name = "cherry high-energy beverage powder pack"
+ filling_color = "#ff5555"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/cherryjelly = 5)
/obj/item/reagent_containers/food/snacks/ration/pack/pineapple_beverage
name = "pinapple fruit beverage base pack"
+ filling_color = "#fff111"
list_reagents = list(/datum/reagent/consumable/pineapplejuice = 10)
/obj/item/reagent_containers/food/snacks/ration/pack/freeze_dried_coffee_orange
name = "freeze-dried coffee flavored with orange pack"
+ filling_color = "#cc7400"
list_reagents = list(/datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/orangejuice = 3)
/obj/item/reagent_containers/food/snacks/ration/pack/freeze_dried_coffee_chocolate
name = "freeze-dried coffee flavored with chocolate pack"
+ filling_color = "#803300"
list_reagents = list(/datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/coco = 3)
/obj/item/reagent_containers/food/snacks/ration/pack/freeze_dried_coffee_hazelnut
name = "freeze-dried coffee flavored with hazelnut pack"
+ filling_color = "#553300"
list_reagents = list(/datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/coco = 3)
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 61121a3ca95..ff49bb00e0d 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -56,6 +56,16 @@ All foods are distributed among various categories. Use common sense.
//Placeholder for effect that trigger on eating that aren't tied to reagents.
+/obj/item/reagent_containers/food/snacks/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_ITEM_FRIED, PROC_REF(on_fried))
+
+
+/obj/item/reagent_containers/food/snacks/proc/on_fried(fry_object)
+ reagents.trans_to(fry_object, reagents.total_volume)
+ qdel()
+ return COMSIG_FRYING_HANDLED
+
/obj/item/reagent_containers/food/snacks/add_initial_reagents()
if(tastes && tastes.len)
if(list_reagents)
@@ -175,7 +185,7 @@ All foods are distributed among various categories. Use common sense.
if(W.w_class > WEIGHT_CLASS_SMALL)
to_chat(user, span_warning("[S] is too big for [src]!"))
return FALSE
- if(istype(S) && (!S.customfoodfilling || istype(W, /obj/item/reagent_containers/food/snacks/customizable) || istype(W, /obj/item/reagent_containers/food/snacks/pizzaslice/custom) || istype(W, /obj/item/reagent_containers/food/snacks/cakeslice/custom)))
+ if(!S.customfoodfilling || istype(W, /obj/item/reagent_containers/food/snacks/customizable) || istype(W, /obj/item/reagent_containers/food/snacks/pizzaslice/custom))
to_chat(user, span_warning("[src] can't be filled with [S]!"))
return FALSE
if(contents.len >= 20)
@@ -312,7 +322,7 @@ All foods are distributed among various categories. Use common sense.
return result
-/obj/item/reagent_containers/food/snacks/Destroy()
+/obj/item/reagent_containers/food/snacks/deconstruct(disassembled)
if(contents)
for(var/atom/movable/something in contents)
something.forceMove(drop_location())
@@ -337,26 +347,10 @@ All foods are distributed among various categories. Use common sense.
/// All the food items that can store an item inside itself, like bread or cake.
/obj/item/reagent_containers/food/snacks/store
w_class = WEIGHT_CLASS_NORMAL
- var/stored_item = 0
-/obj/item/reagent_containers/food/snacks/store/attackby(obj/item/W, mob/user, params)
- ..()
- if(W.w_class <= WEIGHT_CLASS_SMALL & !istype(W, /obj/item/reagent_containers/food/snacks)) //can't slip snacks inside, they're used for custom foods.
- if(W.get_sharpness())
- return 0
- if(stored_item)
- return 0
- if(!iscarbon(user))
- return 0
- if(contents.len >= 20)
- to_chat(user, "[src] is full.")
- return 0
- to_chat(user, "You slip [W] inside [src].")
- user.transferItemToLoc(W, src)
- add_fingerprint(user)
- contents += W
- stored_item = 1
- return 1 // no afterattack here
+/obj/item/reagent_containers/food/snacks/store/Initialize()
+ . = ..()
+ AddComponent(/datum/component/food_storage)
/obj/item/reagent_containers/food/snacks/MouseDrop(atom/over)
var/turf/T = get_turf(src)
diff --git a/code/modules/food_and_drinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm
index 9567690dc71..4f5f0637992 100644
--- a/code/modules/food_and_drinks/food/snacks/dough.dm
+++ b/code/modules/food_and_drinks/food/snacks/dough.dm
@@ -7,7 +7,7 @@
desc = "A piece of dough."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "dough"
- cooked_type = /obj/item/reagent_containers/food/snacks/store/bread/plain
+ cooked_type = /obj/item/food/bread/plain
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("dough" = 1)
@@ -82,7 +82,7 @@
desc = "Cook it to get a cake."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "cakebatter"
- cooked_type = /obj/item/reagent_containers/food/snacks/store/cake/plain
+ cooked_type = /obj/item/food/cake/plain
list_reagents = list(/datum/reagent/consumable/nutriment = 9)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("batter" = 1)
diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm
deleted file mode 100644
index 13342a96890..00000000000
--- a/code/modules/food_and_drinks/food/snacks_bread.dm
+++ /dev/null
@@ -1,302 +0,0 @@
-
-/obj/item/reagent_containers/food/snacks/store/bread
- icon = 'icons/obj/food/burgerbread.dmi'
- volume = 80
- slices_num = 5
- tastes = list("bread" = 10)
- foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/store/bread/Initialize()
- . = ..()
- AddElement(/datum/element/dunkable, 10)
-
-/obj/item/reagent_containers/food/snacks/breadslice
- icon = 'icons/obj/food/burgerbread.dmi'
- bitesize = 2
- custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/sandwich
- filling_color = "#FFA500"
- list_reagents = list(/datum/reagent/consumable/nutriment = 2)
- slot_flags = ITEM_SLOT_HEAD
- customfoodfilling = 0 //to avoid infinite bread-ception
- foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/breadslice/Initialize()
- . = ..()
- AddElement(/datum/element/dunkable, 10)
-
-/obj/item/reagent_containers/food/snacks/store/bread/plain
- name = "bread"
- desc = "Some plain old earthen bread."
- icon_state = "bread"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 7)
- list_reagents = list(/datum/reagent/consumable/nutriment = 10)
- custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/bread
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice/plain
- tastes = list("bread" = 10)
- foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/breadslice/plain
- name = "bread slice"
- desc = "A slice of home."
- icon_state = "breadslice"
- customfoodfilling = 1
- foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/breadslice/moldy
- name = "moldy bread slice"
- desc = "Entire stations have been ripped apart over arguing whether this is still good to eat."
- icon_state = "moldybreadslice"
- customfoodfilling = 0
- bonus_reagents = list(/datum/reagent/consumable/mold = 10)
- tastes = list("decaying fungus" = 1)
- foodtype = GROSS
-
-/obj/item/reagent_containers/food/snacks/store/bread/meat
- name = "meatbread loaf"
- desc = "The culinary base of every self-respecting eloquen/tg/entleman."
- icon_state = "meatbread"
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice/meat
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
- list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("bread" = 10, "meat" = 10)
- foodtype = GRAIN | MEAT
-
-/obj/item/reagent_containers/food/snacks/breadslice/meat
- name = "meatbread slice"
- desc = "A slice of delicious meatbread."
- icon_state = "meatbreadslice"
- foodtype = GRAIN | MEAT
-
-/obj/item/reagent_containers/food/snacks/store/bread/xenomeat
- name = "xenomeatbread loaf"
- desc = "The culinary base of every self-respecting eloquen/tg/entleman. Extra Heretical."
- icon_state = "xenomeatbread"
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice/xenomeat
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
- list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("bread" = 10, "acid" = 10)
- foodtype = GRAIN | MEAT
-
-/obj/item/reagent_containers/food/snacks/breadslice/xenomeat
- name = "xenomeatbread slice"
- desc = "A slice of delicious meatbread. Extra Heretical."
- icon_state = "xenobreadslice"
- filling_color = "#32CD32"
- list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
- foodtype = GRAIN | MEAT
-
-/obj/item/reagent_containers/food/snacks/store/bread/spidermeat
- name = "spider meat loaf"
- desc = "Reassuringly green meatloaf made from spider meat."
- icon_state = "spidermeatbread"
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice/spidermeat
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
- list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/toxin = 15, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("bread" = 10, "cobwebs" = 5)
- foodtype = GRAIN | MEAT | TOXIC
-
-/obj/item/reagent_containers/food/snacks/breadslice/spidermeat
- name = "spider meat bread slice"
- desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
- icon_state = "spiderbreadslice"
- filling_color = "#7CFC00"
- list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
- foodtype = GRAIN | MEAT | TOXIC
-
-/obj/item/reagent_containers/food/snacks/store/bread/banana
- name = "banana-nut bread"
- desc = "A heavenly and filling treat."
- icon_state = "bananabread"
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice/banana
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/banana = 20)
- list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/banana = 20)
- tastes = list("bread" = 10) // bananjuice will also flavour
- foodtype = GRAIN | FRUIT
-
-
-/obj/item/reagent_containers/food/snacks/breadslice/banana
- name = "banana-nut bread slice"
- desc = "A slice of delicious banana bread."
- icon_state = "bananabreadslice"
- filling_color = "#FFD700"
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/banana = 4)
- foodtype = GRAIN | FRUIT
-
-/obj/item/reagent_containers/food/snacks/store/bread/tofu
- name = "Tofubread"
- desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
- icon_state = "tofubread"
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice/tofu
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
- list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("bread" = 10, "tofu" = 10)
- foodtype = GRAIN | VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/breadslice/tofu
- name = "tofubread slice"
- desc = "A slice of delicious tofubread."
- icon_state = "tofubreadslice"
- filling_color = "#FF8C00"
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
- foodtype = GRAIN | VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/store/bread/creamcheese
- name = "cream cheese bread"
- desc = "Yum yum yum!"
- icon_state = "creamcheesebread"
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice/creamcheese
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
- list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("bread" = 10, "cheese" = 10)
- foodtype = GRAIN | DAIRY
-
-/obj/item/reagent_containers/food/snacks/breadslice/creamcheese
- name = "cream cheese bread slice"
- desc = "A slice of yum!"
- icon_state = "creamcheesebreadslice"
- filling_color = "#FF8C00"
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
- foodtype = GRAIN | DAIRY
-
-/obj/item/reagent_containers/food/snacks/store/bread/mimana
- name = "mimana bread"
- desc = "Best eaten in silence."
- icon_state = "mimanabread"
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice/mimana
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
- list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/toxin/mutetoxin = 5, /datum/reagent/consumable/nothing = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("bread" = 10, "silence" = 10)
- foodtype = GRAIN | FRUIT
-
-/obj/item/reagent_containers/food/snacks/breadslice/mimana
- name = "mimana bread slice"
- desc = "A slice of silence!"
- icon_state = "mimanabreadslice"
- filling_color = "#C0C0C0"
- list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/mutetoxin = 1, /datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- foodtype = GRAIN | FRUIT
-
-/obj/item/reagent_containers/food/snacks/breadslice/custom
- name = "bread slice"
- icon_state = "tofubreadslice"
- filling_color = "#FFFFFF"
- foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/baguette
- name = "baguette"
- desc = "Bon appetit!"
- icon = 'icons/obj/food/burgerbread.dmi'
- icon_state = "baguette"
- item_state = "baguette"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
- list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
- bitesize = 3
- w_class = WEIGHT_CLASS_NORMAL
- slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
- attack_verb = list("touche'd")
- tastes = list("bread" = 1)
- foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/garlicbread
- name = "garlic bread"
- desc = "Alas, it is limited."
- icon = 'icons/obj/food/burgerbread.dmi'
- icon_state = "garlicbread"
- item_state = "garlicbread"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
- list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/garlic = 2)
- bitesize = 3
- tastes = list("bread" = 1, "garlic" = 1, "butter" = 1)
- foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/deepfryholder
- name = "Deep Fried Foods Holder Obj"
- desc = "If you can see this description the code for the deep fryer fucked up."
- icon = 'icons/obj/food/food.dmi'
- icon_state = ""
- bitesize = 2
-
-/obj/item/reagent_containers/food/snacks/deepfryholder/Initialize(mapload, obj/item/fried)
- . = ..()
- name = fried.name //We'll determine the other stuff when it's actually removed
- appearance = fried.appearance
- layer = initial(layer)
- plane = initial(plane)
- lefthand_file = fried.lefthand_file
- righthand_file = fried.righthand_file
- item_state = fried.item_state
- desc = fried.desc
- w_class = fried.w_class
- slowdown = fried.slowdown
- equip_delay_self = fried.equip_delay_self
- equip_delay_other = fried.equip_delay_other
- strip_delay = fried.strip_delay
- species_exception = fried.species_exception
- item_flags = fried.item_flags
- obj_flags = fried.obj_flags
- inhand_x_dimension = fried.inhand_x_dimension
- inhand_y_dimension = fried.inhand_y_dimension
-
- if(istype(fried, /obj/item/reagent_containers/food/snacks))
- fried.reagents.trans_to(src, fried.reagents.total_volume)
- qdel(fried)
- else
- fried.forceMove(src)
-
-/obj/item/reagent_containers/food/snacks/deepfryholder/Destroy()
- if(contents)
- QDEL_LIST(contents)
- . = ..()
-
-/obj/item/reagent_containers/food/snacks/deepfryholder/On_Consume(mob/living/eater)
- if(contents)
- QDEL_LIST(contents)
- ..()
-
-/obj/item/reagent_containers/food/snacks/deepfryholder/proc/fry(cook_time = 30)
- switch(cook_time)
- if(0 to 15)
- add_atom_colour(rgb(166,103,54), FIXED_COLOUR_PRIORITY)
- name = "lightly-fried [name]"
- desc = "[desc] It's been lightly fried in a deep fryer."
- if(16 to 49)
- add_atom_colour(rgb(103,63,24), FIXED_COLOUR_PRIORITY)
- name = "fried [name]"
- desc = "[desc] It's been fried, increasing its tastiness value by [rand(1, 75)]%."
- if(50 to 59)
- add_atom_colour(rgb(63,23,4), FIXED_COLOUR_PRIORITY)
- name = "deep-fried [name]"
- desc = "[desc] Deep-fried to perfection."
- if(60 to INFINITY)
- add_atom_colour(rgb(33,19,9), FIXED_COLOUR_PRIORITY)
- name = "\proper the physical manifestation of the very concept of fried foods"
- desc = "A heavily-fried...something. Who can tell anymore?"
- filling_color = color
- foodtype |= FRIED
-
-/obj/item/reagent_containers/food/snacks/butterbiscuit
- name = "butter biscuit"
- desc = "Well butter my biscuit!"
- icon = 'icons/obj/food/food.dmi'
- icon_state = "butterbiscuit"
- filling_color = "#F0E68C"
- list_reagents = list(/datum/reagent/consumable/nutriment = 5)
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- tastes = list("butter" = 1, "biscuit" = 1)
- foodtype = GRAIN | BREAKFAST
-
-/obj/item/reagent_containers/food/snacks/butterdog
- name = "butterdog"
- desc = "Made from exotic butters."
- icon = 'icons/obj/food/food.dmi'
- icon_state = "butterdog"
- bitesize = 1
- filling_color = "#F1F49A"
- list_reagents = list(/datum/reagent/consumable/nutriment = 5)
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- tastes = list("butter", "exotic butter")
- foodtype = GRAIN | DAIRY
-
-/obj/item/reagent_containers/food/snacks/butterdog/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/slippery, 80)
diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm
deleted file mode 100644
index d6f6151d47a..00000000000
--- a/code/modules/food_and_drinks/food/snacks_cake.dm
+++ /dev/null
@@ -1,431 +0,0 @@
-/obj/item/reagent_containers/food/snacks/store/cake
- icon = 'icons/obj/food/piecake.dmi'
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/plain
- slices_num = 5
- bitesize = 3
- volume = 80
- list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("cake" = 1)
- foodtype = GRAIN | DAIRY
-
-/obj/item/reagent_containers/food/snacks/cakeslice
- icon = 'icons/obj/food/piecake.dmi'
- trash = /obj/item/trash/plate
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
- customfoodfilling = 0 //to avoid infinite cake-ception
- tastes = list("cake" = 1)
- foodtype = GRAIN | DAIRY
-
-/obj/item/reagent_containers/food/snacks/store/cake/plain
- name = "plain cake"
- desc = "A plain cake, not a lie."
- icon_state = "plaincake"
- custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/cake
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
- tastes = list("sweetness" = 2,"cake" = 5)
- foodtype = GRAIN | DAIRY | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/plain
- name = "plain cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
- icon_state = "plaincake_slice"
- filling_color = "#FFD700"
- customfoodfilling = 1
- tastes = list("sweetness" = 2,"cake" = 5)
- foodtype = GRAIN | DAIRY | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/carrot
- name = "carrot cake"
- desc = "A favorite desert of a certain wascally wabbit. Not a lie."
- icon_state = "carrotcake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/carrot
- slices_num = 5
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/oculine = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
- list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/medicine/oculine = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
- foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/carrot
- name = "carrot cake slice"
- desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
- icon_state = "carrotcake_slice"
- filling_color = "#FFA500"
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/oculine = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
- tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
- foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/brain
- name = "brain cake"
- desc = "A squishy cake-thing."
- icon_state = "braincake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brain
- slices_num = 5
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/mannitol = 10, /datum/reagent/consumable/nutriment/vitamin = 10)
- list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/medicine/mannitol = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
- foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/brain
- name = "brain cake slice"
- desc = "Lemme tell you something about prions. THEY'RE DELICIOUS."
- icon_state = "braincakeslice"
- filling_color = "#FF69B4"
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/mannitol = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
- tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
- foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/cheese
- name = "cheese cake"
- desc = "DANGEROUSLY cheesy."
- icon_state = "cheesecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/cheese
- slices_num = 5
- bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 10)
- tastes = list("cake" = 4, "cream cheese" = 3)
- foodtype = GRAIN | DAIRY
-
-/obj/item/reagent_containers/food/snacks/cakeslice/cheese
- name = "cheese cake slice"
- desc = "Slice of pure cheestisfaction."
- icon_state = "cheesecake_slice"
- filling_color = "#FFFACD"
- tastes = list("cake" = 4, "cream cheese" = 3)
- foodtype = GRAIN | DAIRY
-
-/obj/item/reagent_containers/food/snacks/store/cake/orange
- name = "orange cake"
- desc = "A cake with added orange."
- icon_state = "orangecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/orange
- slices_num = 5
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
- tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/orange
- name = "orange cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
- icon_state = "orangecake_slice"
- filling_color = "#FFA500"
- tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/lime
- name = "lime cake"
- desc = "A cake with added lime."
- icon_state = "limecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/lime
- slices_num = 5
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
- tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/lime
- name = "lime cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
- icon_state = "limecake_slice"
- filling_color = "#00FF00"
- tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/lemon
- name = "lemon cake"
- desc = "A cake with added lemon."
- icon_state = "lemoncake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/lemon
- slices_num = 5
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
- tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/lemon
- name = "lemon cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
- icon_state = "lemoncake_slice"
- filling_color = "#FFEE00"
- tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/chocolate
- name = "chocolate cake"
- desc = "A cake with added chocolate."
- icon_state = "chocolatecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/chocolate
- slices_num = 5
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
- tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
- foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/chocolate
- name = "chocolate cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
- icon_state = "chocolatecake_slice"
- filling_color = "#A0522D"
- tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
- foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/birthday
- name = "birthday cake"
- desc = "Happy Birthday little clown..."
- icon_state = "birthdaycake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/birthday
- slices_num = 5
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
- list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("cake" = 5, "sweetness" = 1)
- foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/birthday/microwave_act(obj/machinery/microwave/M) //super sekrit club
- new /obj/item/clothing/head/hardhat/cakehat(get_turf(src))
- qdel(src)
-
-/obj/item/reagent_containers/food/snacks/cakeslice/birthday
- name = "birthday cake slice"
- desc = "A slice of your birthday."
- icon_state = "birthdaycakeslice"
- filling_color = "#DC143C"
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sprinkles = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
- tastes = list("cake" = 5, "sweetness" = 1)
- foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/birthday/energy
- name = "energy cake"
- desc = "Just enough calories for a whole nuclear operative squad."
- icon_state = "energycake"
- force = 5
- hitsound = 'sound/weapons/blade1.ogg'
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/birthday/energy
- list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/pacfuel = 10, /datum/reagent/consumable/liquidelectricity = 10)
- tastes = list("cake" = 3, "a Vlad's Salad" = 1)
-
-/obj/item/reagent_containers/food/snacks/store/cake/birthday/energy/proc/energy_bite(mob/living/user)
- to_chat(user, "As you eat the cake, you accidentally hurt yourself on the embedded energy sword!")
- user.apply_damage(30,BRUTE,BODY_ZONE_HEAD)
- playsound(user, 'sound/weapons/blade1.ogg', 5, TRUE)
-
-/obj/item/reagent_containers/food/snacks/store/cake/birthday/energy/attack(mob/living/M, mob/living/user)
- . = ..()
- if(HAS_TRAIT(user, TRAIT_PACIFISM) && M != user) //Prevents pacifists from attacking others directly
- return
- energy_bite(M, user)
-
-/obj/item/reagent_containers/food/snacks/store/cake/birthday/energy/microwave_act(obj/machinery/microwave/M) //super sekriter club
- new /obj/item/clothing/head/hardhat/cakehat/energycake(get_turf(src))
- qdel(src)
-
-/obj/item/reagent_containers/food/snacks/cakeslice/birthday/energy
- name = "energy cake slice"
- desc = "For the traitor on the go."
- icon_state = "energycakeslice"
- force = 2
- hitsound = 'sound/weapons/blade1.ogg'
- filling_color = "#00FF00"
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sprinkles = 2, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/pacfuel = 2, /datum/reagent/consumable/liquidelectricity = 2)
- tastes = list("cake" = 3, "a Vlad's Salad" = 1)
-
-/obj/item/reagent_containers/food/snacks/cakeslice/birthday/energy/proc/energy_bite(mob/living/user)
- to_chat(user, "As you eat the cake slice, you accidentally hurt yourself on the embedded energy dagger!")
- user.apply_damage(18,BRUTE,BODY_ZONE_HEAD)
- playsound(user, 'sound/weapons/blade1.ogg', 5, TRUE)
-
-/obj/item/reagent_containers/food/snacks/cakeslice/birthday/energy/attack(mob/living/M, mob/living/user)
- . = ..()
- if(HAS_TRAIT(user, TRAIT_PACIFISM) && M != user) //Prevents pacifists from attacking others directly
- return
- energy_bite(M, user)
-
-/obj/item/reagent_containers/food/snacks/store/cake/apple
- name = "apple cake"
- desc = "A cake centred with Apple."
- icon_state = "applecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/apple
- slices_num = 5
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
- tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/apple
- name = "apple cake slice"
- desc = "A slice of heavenly cake."
- icon_state = "applecakeslice"
- filling_color = "#FF4500"
- tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/custom
- name = "cake slice"
- icon_state = "plaincake_slice"
- filling_color = "#FFFFFF"
- foodtype = GRAIN | DAIRY
-
-/obj/item/reagent_containers/food/snacks/store/cake/slimecake
- name = "Slime cake"
- desc = "A cake made of slimes. Probably not electrified."
- icon_state = "slimecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/slimecake
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
- tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
- foodtype = GRAIN | DAIRY | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/slimecake
- name = "slime cake slice"
- desc = "A slice of slime cake."
- icon_state = "slimecake_slice"
- filling_color = "#00FFFF"
- tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
- foodtype = GRAIN | DAIRY | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice
- name = "pumpkin spice cake"
- desc = "A hollow cake with real pumpkin."
- icon_state = "pumpkinspicecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pumpkinspice
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 5)
- tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
- foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/pumpkinspice
- name = "pumpkin spice cake slice"
- desc = "A spicy slice of pumpkin goodness."
- icon_state = "pumpkinspicecakeslice"
- filling_color = "#FFD700"
- tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
- foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/bsvc // blackberry strawberries vanilla cake
- name = "blackberry and strawberry vanilla cake"
- desc = "A plain cake, filled with assortment of blackberries and strawberries!"
- icon_state = "blackbarry_strawberries_cake_vanilla_cake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bsvc
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 4)
- tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/bsvc
- name = "blackberry and strawberry vanilla cake slice"
- desc = "Just a slice of cake filled with assortment of blackberries and strawberries!"
- icon_state = "blackbarry_strawberries_cake_vanilla_slice"
- filling_color = "#FFD700"
- tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2,"cake" = 3)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/bscc // blackbarry strawberries chocolate cake
- name = "blackberry and strawberry chocolate cake"
- desc = "A chocolate cake, filled with assortment of blackberries and strawberries!"
- icon_state = "blackbarry_strawberries_cake_coco_cake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bscc
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/coco = 5)
- tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/bscc
- name = "blackberry and strawberry chocolate cake slice"
- desc = "Just a slice of cake filled with assortment of blackberries and strawberries!"
- icon_state = "blackbarry_strawberries_cake_coco_slice"
- filling_color = "#FFD700"
- tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/holy_cake
- name = "angel food cake"
- desc = "A cake made for angels and chaplains alike! Contains holy water."
- icon_state = "holy_cake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/water/holywater = 10)
- tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
- foodtype = GRAIN | DAIRY | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice
- name = "angel food cake slice"
- desc = "A slice of heavenly cake."
- icon_state = "holy_cake_slice"
- filling_color = "#00FFFF"
- tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
- foodtype = GRAIN | DAIRY | SUGAR
-
-/obj/item/reagent_containers/food/snacks/store/cake/pound_cake
- name = "pound cake"
- desc = "A condensed cake made for filling people up quickly."
- icon_state = "pound_cake"
- slices_num = 7 //Its ment to feed the party
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 60)
- tastes = list("cake" = 5, "sweetness" = 1, "batter" = 1)
- foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice
- name = "pound cake slice"
- desc = "A slice of condensed cake made for filling people up quickly."
- icon_state = "pound_cake_slice"
- filling_color = "#00FFFF"
- tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
- foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/snacks/store/cake/hardware_cake
- name = "hardware cake"
- desc = "A quote on quote cake that is made with electronic boards and leaks acid..."
- icon_state = "hardware_cake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice
- bonus_reagents = list(/datum/reagent/toxin/acid = 15, /datum/reagent/fuel/oil = 15)
- tastes = list("acid" = 3, "metal" = 4, "glass" = 5)
- foodtype = GRAIN | GROSS
-
-/obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice
- name = "hardware cake slice"
- desc = "A slice of electronic boards and some acid."
- icon_state = "hardware_cake_slice"
- filling_color = "#00FFFF"
- tastes = list("acid" = 3, "metal" = 4, "glass" = 5)
- foodtype = GRAIN | GROSS
-
-/obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake
- name = "vanilla cake"
- desc = "A vanilla frosted cake."
- icon_state = "vanillacake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/vanilla_slice
- bonus_reagents = list(/datum/reagent/consumable/sugar = 15, /datum/reagent/consumable/vanilla = 15)
- tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
- foodtype = GRAIN | SUGAR | DAIRY
-
-/obj/item/reagent_containers/food/snacks/cakeslice/vanilla_slice
- name = "vanilla cake slice"
- desc = "A slice of vanilla frosted cake."
- icon_state = "vanillacake_slice"
- filling_color = "#00FFFF"
- tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
- foodtype = GRAIN | SUGAR | DAIRY
-
-/obj/item/reagent_containers/food/snacks/store/cake/clown_cake
- name = "clown cake"
- desc = "A funny cake with a clown face on it."
- icon_state = "clowncake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/clown_slice
- bonus_reagents = list(/datum/reagent/consumable/sugar = 15)
- tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
- foodtype = GRAIN | SUGAR | DAIRY
-
-/obj/item/reagent_containers/food/snacks/cakeslice/clown_slice
- name = "clown cake slice"
- desc = "A slice of bad jokes, and silly props."
- icon_state = "clowncake_slice"
- filling_color = "#00FFFF"
- tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
- foodtype = GRAIN | SUGAR | DAIRY
-
-/obj/item/reagent_containers/food/snacks/store/cake/trumpet
- name = "spaceman's cake"
- desc = "A spaceman's trumpet frosted cake."
- icon_state = "trumpetcake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/trumpet
- bonus_reagents = list(/datum/reagent/medicine/polypyr = 15, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/berryjuice = 5)
- filling_color = "#7A3D80"
- tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
-
-/obj/item/reagent_containers/food/snacks/cakeslice/trumpet
- name = "spaceman's cake"
- desc = "A spaceman's trumpet frosted cake."
- icon_state = "trumpetcakeslice"
- filling_color = "#7A3D80"
- tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
- foodtype = GRAIN | DAIRY | FRUIT | SUGAR
diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm
index 360053c28ca..665d94e1fa9 100644
--- a/code/modules/food_and_drinks/food/snacks_egg.dm
+++ b/code/modules/food_and_drinks/food/snacks_egg.dm
@@ -10,6 +10,8 @@
filling_color = "#A0522D"
tastes = list("chocolate" = 4, "sweetness" = 1)
foodtype = JUNKFOOD | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/egg
name = "egg"
@@ -18,7 +20,8 @@
list_reagents = list(/datum/reagent/consumable/eggyolk = 5)
cooked_type = /obj/item/reagent_containers/food/snacks/boiledegg
filling_color = "#F0E68C"
- foodtype = MEAT
+ foodtype = MEAT | RAW
+ w_class = WEIGHT_CLASS_TINY
grind_results = list()
var/static/chick_count = 0 //I copied this from the chicken_count (note the "en" in there) variable from chicken code.
@@ -106,6 +109,8 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("egg" = 1)
foodtype = MEAT | BREAKFAST
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/omelette //FUCK THIS
name = "omelette du fromage"
diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm
index e35cb7eeb5f..d79b91507c1 100644
--- a/code/modules/food_and_drinks/food/snacks_frozen.dm
+++ b/code/modules/food_and_drinks/food/snacks_frozen.dm
@@ -8,20 +8,24 @@
desc = "Portable Ice-cream in its own packaging."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "icecreamsandwich"
+ w_class = WEIGHT_CLASS_TINY
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/ice = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ice = 2)
tastes = list("ice cream" = 1)
foodtype = GRAIN | DAIRY | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
/obj/item/reagent_containers/food/snacks/strawberryicecreamsandwich
name = "strawberry ice cream sandwich"
desc = "Portable ice-cream in its own packaging of the strawberry variety."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "strawberryicecreamsandwich"
+ w_class = WEIGHT_CLASS_TINY
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ice = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ice = 2)
tastes = list("ice cream" = 2, "berry" = 2)
foodtype = FRUIT | DAIRY | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
/obj/item/reagent_containers/food/snacks/spacefreezy
@@ -29,6 +33,7 @@
desc = "The best icecream in space."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "spacefreezy"
+ w_class = WEIGHT_CLASS_TINY
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/bluecherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#87CEFA"
@@ -40,6 +45,7 @@
desc = "A classic dessert."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "sundae"
+ w_class = WEIGHT_CLASS_SMALL
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FFFACD"
@@ -66,12 +72,14 @@
desc = "It's just shaved ice. Still fun to chew on."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "flavorless_sc"
+ w_class = WEIGHT_CLASS_SMALL
trash = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups
bonus_reagents = list(/datum/reagent/water = 10) //Base line will allways give water
list_reagents = list(/datum/reagent/water = 1) // We dont get food for water/juices
filling_color = "#FFFFFF" //Ice is white
tastes = list("ice" = 1, "water" = 1)
foodtype = SUGAR //We use SUGAR as a base line to act in as junkfood, other wise we use fruit
+ /*food_flags = FOOD_FINGER_FOOD*/
/obj/item/reagent_containers/food/snacks/snowcones/lime
name = "lime snowcone"
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index 510130ce08b..540c6f1a94e 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -211,6 +211,8 @@
filling_color = "#800000"
tastes = list("meat" = 1)
foodtype = MEAT
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/sausage
name = "sausage"
@@ -223,6 +225,7 @@
slices_num = 6
slice_path = /obj/item/reagent_containers/food/snacks/salami
foodtype = MEAT | BREAKFAST
+ /*food_flags = FOOD_FINGER_FOOD*/
var/roasted = FALSE
/obj/item/reagent_containers/food/snacks/sausage/Initialize()
@@ -266,9 +269,11 @@
filling_color = "#CD853F"
tastes = list("the jungle" = 1, "bananas" = 1)
foodtype = MEAT | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
var/faction
var/spawned_mob = /mob/living/carbon/monkey
- custom_price = 300
+ custom_price = 5
/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
var/mob/spammer = get_mob_by_key(fingerprintslast)
@@ -359,6 +364,8 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
tastes = list("\"chicken\"" = 1)
foodtype = MEAT
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/nugget/Initialize()
. = ..()
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index 3d5adf18e6f..0e55d21b350 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -37,7 +37,9 @@
filling_color = "#FF1493"
tastes = list("watermelon" = 1)
foodtype = FRUIT
+ /*food_flags = FOOD_FINGER_FOOD*/
juice_results = list(/datum/reagent/consumable/watermelonjuice = 5)
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/candy_corn
name = "candy corn"
@@ -47,6 +49,8 @@
filling_color = "#FF8C00"
tastes = list("candy corn" = 1)
foodtype = JUNKFOOD | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/candy_corn/prison
name = "desiccated candy corn"
@@ -64,6 +68,8 @@
filling_color = "#A0522D"
tastes = list("chocolate" = 1)
foodtype = JUNKFOOD | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/hugemushroomslice
name = "huge mushroom slice"
@@ -112,19 +118,6 @@
. = ..()
AddElement(/datum/element/dunkable, 10)
-/obj/item/reagent_containers/food/snacks/tatortot
- name = "tator tot"
- desc = "A large fried potato nugget that may or may not try to valid you."
- icon_state = "tatortot"
- list_reagents = list(/datum/reagent/consumable/nutriment = 4)
- filling_color = "FFD700"
- tastes = list("potato" = 3, "valids" = 1)
- foodtype = FRIED | VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/tatortot/Initialize()
- . = ..()
- AddElement(/datum/element/dunkable, 10)
-
/obj/item/reagent_containers/food/snacks/soydope
name = "soy dope"
desc = "Dope from a soy."
@@ -192,6 +185,8 @@
list_reagents = list(/datum/reagent/toxin/minttoxin = 2)
filling_color = "#800000"
foodtype = TOXIC | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/eggwrap
name = "egg wrap"
@@ -229,6 +224,8 @@
filling_color = "#00800"
tastes = list("cobwebs" = 1, "sugar" = 2)
foodtype = JUNKFOOD | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/chococoin
name = "chocolate coin"
@@ -239,6 +236,8 @@
filling_color = "#A0522D"
tastes = list("chocolate" = 1)
foodtype = JUNKFOOD | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/fudgedice
name = "fudge dice"
@@ -250,6 +249,8 @@
trash = /obj/item/dice/fudge
tastes = list("fudge" = 1)
foodtype = JUNKFOOD | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/chocoorange
name = "chocolate orange"
@@ -260,6 +261,8 @@
filling_color = "#A0522D"
tastes = list("chocolate" = 3, "oranges" = 1)
foodtype = JUNKFOOD | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/eggplantparm
name = "eggplant parmigiana"
@@ -404,6 +407,8 @@
filling_color = "#F2CE91"
tastes = list("oats" = 3, "nuts" = 2, "honey" = 1)
foodtype = GRAIN | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/stuffedlegion
name = "stuffed legion"
@@ -484,6 +489,8 @@
next_succ = 0
tastes = list("candy" = 1)
foodtype = JUNKFOOD | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/chewable/lollipop/Initialize()
. = ..()
@@ -520,6 +527,7 @@
name = "bubblegum"
desc = "A rubbery strip of gum. Not exactly filling, but it keeps you busy."
icon_state = "bubblegum"
+ supports_variations = VOX_VARIATION
item_state = "bubblegum"
color = "#E48AB5" // craftable custom gums someday?
list_reagents = list(/datum/reagent/consumable/sugar = 5)
@@ -574,6 +582,8 @@
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/bicaridine = 2, /datum/reagent/medicine/kelotane = 2) //Kek
tastes = list("candy")
foodtype = JUNKFOOD
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/gumball/Initialize()
. = ..()
@@ -654,6 +664,7 @@
desc = "delicious, golden, fatty goodness on a stick."
icon_state = "butteronastick"
trash = /obj/item/stack/rods
+ /*food_flags = FOOD_FINGER_FOOD*/
/obj/item/reagent_containers/food/snacks/onionrings
name = "onion rings"
@@ -664,6 +675,7 @@
gender = PLURAL
tastes = list("batter" = 3, "onion" = 1)
foodtype = VEGETABLES
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/pineappleslice
name = "pineapple slice"
@@ -673,6 +685,7 @@
juice_results = list(/datum/reagent/consumable/pineapplejuice = 3)
tastes = list("pineapple" = 1)
foodtype = FRUIT | PINEAPPLE
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/tinychocolate
name = "chocolate"
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index ee0dd7ab58d..7cb9f05900b 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -13,6 +13,8 @@
filling_color = "#D2691E"
tastes = list("donut" = 1)
foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR | BREAKFAST
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
var/decorated_icon = "donut_homer"
var/is_decorated = FALSE
var/extra_reagent = null
@@ -336,6 +338,8 @@
filling_color = "#F4A460"
tastes = list("muffin" = 1)
foodtype = GRAIN | SUGAR | BREAKFAST
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/muffin/berry
name = "berry muffin"
@@ -420,6 +424,8 @@
filling_color = "#CD853F"
tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
foodtype = GRAIN
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/donkpocket/warm
name = "warm Donk-pocket"
@@ -565,6 +571,8 @@
filling_color = "#F0E68C"
tastes = list("cookie" = 1)
foodtype = GRAIN | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/cookie/Initialize()
. = ..()
@@ -583,6 +591,8 @@
filling_color = "#F4A460"
tastes = list("cookie" = 1)
foodtype = GRAIN | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/fortunecookie/proc/get_fortune()
var/atom/drop_location = drop_location()
@@ -613,6 +623,8 @@
filling_color = "#F0E68C"
tastes = list("pretzel" = 1)
foodtype = GRAIN | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
name = "plump helmet biscuit"
@@ -623,6 +635,8 @@
filling_color = "#F0E68C"
tastes = list("mushroom" = 1, "biscuit" = 1)
foodtype = GRAIN | VEGETABLES
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize()
var/fey = prob(10)
@@ -644,6 +658,8 @@
filling_color = "#F0E68C"
tastes = list("cracker" = 1)
foodtype = GRAIN
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/hotdog
name = "hotdog"
@@ -732,21 +748,19 @@
name = "cherry cupcake"
desc = "A sweet cupcake with cherry bits."
icon_state = "cherrycupcake"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#F0E68C"
tastes = list("cake" = 3, "cherry" = 1)
foodtype = GRAIN | FRUIT | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
-/obj/item/reagent_containers/food/snacks/bluecherrycupcake
+/obj/item/reagent_containers/food/snacks/cherrycupcake/blue
name = "blue cherry cupcake"
desc = "Blue cherries inside a delicious cupcake."
icon_state = "bluecherrycupcake"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
- list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
- filling_color = "#F0E68C"
tastes = list("cake" = 3, "blue cherry" = 1)
- foodtype = GRAIN | FRUIT | SUGAR
/obj/item/reagent_containers/food/snacks/honeybun
name = "honey bun"
diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm
index 9b8e949b06e..3784e2f0fbd 100644
--- a/code/modules/food_and_drinks/food/snacks_pizza.dm
+++ b/code/modules/food_and_drinks/food/snacks_pizza.dm
@@ -160,69 +160,8 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
-/obj/item/reagent_containers/food/snacks/pizza/arnold
- name = "\improper Arnold pizza"
- desc = "Hello, you've reached Arnold's pizza shop. I'm not here now, I'm out killing pepperoni."
- icon_state = "arnoldpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/arnold
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30)
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
-
-/obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm
- var/obj/item/bodypart/l_arm = user.get_bodypart(BODY_ZONE_L_ARM)
- var/obj/item/bodypart/r_arm = user.get_bodypart(BODY_ZONE_R_ARM)
- if(prob(50) && iscarbon(user) && M == user && (r_arm || l_arm))
- user.visible_message("\The [src] breaks off [user]'s arm!!", "\The [src] breaks off your arm!")
- if(l_arm)
- l_arm.dismember()
- else
- r_arm.dismember()
- playsound(user, "desceration" ,50, TRUE, -1)
-
-/obj/item/reagent_containers/food/snacks/proc/i_kill_you(obj/item/I, mob/user)
- if(istype(I, /obj/item/reagent_containers/food/snacks/pineappleslice))
- to_chat(user, "If you want something crazy like pineapple, I kill you.")
- user.gib() //if you want something crazy like pineapple, i kill you
-
-/obj/item/reagent_containers/food/snacks/pizza/arnold/attack(mob/living/M, mob/living/user)
- . = ..()
- try_break_off(M, user)
-
-/obj/item/reagent_containers/food/snacks/pizza/arnold/attackby(obj/item/I, mob/user)
- i_kill_you(I, user)
- . = ..()
-
-
-/obj/item/reagent_containers/food/snacks/pizzaslice/arnold
- name = "\improper Arnold pizza slice"
- desc = "I come over, maybe I give you a pizza, maybe I break off your arm."
- icon_state = "arnoldpizzaslice"
- filling_color = "#A52A2A"
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
- foodtype = GRAIN | VEGETABLES | DAIRY | MEAT
-
-/obj/item/reagent_containers/food/snacks/pizzaslice/arnold/attack(mob/living/M, mob/living/user)
- . =..()
- try_break_off(M, user)
-
-/obj/item/reagent_containers/food/snacks/pizzaslice/arnold/attackby(obj/item/I, mob/user)
- i_kill_you(I, user)
- . = ..()
-
-
/obj/item/reagent_containers/food/snacks/pizzaslice/custom
name = "pizza slice"
icon_state = "pizzamargheritaslice"
filling_color = "#FFFFFF"
foodtype = GRAIN | VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/pizzaslice/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/kitchen/rollingpin))
- if(!isturf(loc))
- to_chat(user, "You need to put [src] on a surface to roll it out!")
- return
- new /obj/item/stack/sheet/pizza(loc)
- to_chat(user, "You smoosh [src] into a cheesy sheet.")
- qdel(src)
- return
- return ..()
diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
index c15a6606be9..169d208bf30 100644
--- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
+++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
@@ -9,6 +9,8 @@
cooked_type = /obj/item/reagent_containers/food/snacks/toastedsandwich
tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
foodtype = GRAIN | VEGETABLES
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/toastedsandwich
name = "toasted sandwich"
@@ -31,6 +33,8 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("toast" = 1, "cheese" = 1)
foodtype = GRAIN | DAIRY
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/jellysandwich
name = "jelly sandwich"
diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm
index c7bcf963faf..5ec9408dc41 100644
--- a/code/modules/food_and_drinks/food/snacks_soup.dm
+++ b/code/modules/food_and_drinks/food/snacks_soup.dm
@@ -159,12 +159,12 @@
tastes = list("tomato" = 1, "squirming" = 1)
foodtype = MEAT | GORE
-/obj/item/reagent_containers/food/snacks/soup/milo
- name = "milosoup"
+/obj/item/reagent_containers/food/snacks/soup/miso
+ name = "miso soup"
desc = "The universes best soup! Yum!!!"
- icon_state = "milosoup"
+ icon_state = "misosoup"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
- tastes = list("milo" = 1) // wtf is milo
+ tastes = list("miso" = 1) // wtf is milo
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/soup/mushroom
diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm
deleted file mode 100644
index 88c1188f1de..00000000000
--- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm
+++ /dev/null
@@ -1,106 +0,0 @@
-
-/obj/item/reagent_containers/food/snacks/spaghetti
- name = "spaghetti"
- desc = "Now that's a nic'e pasta!"
- icon = 'icons/obj/food/pizzaspaghetti.dmi'
- icon_state = "spaghetti"
- list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- cooked_type = /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti
- filling_color = "#F0E68C"
- tastes = list("pasta" = 1)
- foodtype = GRAIN
-
-/obj/item/reagent_containers/food/snacks/spaghetti/Initialize()
- . = ..()
- if(!cooked_type) // This isn't cooked, why would you put uncooked spaghetti in your pocket?
- var/list/display_message = list(
- "Something wet falls out of their pocket and hits the ground. Is that... [name]?",
- "Oh shit! All your pocket [name] fell out!")
- AddComponent(/datum/component/spill, display_message, 'sound/effects/splat.ogg')
-
-/obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti
- name = "boiled spaghetti"
- desc = "A plain dish of noodles, this needs more ingredients."
- icon_state = "spaghettiboiled"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 2)
- list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
- cooked_type = null
- custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pasta
-
-/obj/item/reagent_containers/food/snacks/spaghetti/pastatomato
- name = "spaghetti"
- desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!"
- icon_state = "pastatomato"
- trash = /obj/item/trash/plate
- bitesize = 4
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
- list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
- cooked_type = null
- filling_color = "#DC143C"
- tastes = list("pasta" = 1, "tomato" = 1)
- foodtype = GRAIN | VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/spaghetti/copypasta
- name = "copypasta"
- desc = "You probably shouldn't try this, you always hear people talking about how bad it is..."
- icon_state = "copypasta"
- trash = /obj/item/trash/plate
- bitesize = 4
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
- list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/tomatojuice = 20, /datum/reagent/consumable/nutriment/vitamin = 8)
- cooked_type = null
- filling_color = "#DC143C"
- tastes = list("pasta" = 1, "tomato" = 1)
- foodtype = GRAIN | VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/spaghetti/meatballspaghetti
- name = "spaghetti and meatballs"
- desc = "Now that's a nic'e meatball!"
- icon_state = "meatballspaghetti"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
- list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
- cooked_type = null
- tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
- foodtype = GRAIN | MEAT
-
-/obj/item/reagent_containers/food/snacks/spaghetti/spesslaw
- name = "spesslaw"
- desc = "A lawyers favourite."
- icon_state = "spesslaw"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
- list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 6)
- cooked_type = null
- tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
-
-/obj/item/reagent_containers/food/snacks/spaghetti/chowmein
- name = "chow mein"
- desc = "A nice mix of noodles and fried vegetables."
- icon_state = "chowmein"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 4)
- list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 6)
- cooked_type = null
- tastes = list("noodle" = 1, "tomato" = 1)
-
-/obj/item/reagent_containers/food/snacks/spaghetti/beefnoodle
- name = "beef noodle"
- desc = "Nutritious, beefy and noodly."
- icon_state = "beefnoodle"
- trash = /obj/item/reagent_containers/glass/bowl
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/liquidgibs = 3)
- cooked_type = null
- tastes = list("noodle" = 1, "meat" = 1)
- foodtype = GRAIN | MEAT
-
-/obj/item/reagent_containers/food/snacks/spaghetti/butternoodles
- name = "butter noodles"
- desc = "Noodles covered in savory butter. Simple and slippery, but delicious."
- icon_state = "butternoodles"
- trash = /obj/item/trash/plate
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
- cooked_type = null
- tastes = list("noodle" = 1, "butter" = 1)
- foodtype = GRAIN | DAIRY
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index 94477d1932a..a450555a7a6 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -12,36 +12,8 @@
filling_color = "#D2691E"
tastes = list("candy" = 1)
foodtype = JUNKFOOD | SUGAR
-
-/obj/item/reagent_containers/food/snacks/candy/bronx
- name = "South Bronx Paradise bar"
- desc = "Lose weight, guaranteed! Caramel Mocha Flavor. Something about product consumption..."
- icon_state = "bronx"
- item_state = "candy"
- trash = /obj/item/trash/candy
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/yuck = 1)
- junkiness = 10
- bitesize = 10
- filling_color = "#e4d4b7"
- tastes = list("candy" = 5, "weight loss" = 4, "insect larva" = 1)
- foodtype = JUNKFOOD | RAW | GROSS
- custom_premium_price = 800
- var/revelation = FALSE
-
-/obj/item/reagent_containers/food/snacks/candy/bronx/On_Consume(mob/living/eater)
- . = ..()
- if(ishuman(eater))
- var/mob/living/carbon/human/carl = eater
- var/datum/disease/P = new /datum/disease/parasite()
- carl.ForceContractDisease(P, FALSE, TRUE)
-
-/obj/item/reagent_containers/food/snacks/candy/bronx/examine(mob/user)
- . = ..()
- if(revelation == FALSE)
- to_chat(user, "Geeze, you need to get to get your eyes checked. You should look again...")
- desc = "Lose weight, guaranteed! Caramel Mocha Flavor! WARNING: PRODUCT NOT FIT FOR HUMAN CONSUMPTION. CONTAINS LIVE DIAMPHIDIA SPECIMENS."
- name = "South Bronx Parasite bar"
- revelation = TRUE
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/food/snacks/sosjerky
name = "\improper Scaredy's Private Reserve Beef Jerky"
@@ -82,7 +54,9 @@
filling_color = "#8B0000"
tastes = list("dried raisins" = 1)
foodtype = JUNKFOOD | FRUIT | SUGAR
- custom_price = 90
+ /*food_flags = FOOD_FINGER_FOOD*/
+ custom_price = 5
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/no_raisin/healthy
name = "homemade raisins"
@@ -99,7 +73,9 @@
junkiness = 25
filling_color = "#FFD700"
foodtype = JUNKFOOD | GRAIN | SUGAR
- custom_price = 30
+ /*food_flags = FOOD_FINGER_FOOD*/
+ custom_price = 5
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/candy_trash
name = "candy cigarette butt"
@@ -125,7 +101,7 @@
filling_color = "#FFD700"
tastes = list("cheese" = 5, "crisps" = 2)
foodtype = JUNKFOOD | DAIRY | SUGAR
- custom_price = 45
+ custom_price = 5
/obj/item/reagent_containers/food/snacks/syndicake
name = "syndi-cakes"
@@ -136,6 +112,7 @@
filling_color = "#F5F5DC"
tastes = list("sweetness" = 3, "cake" = 1)
foodtype = GRAIN | FRUIT | VEGETABLES
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/energybar
name = "High-power energy bars"
@@ -146,3 +123,5 @@
filling_color = "#97ee63"
tastes = list("pure electricity" = 3, "fitness" = 2)
foodtype = TOXIC
+ /*food_flags = FOOD_FINGER_FOOD*/
+ w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm b/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm
index 3024c188fac..7b50db0405f 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm
@@ -28,7 +28,7 @@
. += span_notice("It can be (un)secured with wrench")
. += span_notice("You can empty all of the items out of it with Alt Click")
-/obj/structure/large_mortar/Destroy()
+/obj/structure/large_mortar/deconstruct(disassembled)
drop_everything_contained()
return ..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm b/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm
index b0d91d370ab..122f163ec7f 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm
@@ -52,7 +52,7 @@
if(length(contents))
. += span_notice("It has [contents[1]] sitting on it.")
-/obj/item/cutting_board/Destroy()
+/obj/item/cutting_board/deconstruct(disassembled)
drop_everything_contained()
return ..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index 8eccd04c840..bcee075e0dc 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -18,6 +18,8 @@
// _- _
// -
+//God bless These Deepfried States o7 -2024
+
/obj/machinery/deepfryer
name = "deep fryer"
desc = "Deep fried everything."
@@ -27,7 +29,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
layer = BELOW_OBJ_LAYER
- var/obj/item/reagent_containers/food/snacks/deepfryholder/frying //What's being fried RIGHT NOW?
+ var/obj/item/food/deepfryholder/frying //What's being fried RIGHT NOW?
var/cook_time = 0
var/oil_use = 0.05 //How much cooking oil is used per tick
var/fry_speed = 1 //How quickly we fry food
@@ -42,7 +44,7 @@
/obj/item/weldingtool,
/obj/item/reagent_containers/glass,
/obj/item/reagent_containers/syringe,
- /obj/item/reagent_containers/food/condiment,
+ /obj/item/reagent_containers/condiment,
/obj/item/storage,
/obj/item/smallDelivery,
)
@@ -93,7 +95,7 @@
if(I.resistance_flags & INDESTRUCTIBLE)
to_chat(user, "You don't feel it would be wise to fry [I]...")
return
- if(istype(I, /obj/item/reagent_containers/food/snacks/deepfryholder))
+ if(istype(I, /obj/item/food/deepfryholder))
to_chat(user, "Your cooking skills are not up to the legendary Doublefry technique.")
return
if(default_unfasten_wrench(user, I))
@@ -105,7 +107,7 @@
return ..()
else if(!frying && user.transferItemToLoc(I, src))
to_chat(user, "You put [I] into [src].")
- frying = new/obj/item/reagent_containers/food/snacks/deepfryholder(src, I)
+ frying = new/obj/item/food/deepfryholder(src, I)
icon_state = "fryer_on"
fry_loop.start()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
index f76bdb46253..c150fe94498 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
@@ -9,7 +9,7 @@
layer = BELOW_OBJ_LAYER
use_power = NO_POWER_USE
var/grill_fuel = 0
- var/obj/item/reagent_containers/food/grilled_item
+ var/obj/item/reagent_containers/food/snacks/grilled_item
var/grill_time = 0
var/datum/looping_sound/grill/grill_loop
@@ -27,69 +27,74 @@
else
icon_state = "grill_open"
return ..()
+
+/obj/machinery/grill/examine(mob/user)
+ . = ..()
+ if(grill_fuel)
+ . += span_notice("\The [src] has [grill_fuel] units of fuel left.")
+ else
+ . += span_warning("\The [src] is out of fuel! Add some wood or coal!")
+
/obj/machinery/grill/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/stack/sheet/mineral/coal) || istype(I, /obj/item/stack/sheet/mineral/wood))
var/obj/item/stack/S = I
var/stackamount = S.get_amount()
- to_chat(user, "You put [stackamount] [I]s in [src].")
+ to_chat(user, span_notice("You put [stackamount] [I]s in [src]."))
if(istype(I, /obj/item/stack/sheet/mineral/coal))
- grill_fuel += (500 * stackamount)
- else
grill_fuel += (50 * stackamount)
+ else
+ grill_fuel += (5 * stackamount)
S.use(stackamount)
update_appearance()
return
if(I.resistance_flags & INDESTRUCTIBLE)
- to_chat(user, "You don't feel it would be wise to grill [I]...")
+ to_chat(user, span_warning("You don't feel it would be wise to grill [I]..."))
return ..()
- if(istype(I, /obj/item/reagent_containers))
- if(istype(I, /obj/item/reagent_containers/food) && !istype(I, /obj/item/reagent_containers/food/drinks))
- var/obj/item/reagent_containers/food/food_item = I
- if(HAS_TRAIT(food_item, TRAIT_NODROP) || (food_item.item_flags & (ABSTRACT | DROPDEL)))
- return ..()
- else if(food_item.foodtype & GRILLED)
- to_chat(user, "[food_item] has already been grilled!")
- return
- else if(!grill_fuel)
- to_chat(user, "There is not enough fuel!")
- return
- else if(!grilled_item && user.transferItemToLoc(food_item, src))
- grilled_item = food_item
- grilled_item.foodtype |= GRILLED
- to_chat(user, "You put the [grilled_item] on [src].")
- update_appearance()
- grill_loop.start()
- return
- else
- if(I.reagents.has_reagent(/datum/reagent/consumable/xeno_energy))
- grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/xeno_energy)))
- to_chat(user, "You pour the Monkey Energy in [src].")
- I.reagents.remove_reagent(/datum/reagent/consumable/xeno_energy, I.reagents.get_reagent_amount(/datum/reagent/consumable/xeno_energy))
- update_appearance()
- return
+
+ if(istype(I, /obj/item/reagent_containers/food/snacks))
+ var/obj/item/reagent_containers/food/snacks/food_item = I
+ if(HAS_TRAIT(food_item, TRAIT_NODROP) || (food_item.item_flags & (ABSTRACT | DROPDEL)))
+ return ..()
+ else if(food_item.foodtype & GRILLED)
+ to_chat(user, span_notice("[food_item] has already been grilled!"))
+ return
+ else if(grill_fuel <= 0)
+ to_chat(user, span_warning("There is not enough fuel!"))
+ return
+ else if(grilled_item)
+ to_chat(user,span_warning("\The [src] is already grilling something, take it out first!"))
+ return
+ else if(user.transferItemToLoc(food_item, src))
+ START_PROCESSING(SSmachines, src)
+ grilled_item = food_item
+ to_chat(user, span_notice("You put the [grilled_item] on [src]."))
+ update_appearance()
+ grill_loop.start()
+ return
..()
/obj/machinery/grill/process()
..()
+ if(!grilled_item)
+ return PROCESS_KILL
update_appearance()
- if(!grill_fuel)
+ if(grill_fuel <= 0)
+ grill_fuel = 0
+ visible_message(span_warning("\The [src] is out of fuel!"))
+ if(grilled_item)
+ grilled_item.forceMove(loc)
+ finish_grill()
return
- else
- grill_fuel -= 1
- if(prob(1))
- var/datum/effect_system/smoke_spread/bad/smoke = new
- smoke.set_up(1, loc)
- smoke.start()
- if(grilled_item)
- grill_time += 1
- grilled_item.reagents.add_reagent(/datum/reagent/consumable/char, 1)
- grill_fuel -= 10
- grilled_item.AddComponent(/datum/component/sizzle)
+ grill_time += 1
+ grill_fuel -= 1
+ if(prob(1))
+ var/datum/effect_system/smoke_spread/bad/smoke = new
+ smoke.set_up(1, loc)
+ smoke.start()
/obj/machinery/grill/Exited(atom/movable/AM)
if(AM == grilled_item)
finish_grill()
- grilled_item = null
. = ..()
/obj/machinery/grill/Destroy()
@@ -119,13 +124,15 @@
/obj/machinery/grill/attack_hand(mob/user)
if(grilled_item)
- to_chat(user, "You take out [grilled_item] from [src].")
+ to_chat(user, span_notice("You take out [grilled_item] from [src]."))
grilled_item.forceMove(drop_location())
update_appearance()
return
return ..()
/obj/machinery/grill/proc/finish_grill()
+ if(grill_time >= 10 && grilled_item.cooked_type)
+ grilled_item = grilled_item.microwave_act()
switch(grill_time) //no 0-9 to prevent spam
if(10 to 15)
grilled_item.name = "lightly-grilled [grilled_item.name]"
@@ -142,8 +149,12 @@
grilled_item.name = "Powerfully Grilled [grilled_item.name]"
grilled_item.desc = "A [grilled_item.name]. Reminds you of your wife, wait, no, it's prettier!"
grilled_item.foodtype |= FRIED
+ grilled_item.AddComponent(/datum/component/sizzle, (grill_time * 7.5))
+ grilled_item.foodtype |= GRILLED
grill_time = 0
grill_loop.stop()
+ grilled_item = null
+ update_appearance()
/obj/machinery/grill/unwrenched
anchored = FALSE
diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
index 1d4e366ad6d..de4d844aa3a 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
@@ -210,7 +210,7 @@
return
/obj/item/reagent_containers/food/snacks/icecream
- name = "ice cream cone"
+ name = "waffle cone"
desc = "Delicious waffle cone, but no ice cream."
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_cone_waffle" //default for admin-spawned cones, href_list["cone"] should overwrite this all the time
@@ -220,6 +220,7 @@
var/cone_type
bitesize = 4
foodtype = DAIRY | SUGAR
+ /*food_flags = FOOD_FINGER_FOOD*/
/obj/item/reagent_containers/food/snacks/icecream/Initialize()
. = ..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index 2762892110f..d3b7e7f152d 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -38,8 +38,11 @@
create_reagents(100)
soundloop = new(list(src), FALSE)
-/obj/machinery/microwave/Destroy()
+/obj/machinery/microwave/on_deconstruction()
eject()
+ return ..()
+
+/obj/machinery/microwave/Destroy()
QDEL_NULL(soundloop)
QDEL_LIST(ingredients)
if(wires)
@@ -362,9 +365,10 @@
name = "flameless ration heater"
desc = "A magnisium based ration heater. It can be used to heat up entrees and other food items. reaches the same temperature as a microwave with half the volume."
icon = 'icons/obj/food/ration.dmi'
- icon_state = "ration_package"
+ icon_state = "ration_heater"
grind_results = list(/datum/reagent/iron = 10, /datum/reagent/water = 10, /datum/reagent/consumable/sodiumchloride = 5)
heat = 3800
+ w_class = WEIGHT_CLASS_SMALL
var/obj/item/tocook = null
var/mutable_appearance/ration_overlay
var/uses = 3
diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
deleted file mode 100644
index 79382343e1a..00000000000
--- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+++ /dev/null
@@ -1,103 +0,0 @@
-GLOBAL_LIST_EMPTY(monkey_recyclers)
-
-/obj/machinery/monkey_recycler
- name = "monkey recycler"
- desc = "A machine used for recycling dead monkeys into monkey cubes."
- icon = 'icons/obj/kitchen.dmi'
- icon_state = "grinder"
- layer = BELOW_OBJ_LAYER
- density = TRUE
- use_power = IDLE_POWER_USE
- idle_power_usage = IDLE_DRAW_MINIMAL
- active_power_usage = ACTIVE_DRAW_MEDIUM
- circuit = /obj/item/circuitboard/machine/monkey_recycler
- var/stored_matter = 0
- var/cube_production = 0.2
- var/list/connected = list() //Keeps track of connected xenobio consoles, for deletion in /Destroy()
-
-/obj/machinery/monkey_recycler/Initialize(mapload)
- . = ..()
- if (mapload)
- GLOB.monkey_recyclers += src
-
-/obj/machinery/monkey_recycler/Destroy()
- GLOB.monkey_recyclers -= src
- for(var/thing in connected)
- var/obj/machinery/computer/camera_advanced/xenobio/console = thing
- console.connected_recycler = null
- connected.Cut()
- return ..()
-
-/obj/machinery/monkey_recycler/RefreshParts() //Ranges from 0.2 to 0.8 per monkey recycled
- cube_production = 0
- for(var/obj/item/stock_parts/manipulator/B in component_parts)
- cube_production += B.rating * 0.1
- for(var/obj/item/stock_parts/matter_bin/M in component_parts)
- cube_production += M.rating * 0.1
-
-/obj/machinery/monkey_recycler/examine(mob/user)
- . = ..()
- if(in_range(user, src) || isobserver(user))
- . += "The status display reads: Producing [cube_production] cubes for every monkey inserted."
-
-/obj/machinery/monkey_recycler/attackby(obj/item/O, mob/user, params)
- if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O))
- return
-
- if(default_pry_open(O))
- return
-
- if(default_unfasten_wrench(user, O))
- power_change()
- return
-
- if(default_deconstruction_crowbar(O))
- return
-
- if(machine_stat) //NOPOWER etc
- return
- else
- return ..()
-
-/obj/machinery/monkey_recycler/MouseDrop_T(mob/living/target, mob/living/user)
- if(!istype(target))
- return
- if(ismonkey(target))
- stuff_monkey_in(target, user)
-
-/obj/machinery/monkey_recycler/proc/stuff_monkey_in(mob/living/carbon/monkey/target, mob/living/user)
- if(!istype(target))
- return
- if(target.stat == CONSCIOUS)
- to_chat(user, "The monkey is struggling far too much to put it in the recycler.")
- return
- if(target.buckled || target.has_buckled_mobs())
- to_chat(user, "The monkey is attached to something.")
- return
- qdel(target)
- to_chat(user, "You stuff the monkey into the machine.")
- playsound(src.loc, 'sound/machines/juicer.ogg', 50, TRUE)
- var/offset = prob(50) ? -2 : 2
- animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
- use_power(500)
- stored_matter += cube_production
- addtimer(VARSET_CALLBACK(src, pixel_x, base_pixel_x))
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), user, "The machine now has [stored_matter] monkey\s worth of material stored."))
-
-/obj/machinery/monkey_recycler/interact(mob/user)
- if(stored_matter >= 1)
- to_chat(user, "The machine hisses loudly as it condenses the ground monkey meat. After a moment, it dispenses a brand new monkey cube.")
- playsound(src.loc, 'sound/machines/hiss.ogg', 50, TRUE)
- for(var/i in 1 to FLOOR(stored_matter, 1))
- new /obj/item/reagent_containers/food/snacks/monkeycube(src.loc)
- stored_matter--
- to_chat(user, "The machine's display flashes that it has [stored_matter] monkeys worth of material left.")
- else
- to_chat(user, "The machine needs at least 1 monkey worth of material to produce a monkey cube. It currently has [stored_matter].")
-
-/obj/machinery/monkey_recycler/multitool_act(mob/living/user, obj/item/multitool/I)
- . = ..()
- if(istype(I))
- to_chat(user, "You log [src] in the multitool's buffer.")
- I.buffer = src
- return TRUE
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index bc17a9fd22a..ef3cceed2af 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -37,7 +37,7 @@
qdel(what)
/obj/machinery/processor/proc/select_recipe(X)
- for (var/type in subtypesof(/datum/food_processor_process) - /datum/food_processor_process/mob)
+ for (var/type in subtypesof(/datum/food_processor_process))
var/datum/food_processor_process/recipe = new type()
if (!istype(X, recipe.input) || !istype(src, recipe.required_machine))
continue
@@ -149,60 +149,3 @@
O.forceMove(drop_location())
for (var/mob/M in src)
M.forceMove(drop_location())
-
-/obj/machinery/processor/slime
- name = "slime processor"
- desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating."
-
-/obj/machinery/processor/slime/Initialize()
- . = ..()
- var/obj/item/circuitboard/machine/B = new /obj/item/circuitboard/machine/processor/slime(null)
- B.apply_default_parts(src)
-
-/obj/machinery/processor/slime/adjust_item_drop_location(atom/movable/AM)
- var/static/list/slimecores = subtypesof(/obj/item/slime_extract)
- var/i = 0
- if(!(i = slimecores.Find(AM.type))) // If the item is not found
- return
- if (i <= 16) // If in the first 12 slots
- AM.pixel_x = AM.base_pixel_x - 12 + ((i%4)*8)
- AM.pixel_y = AM.base_pixel_y - 12 + (round(i/4)*8)
- return i
- var/ii = i - 16
- AM.pixel_x = AM.base_pixel_x - 12 + ((ii%4)*8)
- AM.pixel_y = AM.base_pixel_y - 12 + (round(ii/4)*8)
- return i
-
-/obj/machinery/processor/slime/process()
- if(processing)
- return
- var/mob/living/simple_animal/slime/picked_slime
- for(var/mob/living/simple_animal/slime/slime in range(1,src))
- if(slime.loc == src)
- continue
- if(istype(slime, /mob/living/simple_animal/slime))
- if(slime.stat)
- picked_slime = slime
- break
- if(!picked_slime)
- return
- var/datum/food_processor_process/P = select_recipe(picked_slime)
- if (!P)
- return
-
- visible_message("[picked_slime] is sucked into [src].")
- picked_slime.forceMove(src)
-
-/obj/machinery/processor/slime/process_food(datum/food_processor_process/recipe, atom/movable/what)
- var/mob/living/simple_animal/slime/S = what
- if (istype(S))
- var/C = S.cores
- if(S.stat != DEAD)
- S.forceMove(drop_location())
- S.visible_message("[C] crawls free of the processor!")
- return
- for(var/i in 1 to (C+rating_amount-1))
- var/atom/movable/item = new S.coretype(drop_location())
- adjust_item_drop_location(item)
- SSblackbox.record_feedback("tally", "slime_core_harvested", 1, S.colour)
- ..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 5852ea34742..e75a6519dbe 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -12,6 +12,7 @@
idle_power_usage = IDLE_DRAW_MINIMAL
active_power_usage = ACTIVE_DRAW_MINIMAL
circuit = /obj/item/circuitboard/machine/smartfridge
+ integrity_failure = 0.4
var/max_n_of_items = 1500
var/allow_ai_retrieve = FALSE
@@ -40,7 +41,10 @@
. += "The status display reads: This unit can hold a maximum of [max_n_of_items] items."
/obj/machinery/smartfridge/update_icon_state()
- if(machine_stat)
+ if(machine_stat & BROKEN)
+ icon_state = "[initial(icon_state)]-broken"
+ return ..()
+ else if(!powered())
icon_state = "[initial(icon_state)]-off"
return ..()
@@ -53,10 +57,8 @@
icon_state = "[initial(icon_state)]"
if(1 to 25)
icon_state = "[initial(icon_state)]1"
- if(26 to 75)
+ if(26 to INFINITY)
icon_state = "[initial(icon_state)]2"
- if(76 to INFINITY)
- icon_state = "[initial(icon_state)]3"
return ..()
/obj/machinery/smartfridge/update_overlays()
@@ -366,7 +368,7 @@
/obj/machinery/smartfridge/drinks/accept_check(obj/item/O)
if(!istype(O, /obj/item/reagent_containers) || (O.item_flags & ABSTRACT) || !O.reagents || !O.reagents.reagent_list.len)
return FALSE
- if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks) || istype(O, /obj/item/reagent_containers/food/condiment))
+ if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks) || istype(O, /obj/item/reagent_containers/condiment))
return TRUE
// ----------------------------
@@ -380,23 +382,6 @@
return TRUE
return FALSE
-// -------------------------------------
-// Xenobiology Slime-Extract Smartfridge
-// -------------------------------------
-/obj/machinery/smartfridge/extract
- name = "smart slime extract storage"
- desc = "A refrigerated storage unit for slime extracts."
-
-/obj/machinery/smartfridge/extract/accept_check(obj/item/O)
- if(istype(O, /obj/item/slime_extract))
- return TRUE
- if(istype(O, /obj/item/slime_scanner))
- return TRUE
- return FALSE
-
-/obj/machinery/smartfridge/extract/preloaded
- initial_contents = list(/obj/item/slime_scanner = 2)
-
// -------------------------
// Organ Surgery Smartfridge
// -------------------------
@@ -437,6 +422,15 @@
var/obj/item/organ/O = AM
O.organ_flags &= ~ORGAN_FROZEN
+/obj/machinery/smartfridge/organ/preloaded
+ initial_contents = list(
+ /obj/item/organ/stomach = 2,
+ /obj/item/organ/lungs = 1,
+ /obj/item/organ/liver = 2,
+ /obj/item/organ/eyes = 2,
+ /obj/item/organ/heart = 2,
+ /obj/item/organ/ears = 2)
+
// -----------------------------
// Chemistry Medical Smartfridge
// -----------------------------
diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm
index 772893e3ff1..bfc9179c489 100644
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -96,7 +96,7 @@
. += tag_overlay
/obj/item/pizzabox/worn_overlays(isinhands, icon_file)
- . = list()
+ . = ..()
var/current_offset = 2
if(isinhands)
for(var/V in boxes) //add EXTRA BOX per box
@@ -341,13 +341,13 @@
/obj/item/pizzabox/infinite/proc/attune_pizza(mob/living/carbon/human/noms) //tonight on "proc names I never thought I'd type"
if(!pizza_preferences[noms.ckey])
- pizza_preferences[noms.ckey] = pickweight(pizza_types)
+ pizza_preferences[noms.ckey] = pick_weight(pizza_types)
if(noms.has_quirk(/datum/quirk/pineapple_liker))
pizza_preferences[noms.ckey] = /obj/item/reagent_containers/food/snacks/pizza/pineapple
else if(noms.has_quirk(/datum/quirk/pineapple_hater))
var/list/pineapple_pizza_liker = pizza_types.Copy()
pineapple_pizza_liker -= /obj/item/reagent_containers/food/snacks/pizza/pineapple
- pizza_preferences[noms.ckey] = pickweight(pineapple_pizza_liker)
+ pizza_preferences[noms.ckey] = pick_weight(pineapple_pizza_liker)
else if(noms.mind && noms.mind.assigned_role == "Botanist")
pizza_preferences[noms.ckey] = /obj/item/reagent_containers/food/snacks/pizza/dank
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 2474d1d5350..8be72cd786d 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -29,6 +29,7 @@
results = list(/datum/reagent/consumable/ethanol/moonshine = 10)
required_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5)
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
+ required_container = /obj/structure/fermenting_barrel
/datum/chemical_reaction/wine
results = list(/datum/reagent/consumable/ethanol/wine = 10)
@@ -632,22 +633,10 @@
/datum/chemical_reaction/hearth_wine
results = list(/datum/reagent/consumable/ethanol/trickwine/hearth_wine = 5)
- required_reagents = list(/datum/reagent/consumable/ethanol/hcider = 3, /datum/reagent/consumable/pyre_elementum = 1, /datum/reagent/fuel = 1)
+ required_reagents = list(/datum/reagent/consumable/ethanol/hcider = 3, /datum/reagent/consumable/pyre_elementum = 1, /datum/reagent/phosphorus = 1)
required_container = /obj/structure/fermenting_barrel/distiller
mix_sound ='sound/items/welder.ogg'
-/datum/chemical_reaction/force_wine
- results = list(/datum/reagent/consumable/ethanol/trickwine/force_wine = 5)
- required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 3, /datum/reagent/calcium = 1, /datum/reagent/consumable/comet_trail = 1)
- required_container = /obj/structure/fermenting_barrel/distiller
- mix_sound ='sound/magic/forcewall.ogg'
-
-/datum/chemical_reaction/prism_wine
- results = list(/datum/reagent/consumable/ethanol/trickwine/prism_wine = 5)
- required_reagents = list(/datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/toxin/plasma = 1, /datum/reagent/consumable/tinlux = 1)
- required_container = /obj/structure/fermenting_barrel/distiller
- mix_sound ='sound/weapons/laser.ogg'
-
/datum/chemical_reaction/molten_bubbles
results = list(/datum/reagent/consumable/molten = 30)
required_reagents = list(/datum/reagent/clf3 = 10, /datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/leporazine = 1, /datum/reagent/medicine/lavaland_extract = 1)
diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm
index 55db7cf06b8..63ffccdba79 100644
--- a/code/modules/food_and_drinks/recipes/processor_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm
@@ -13,17 +13,13 @@
input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet
output = /obj/item/reagent_containers/food/snacks/meat/rawbacon
-/datum/food_processor_process/potatowedges
- input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges
- output = /obj/item/reagent_containers/food/snacks/fries
-
/datum/food_processor_process/sweetpotato
input = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
output = /obj/item/reagent_containers/food/snacks/yakiimo
/datum/food_processor_process/potato
input = /obj/item/reagent_containers/food/snacks/grown/potato
- output = /obj/item/reagent_containers/food/snacks/tatortot
+ output = /obj/item/reagent_containers/food/snacks/fries
/datum/food_processor_process/carrot
input = /obj/item/reagent_containers/food/snacks/grown/carrot
@@ -35,7 +31,7 @@
/datum/food_processor_process/spaghetti
input = /obj/item/reagent_containers/food/snacks/doughslice
- output = /obj/item/reagent_containers/food/snacks/spaghetti
+ output = /obj/item/food/spaghetti/raw
/datum/food_processor_process/corn
input = /obj/item/reagent_containers/food/snacks/grown/corn
@@ -49,11 +45,6 @@
input = /obj/item/reagent_containers/food/snacks/grown/parsnip
output = /obj/item/reagent_containers/food/snacks/roastparsnip
-/datum/food_processor_process/mob/slime
- input = /mob/living/simple_animal/slime
- output = null
- required_machine = /obj/machinery/processor/slime
-
/datum/food_processor_process/towercap
input = /obj/item/grown/log
output = /obj/item/popsicle_stick
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
index f29e948adf4..751f6017eb9 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
@@ -6,83 +6,72 @@
/datum/crafting_recipe/food/meatbread
name = "Meat bread"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/food/bread/plain = 1,
/obj/item/reagent_containers/food/snacks/meat/cutlet/plain = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 3
)
- result = /obj/item/reagent_containers/food/snacks/store/bread/meat
+ result = /obj/item/food/bread/meat
subcategory = CAT_BREAD
/datum/crafting_recipe/food/xenomeatbread
name = "Xenomeat bread"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/food/bread/plain = 1,
/obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 3
)
- result = /obj/item/reagent_containers/food/snacks/store/bread/xenomeat
+ result = /obj/item/food/bread/xenomeat
subcategory = CAT_BREAD
/datum/crafting_recipe/food/spidermeatbread
name = "Spidermeat bread"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/food/bread/plain = 1,
/obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 3
)
- result = /obj/item/reagent_containers/food/snacks/store/bread/spidermeat
+ result = /obj/item/food/bread/spidermeat
subcategory = CAT_BREAD
/datum/crafting_recipe/food/banananutbread
name = "Banana nut bread"
reqs = list(
/datum/reagent/consumable/milk = 5,
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/food/bread/plain = 1,
/obj/item/reagent_containers/food/snacks/boiledegg = 3,
/obj/item/reagent_containers/food/snacks/grown/banana = 1
)
- result = /obj/item/reagent_containers/food/snacks/store/bread/banana
+ result = /obj/item/food/bread/banana
subcategory = CAT_BREAD
/datum/crafting_recipe/food/tofubread
name = "Tofu bread"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/food/bread/plain = 1,
/obj/item/reagent_containers/food/snacks/tofu = 3,
/obj/item/reagent_containers/food/snacks/cheesewedge = 3
)
- result = /obj/item/reagent_containers/food/snacks/store/bread/tofu
+ result = /obj/item/food/bread/tofu
subcategory = CAT_BREAD
/datum/crafting_recipe/food/creamcheesebread
name = "Cream cheese bread"
reqs = list(
/datum/reagent/consumable/milk = 5,
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/food/bread/plain = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/bread/creamcheese
- subcategory = CAT_BREAD
-
-/datum/crafting_recipe/food/mimanabread
- name = "Mimana bread"
- reqs = list(
- /datum/reagent/consumable/soymilk = 5,
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/reagent_containers/food/snacks/tofu = 3,
- /obj/item/reagent_containers/food/snacks/grown/banana/mime = 1
- )
- result = /obj/item/reagent_containers/food/snacks/store/bread/mimana
+ result = /obj/item/food/bread/creamcheese
subcategory = CAT_BREAD
/datum/crafting_recipe/food/garlicbread
name = "Garlic Bread"
time = 40
reqs = list(/obj/item/reagent_containers/food/snacks/grown/garlic = 1,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 1,
+ /obj/item/food/breadslice/plain = 1,
/obj/item/reagent_containers/food/snacks/butter = 1
)
- result = /obj/item/reagent_containers/food/snacks/garlicbread
+ result = /obj/item/food/garlicbread
subcategory = CAT_BREAD
/datum/crafting_recipe/food/butterbiscuit
@@ -91,7 +80,7 @@
/obj/item/reagent_containers/food/snacks/bun = 1,
/obj/item/reagent_containers/food/snacks/butter = 1
)
- result = /obj/item/reagent_containers/food/snacks/butterbiscuit
+ result = /obj/item/food/butterbiscuit
subcategory = CAT_BREAD
/datum/crafting_recipe/food/butterdog
@@ -100,14 +89,14 @@
/obj/item/reagent_containers/food/snacks/bun = 1,
/obj/item/reagent_containers/food/snacks/butter = 3,
)
- result = /obj/item/reagent_containers/food/snacks/butterdog
+ result = /obj/item/food/butterdog
subcategory = CAT_BREAD
/datum/crafting_recipe/food/moldybread // why would you make this?
name = "Moldy Bread"
reqs = list(
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 1,
+ /obj/item/food/breadslice/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 1
)
- result = /obj/item/reagent_containers/food/snacks/breadslice/moldy
+ result = /obj/item/food/breadslice/moldy
subcategory = CAT_BREAD
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
index 38ea0442182..4f583890948 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
@@ -91,34 +91,6 @@
result = /obj/item/reagent_containers/food/snacks/burger/tofu
subcategory = CAT_BURGER
-/datum/crafting_recipe/food/ghostburger
- name = "Ghost burger"
- reqs = list(
- /obj/item/ectoplasm = 1,
- /datum/reagent/consumable/sodiumchloride = 2,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/ghost
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/clownburger
- name = "Clown burger"
- reqs = list(
- /obj/item/clothing/mask/gas/clown_hat = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/clown
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/mimeburger
- name = "Mime burger"
- reqs = list(
- /obj/item/clothing/mask/gas/mime = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/mime
- subcategory = CAT_BURGER
-
/datum/crafting_recipe/food/redburger
name = "Red burger"
reqs = list(
@@ -199,24 +171,6 @@
result = /obj/item/reagent_containers/food/snacks/burger/white
subcategory = CAT_BURGER
-/datum/crafting_recipe/food/spellburger
- name = "Spell burger"
- reqs = list(
- /obj/item/clothing/head/wizard/fake = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/spell
- subcategory = CAT_BURGER
-
-/datum/crafting_recipe/food/spellburger2
- name = "Spell burger"
- reqs = list(
- /obj/item/clothing/head/wizard = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1
- )
- result = /obj/item/reagent_containers/food/snacks/burger/spell
- subcategory = CAT_BURGER
-
/datum/crafting_recipe/food/bigbiteburger
name = "Big bite burger"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
index dcae05095ae..993c75246c6 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
@@ -6,190 +6,170 @@
/datum/crafting_recipe/food/carrotcake
name = "Carrot cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/carrot = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/carrot
+ result = /obj/item/food/cake/carrot
subcategory = CAT_CAKE
/datum/crafting_recipe/food/cheesecake
name = "Cheese cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/cheese
+ result = /obj/item/food/cake/cheese
subcategory = CAT_CAKE
/datum/crafting_recipe/food/applecake
name = "Apple cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/apple = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/apple
+ result = /obj/item/food/cake/apple
subcategory = CAT_CAKE
/datum/crafting_recipe/food/orangecake
name = "Orange cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/orange
+ result = /obj/item/food/cake/orange
subcategory = CAT_CAKE
/datum/crafting_recipe/food/limecake
name = "Lime cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/lime
+ result = /obj/item/food/cake/lime
subcategory = CAT_CAKE
/datum/crafting_recipe/food/lemoncake
name = "Lemon cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/lemon
+ result = /obj/item/food/cake/lemon
subcategory = CAT_CAKE
/datum/crafting_recipe/food/chocolatecake
name = "Chocolate cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/chocolate
+ result = /obj/item/food/cake/chocolate
subcategory = CAT_CAKE
/datum/crafting_recipe/food/birthdaycake
name = "Birthday cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/candle = 1,
/datum/reagent/consumable/sugar = 5,
/datum/reagent/consumable/caramel = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/birthday
+ result = /obj/item/food/cake/birthday
subcategory = CAT_CAKE
/datum/crafting_recipe/food/energycake
name = "Energy cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/birthday = 1,
- /obj/item/melee/transforming/energy/sword = 1,
+ /obj/item/food/cake/birthday = 1,
+ /obj/item/melee/energy/sword = 1,
)
- blacklist = list(/obj/item/reagent_containers/food/snacks/store/cake/birthday/energy)
- result = /obj/item/reagent_containers/food/snacks/store/cake/birthday/energy
+ blacklist = list(/obj/item/food/cake/birthday/energy)
+ result = /obj/item/food/cake/birthday/energy
subcategory = CAT_CAKE
/datum/crafting_recipe/food/braincake
name = "Brain cake"
reqs = list(
/obj/item/organ/brain = 1,
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1
+ /obj/item/food/cake/plain = 1
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/brain
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/slimecake
- name = "Slime cake"
- reqs = list(
- /obj/item/slime_extract = 1,
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/slimecake
+ result = /obj/item/food/cake/brain
subcategory = CAT_CAKE
/datum/crafting_recipe/food/pumpkinspicecake
name = "Pumpkin spice cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/pumpkin = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice
+ result = /obj/item/food/cake/pumpkinspice
subcategory = CAT_CAKE
-/datum/crafting_recipe/food/holycake
+/datum/crafting_recipe/food/angelcake
name = "Angel food cake"
reqs = list(
- /datum/reagent/water/holywater = 15,
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1
+ /datum/reagent/consumable/cream = 25,
+ /obj/item/food/cake/plain = 1
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/holy_cake
+ result = /obj/item/food/cake/holy_cake
subcategory = CAT_CAKE
/datum/crafting_recipe/food/poundcake
name = "Pound cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 4
+ /obj/item/food/cake/plain = 4
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake
+ result = /obj/item/food/cake/pound_cake
subcategory = CAT_CAKE
/datum/crafting_recipe/food/hardwarecake
name = "Hardware cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/circuitboard = 2,
/datum/reagent/toxin/acid = 5
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/hardware_cake
+ result = /obj/item/food/cake/hardware_cake
subcategory = CAT_CAKE
/datum/crafting_recipe/food/bscccake
- name = "blackberry and strawberry chocolate cake"
+ name = "Blackberry and Strawberry Chocolate cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 2,
/obj/item/reagent_containers/food/snacks/grown/berries = 5
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/bscc
+ result = /obj/item/food/cake/bscc
subcategory = CAT_CAKE
/datum/crafting_recipe/food/bscvcake
- name = "blackberry and strawberry vanilla cake"
+ name = "Blackberry and Strawberry Vanilla cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/berries = 5
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc
- subcategory = CAT_CAKE
-
-/datum/crafting_recipe/food/clowncake
- name = "clown cake"
- always_availible = FALSE
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /obj/item/reagent_containers/food/snacks/sundae = 2,
- /obj/item/reagent_containers/food/snacks/grown/banana = 5
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/clown_cake
+ result = /obj/item/food/cake/bsvc
subcategory = CAT_CAKE
/datum/crafting_recipe/food/vanillacake
- name = "vanilla cake"
+ name = "Vanilla cake"
always_availible = FALSE
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/vanillapod = 2
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake
+ result = /obj/item/food/cake/vanilla_cake
subcategory = CAT_CAKE
/datum/crafting_recipe/food/trumpetcake
name = "Spaceman's Cake"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/food/cake/plain = 1,
/obj/item/reagent_containers/food/snacks/grown/trumpet = 2,
/datum/reagent/consumable/cream = 5,
/datum/reagent/consumable/berryjuice = 5
)
- result = /obj/item/reagent_containers/food/snacks/store/cake/trumpet
+ result = /obj/item/food/cake/trumpet
subcategory = CAT_CAKE
@@ -198,7 +178,7 @@
reqs = list(
/obj/item/organ/brain = 1,
/obj/item/organ/heart = 1,
- /obj/item/reagent_containers/food/snacks/store/cake/birthday = 1,
+ /obj/item/food/cake/birthday = 1,
/obj/item/reagent_containers/food/snacks/meat/slab = 3,
/datum/reagent/blood = 30,
/datum/reagent/consumable/sprinkles = 5,
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
index 4e0ade4fa22..3f39339a4d4 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
@@ -86,28 +86,6 @@
////////////////////// Non-alcoholic recipes ///////////////////
-/datum/crafting_recipe/holybottle
- name = "Holy Water Flask"
- time = 30
- reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
- /datum/reagent/water/holywater = 100
- )
- result = /obj/item/reagent_containers/food/drinks/bottle/holywater
- category = CAT_DRINK
-
-//flask of unholy water is a beaker for some reason, I will try making it a bottle and add it here once the antag freeze is over. t. kryson
-
-/datum/crafting_recipe/nothingbottle
- name = "Nothing Bottle"
- time = 30
- reqs = list(
- /obj/item/reagent_containers/food/drinks/bottle = 1,
- /datum/reagent/consumable/nothing = 100
- )
- result = /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
- category = CAT_DRINK
-
/datum/crafting_recipe/smallcarton
name = "Small Carton"
result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton
@@ -124,22 +102,13 @@
/obj/item/reagent_containers/food/drinks/bottle = 1)
category = CAT_DRINK
-/datum/crafting_recipe/kong
- name = "Kong"
- result = /obj/item/reagent_containers/food/drinks/bottle/kong
- time = 30
- reqs = list(/datum/reagent/consumable/ethanol/whiskey = 100,
- /obj/item/reagent_containers/food/snacks/monkeycube = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1)
- category = CAT_DRINK
-
/datum/crafting_recipe/pruno
name = "pruno mix"
result = /obj/item/reagent_containers/food/drinks/bottle/pruno
time = 30
reqs = list(
/obj/item/storage/bag/trash = 1,
- /obj/item/reagent_containers/food/snacks/breadslice/moldy = 1,
+ /obj/item/food/breadslice/moldy = 1,
/obj/item/reagent_containers/food/snacks/grown = 4,
/obj/item/reagent_containers/food/snacks/candy_corn = 2,
/datum/reagent/water = 15
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
index 522f362e777..a4ab818fdd6 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
@@ -36,7 +36,7 @@
reqs = list(
/obj/item/reagent_containers/food/snacks/friedegg = 1,
/obj/item/reagent_containers/food/snacks/meat/steak = 1,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 1,
+ /obj/item/food/breadslice/plain = 1,
)
result = /obj/item/reagent_containers/food/snacks/benedict
subcategory = CAT_EGG
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
index edca42fda07..dbe7f114963 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
@@ -44,18 +44,6 @@
result = /obj/item/reagent_containers/food/snacks/sundae
subcategory = CAT_ICE
-/datum/crafting_recipe/food/honkdae
- name ="Honkdae"
- reqs = list(
- /datum/reagent/consumable/cream = 5,
- /obj/item/clothing/mask/gas/clown_hat = 1,
- /obj/item/reagent_containers/food/snacks/grown/cherries = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 2,
- /obj/item/reagent_containers/food/snacks/icecream = 1
- )
- result = /obj/item/reagent_containers/food/snacks/honkdae
- subcategory = CAT_ICE
-
/datum/crafting_recipe/food/cornuto
name = "Cornuto"
reqs = list(
@@ -182,28 +170,8 @@
result = /obj/item/reagent_containers/food/snacks/snowcones/fruitsalad
subcategory = CAT_ICE
-/datum/crafting_recipe/food/mime_sc
- name = "Mime snowcone"
- reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/nothing = 5
- )
- result = /obj/item/reagent_containers/food/snacks/snowcones/mime
- subcategory = CAT_ICE
-
-/datum/crafting_recipe/food/clown_sc
- name = "Clown snowcone"
- reqs = list(
- /obj/item/reagent_containers/food/drinks/sillycup = 1,
- /datum/reagent/consumable/ice = 15,
- /datum/reagent/consumable/laughter = 5
- )
- result = /obj/item/reagent_containers/food/snacks/snowcones/clown
- subcategory = CAT_ICE
-
/datum/crafting_recipe/food/soda_sc
- name = "Space Cola snowcone"
+ name = "Master Cola snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
@@ -213,7 +181,7 @@
subcategory = CAT_ICE
/datum/crafting_recipe/food/spacemountainwind_sc
- name = "Space Mountain Wind snowcone"
+ name = "Comet Trail snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
@@ -223,7 +191,7 @@
subcategory = CAT_ICE
/datum/crafting_recipe/food/pwrgame_sc
- name = "Pwrgame snowcone"
+ name = "Pacfuel snowcone"
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index 72f2046a3b8..ade14f27241 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -242,15 +242,6 @@
result = /obj/item/reagent_containers/food/snacks/bbqribs
subcategory = CAT_MEAT
-/datum/crafting_recipe/food/meatclown
- name = "Meat Clown"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1
- )
- result = /obj/item/reagent_containers/food/snacks/meatclown
- subcategory = CAT_MEAT
-
/datum/crafting_recipe/food/gumbo
name = "Black eyed gumbo"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index 1bb3d250a9a..1eb1d255c34 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -102,7 +102,7 @@
/datum/reagent/consumable/blackpepper = 1,
/obj/item/reagent_containers/food/snacks/pastrybase = 2
)
- result = /obj/item/reagent_containers/food/snacks/baguette
+ result = /obj/item/food/baguette
subcategory = CAT_MISCFOOD
////////////////////////////////////////////////TOAST////////////////////////////////////////////////
@@ -111,7 +111,7 @@
name = "Slime toast"
reqs = list(
/datum/reagent/toxin/slimejelly = 5,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+ /obj/item/food/breadslice/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
subcategory = CAT_MISCFOOD
@@ -120,7 +120,7 @@
name = "Jellied toast"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+ /obj/item/food/breadslice/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
subcategory = CAT_MISCFOOD
@@ -128,7 +128,7 @@
/datum/crafting_recipe/food/butteredtoast
name = "Buttered Toast"
reqs = list(
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 1,
+ /obj/item/food/breadslice/plain = 1,
/obj/item/reagent_containers/food/snacks/butter = 1
)
result = /obj/item/reagent_containers/food/snacks/butteredtoast
@@ -138,7 +138,7 @@
name = "Two bread"
reqs = list(
/datum/reagent/consumable/ethanol/wine = 5,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 2
+ /obj/item/food/breadslice/plain = 2
)
result = /obj/item/reagent_containers/food/snacks/twobread
subcategory = CAT_MISCFOOD
@@ -265,7 +265,7 @@
/datum/reagent/consumable/milk = 1,
/datum/reagent/consumable/cherryjelly = 5,
/obj/item/stock_parts/cell/super =1,
- /obj/item/melee/sabre = 1
+ /obj/item/melee/sword/sabre = 1
)
result = /obj/item/reagent_containers/food/snacks/powercrepe
subcategory = CAT_MISCFOOD
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
index cc61c7048fd..3de7c3c3d75 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
@@ -370,17 +370,6 @@
result = /obj/item/reagent_containers/food/snacks/donkpocket/pizza
subcategory = CAT_PASTRY
-/datum/crafting_recipe/food/donkpocket/honk
- time = 15
- name = "Honk-Pocket"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pastrybase = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1,
- /datum/reagent/consumable/sugar = 3
- )
- result = /obj/item/reagent_containers/food/snacks/donkpocket/honk
- subcategory = CAT_PASTRY
-
/datum/crafting_recipe/food/donkpocket/berry
time = 15
name = "Berry-pocket"
@@ -473,7 +462,7 @@
reqs = list(
/datum/reagent/consumable/eggyolk = 5,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1
+ /obj/item/food/bread/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/khachapuri
subcategory = CAT_PASTRY
@@ -575,7 +564,7 @@
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/bluecherries = 1
)
- result = /obj/item/reagent_containers/food/snacks/bluecherrycupcake
+ result = /obj/item/reagent_containers/food/snacks/cherrycupcake/blue
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/honeybun
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
index 83e923f53fb..42afb89c422 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
@@ -130,18 +130,6 @@
result = /obj/item/reagent_containers/food/snacks/pie/grapetart
subcategory = CAT_PIE
-/datum/crafting_recipe/food/mimetart
- name = "Mime tart"
- always_availible = FALSE
- reqs = list(
- /datum/reagent/consumable/milk = 5,
- /datum/reagent/consumable/sugar = 5,
- /obj/item/reagent_containers/food/snacks/pie/plain = 1,
- /datum/reagent/consumable/nothing = 5
- )
- result = /obj/item/reagent_containers/food/snacks/pie/mimetart
- subcategory = CAT_PIE
-
/datum/crafting_recipe/food/berrytart
name = "Berry tart"
always_availible = FALSE
@@ -162,7 +150,6 @@
/datum/reagent/consumable/sugar = 5,
/obj/item/reagent_containers/food/snacks/pie/plain = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 3,
- /obj/item/slime_extract = 1 //The reason you dont know how to make it!
)
result = /obj/item/reagent_containers/food/snacks/pie/cocolavatart
subcategory = CAT_PIE
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
index 2cb668df4fd..704ac4d207e 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
@@ -24,18 +24,6 @@
result = /obj/item/reagent_containers/food/snacks/pizza/meat
subcategory = CAT_PIZZA
-/datum/crafting_recipe/food/arnold
- name = "Arnold pizza"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 3,
- /obj/item/ammo_casing/c9mm = 8,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pizza/arnold
- subcategory = CAT_PIZZA
-
/datum/crafting_recipe/food/mushroompizza
name = "Mushroom pizza"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
index 73ccc0f3789..778c639a074 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
@@ -34,19 +34,6 @@
result = /obj/item/reagent_containers/food/snacks/salad/validsalad
subcategory = CAT_SALAD
-/datum/crafting_recipe/food/monkeysdelight
- name = "Monkeys delight"
- reqs = list(
- /datum/reagent/consumable/flour = 5,
- /datum/reagent/consumable/sodiumchloride = 1,
- /datum/reagent/consumable/blackpepper = 1,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/monkeycube = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1
- )
- result = /obj/item/reagent_containers/food/snacks/soup/monkeysdelight
- subcategory = CAT_SALAD
-
/datum/crafting_recipe/food/oatmeal
name = "Oatmeal"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
index 41829e9ec2b..121f15fa972 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
@@ -9,7 +9,7 @@
/datum/crafting_recipe/food/sandwich
name = "Sandwich"
reqs = list(
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
+ /obj/item/food/breadslice/plain = 2,
/obj/item/reagent_containers/food/snacks/meat/steak = 1,
/obj/item/reagent_containers/food/snacks/cheesewedge = 1
)
@@ -19,7 +19,7 @@
/datum/crafting_recipe/food/grilledcheesesandwich
name = "Cheese sandwich"
reqs = list(
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
+ /obj/item/food/breadslice/plain = 2,
/obj/item/reagent_containers/food/snacks/cheesewedge = 2
)
result = /obj/item/reagent_containers/food/snacks/grilledcheese
@@ -29,7 +29,7 @@
name = "Jelly sandwich"
reqs = list(
/datum/reagent/toxin/slimejelly = 5,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
+ /obj/item/food/breadslice/plain = 2,
)
result = /obj/item/reagent_containers/food/snacks/jellysandwich/slime
subcategory = CAT_SANDWICH
@@ -38,7 +38,7 @@
name = "Jelly sandwich"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
+ /obj/item/food/breadslice/plain = 2,
)
result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
subcategory = CAT_SANDWICH
@@ -46,7 +46,7 @@
/datum/crafting_recipe/food/notasandwich
name = "Not a sandwich"
reqs = list(
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
+ /obj/item/food/breadslice/plain = 2,
/obj/item/clothing/mask/fakemoustache = 1
)
result = /obj/item/reagent_containers/food/snacks/notasandwich
@@ -55,11 +55,11 @@
/datum/crafting_recipe/food/blt
name = "BLT"
reqs = list(
- /obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
+ /obj/item/food/breadslice/plain = 2,
/obj/item/reagent_containers/food/snacks/meat/bacon = 2,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1
)
result = /obj/item/reagent_containers/food/snacks/blt
- category = CAT_SANDWICH
+ subcategory = CAT_SANDWICH
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
index d0558f94fdb..9352e1b371a 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
@@ -88,7 +88,6 @@
/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
/obj/item/reagent_containers/food/snacks/grown/chili = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 1,
- /obj/item/clothing/shoes/clown_shoes = 1
)
result = /obj/item/reagent_containers/food/snacks/soup/clownchili
subcategory = CAT_SOUP
@@ -115,15 +114,15 @@
subcategory = CAT_SOUP
-/datum/crafting_recipe/food/milosoup
- name = "Milo soup"
+/datum/crafting_recipe/food/misosoup
+ name = "Miso soup"
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/glass/bowl = 1,
/obj/item/reagent_containers/food/snacks/soydope = 2,
/obj/item/reagent_containers/food/snacks/tofu = 2
)
- result = /obj/item/reagent_containers/food/snacks/soup/milo
+ result = /obj/item/reagent_containers/food/snacks/soup/miso
subcategory = CAT_SOUP
/datum/crafting_recipe/food/bloodsoup
@@ -146,17 +145,6 @@
result = /obj/item/reagent_containers/food/snacks/soup/slime
subcategory = CAT_SOUP
-/datum/crafting_recipe/food/clownstears
- name = "Clowns tears"
- reqs = list(
- /datum/reagent/water = 10,
- /obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1,
- /obj/item/stack/sheet/mineral/hidden/hellstone = 1
- )
- result = /obj/item/reagent_containers/food/snacks/soup/clownstears
- subcategory = CAT_SOUP
-
/datum/crafting_recipe/food/mysterysoup
name = "Mystery soup"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
index 796c360c344..f123ced2ffc 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
@@ -6,65 +6,56 @@
/datum/crafting_recipe/food/tomatopasta
name = "Tomato pasta"
reqs = list(
- /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti = 1,
+ /obj/item/food/spaghetti/boiledspaghetti = 1,
/obj/item/reagent_containers/food/snacks/grown/tomato = 2
)
- result = /obj/item/reagent_containers/food/snacks/spaghetti/pastatomato
+ result = /obj/item/food/spaghetti/pastatomato
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/copypasta
name = "Copypasta"
reqs = list(
- /obj/item/reagent_containers/food/snacks/spaghetti/pastatomato = 2
+ /obj/item/food/spaghetti/pastatomato = 2
)
- result = /obj/item/reagent_containers/food/snacks/spaghetti/copypasta
+ result = /obj/item/food/spaghetti/copypasta
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/spaghettimeatball
name = "Spaghetti meatball"
reqs = list(
- /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti = 1,
+ /obj/item/food/spaghetti/boiledspaghetti = 1,
/obj/item/reagent_containers/food/snacks/meatball = 2
)
- result = /obj/item/reagent_containers/food/snacks/spaghetti/meatballspaghetti
- subcategory = CAT_SPAGHETTI
-
-/datum/crafting_recipe/food/spesslaw
- name = "Spesslaw"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti = 1,
- /obj/item/reagent_containers/food/snacks/meatball = 4
- )
- result = /obj/item/reagent_containers/food/snacks/spaghetti/spesslaw
+ result = /obj/item/food/spaghetti/meatballspaghetti
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/beefnoodle
name = "Beef noodle"
reqs = list(
/obj/item/reagent_containers/glass/bowl = 1,
- /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti = 1,
+ /obj/item/food/spaghetti/boiledspaghetti = 1,
/obj/item/reagent_containers/food/snacks/meat/cutlet = 2,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
)
- result = /obj/item/reagent_containers/food/snacks/spaghetti/beefnoodle
+ result = /obj/item/food/spaghetti/beefnoodle
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/chowmein
name = "Chowmein"
reqs = list(
- /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti = 1,
+ /obj/item/food/spaghetti/boiledspaghetti = 1,
/obj/item/reagent_containers/food/snacks/meat/cutlet = 1,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 2,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1
)
- result = /obj/item/reagent_containers/food/snacks/spaghetti/chowmein
+ result = /obj/item/food/spaghetti/chowmein
subcategory = CAT_SPAGHETTI
/datum/crafting_recipe/food/butternoodles
name = "Butter Noodles"
reqs = list(
- /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti = 1,
+ /obj/item/food/spaghetti/boiledspaghetti = 1,
/obj/item/reagent_containers/food/snacks/butter = 1
)
- result = /obj/item/reagent_containers/food/snacks/spaghetti/butternoodles
+ result = /obj/item/food/spaghetti/butternoodles
subcategory = CAT_SPAGHETTI
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index 9d88d310755..34325454bd7 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -55,7 +55,7 @@
icon_state = "s_rabbit_white"
icon_living = "s_rabbit_white"
icon_dead = "s_rabbit_white_dead"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
unsuitable_atmos_damage = 0
@@ -84,24 +84,6 @@
. = ..()
countEggs()
-//Bunny Suit
-/obj/item/clothing/head/bunnyhead
- name = "Easter Bunny Head"
- icon_state = "bunnyhead"
- item_state = "bunnyhead"
- desc = "Considerably more cute than 'Frank'."
- slowdown = -1
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
-/obj/item/clothing/suit/bunnysuit
- name = "Easter Bunny Suit"
- desc = "Hop Hop Hop!"
- icon_state = "bunnysuit"
- item_state = "bunnysuit"
- slowdown = -1
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-
//Bunny bag!
/obj/item/storage/backpack/satchel/bunnysatchel
name = "Easter Bunny Satchel"
@@ -122,9 +104,7 @@
icon_state = "egg-[eggcolor]"
/obj/item/reagent_containers/food/snacks/egg/proc/dispensePrize(turf/where)
- var/won = pick(/obj/item/clothing/head/bunnyhead,
- /obj/item/clothing/suit/bunnysuit,
- /obj/item/storage/backpack/satchel/bunnysatchel,
+ var/won = pick(/obj/item/storage/backpack/satchel/bunnysatchel,
/obj/item/reagent_containers/food/snacks/grown/carrot,
/obj/item/toy/balloon,
/obj/item/toy/gun,
@@ -143,7 +123,7 @@
/obj/item/toy/prize/durand,
/obj/item/toy/prize/marauder,
/obj/item/toy/prize/seraph,
- /obj/item/toy/prize/mauler,
+ /obj/item/toy/prize/touro,
/obj/item/toy/prize/odysseus,
/obj/item/toy/prize/phazon,
/obj/item/toy/prize/reticence,
@@ -151,8 +131,7 @@
/obj/item/toy/plush/carpplushie,
/obj/item/toy/plush/spider,
/obj/item/toy/redbutton,
- /obj/item/toy/windupToolbox,
- /obj/item/clothing/head/collectable/rabbitears)
+ /obj/item/toy/windupToolbox)
new won(where)
new/obj/item/reagent_containers/food/snacks/chocolateegg(where)
@@ -174,36 +153,12 @@
/datum/crafting_recipe/food/hotcrossbun
name = "Hot-Cross Bun"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/food/bread/plain = 1,
/datum/reagent/consumable/sugar = 1
)
result = /obj/item/reagent_containers/food/snacks/hotcrossbun
subcategory = CAT_MISCFOOD
-
-/obj/item/reagent_containers/food/snacks/store/cake/brioche
- name = "brioche cake"
- desc = "A ring of sweet, glazed buns."
- icon_state = "briochecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche
- slices_num = 6
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
-
-/obj/item/reagent_containers/food/snacks/cakeslice/brioche
- name = "brioche cake slice"
- desc = "Delicious sweet-bread. Who needs anything else?"
- icon_state = "briochecake_slice"
- filling_color = "#FFD700"
-
-/datum/crafting_recipe/food/briochecake
- name = "Brioche cake"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
- /datum/reagent/consumable/sugar = 2
- )
- result = /obj/item/reagent_containers/food/snacks/store/cake/brioche
- subcategory = CAT_MISCFOOD
-
/obj/item/reagent_containers/food/snacks/scotchegg
name = "scotch egg"
desc = "A boiled egg wrapped in a delicious, seasoned meatball."
@@ -234,7 +189,7 @@
/datum/crafting_recipe/food/mammi
name = "Mammi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/food/bread/plain = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
/datum/reagent/consumable/milk = 5
)
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index ae19b1dea37..ac946eee384 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -571,7 +571,6 @@
/datum/holiday/easter
name = EASTER
- drone_hat = /obj/item/clothing/head/rabbitears
var/const/days_early = 1 //to make editing the holiday easier
var/const/days_extra = 1
diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm
index d56fd4f9c32..c0d985e89d7 100644
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -13,7 +13,7 @@
/obj/item/holo/esword
name = "holographic energy sword"
desc = "May the force be with you. Sorta."
- icon = 'icons/obj/transforming_energy.dmi'
+ icon = 'icons/obj/weapon/energy.dmi'
icon_state = "sword"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
@@ -69,7 +69,7 @@
/obj/item/toy/beach_ball/holoball
name = "basketball"
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "basketball"
item_state = "basketball"
desc = "Here's your chance, do your dance at the Space Jam."
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 59e9a46341e..9670e4426a6 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -169,4 +169,4 @@
tiled_dirt = FALSE
/turf/open/floor/holofloor/snow/cold
- initial_gas_mix = "nob=7500;TEMP=2.7"
+ initial_gas_mix = "ammonia=7500;TEMP=2.7"
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index a91ad2b9005..6f1b40b3dc9 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -76,6 +76,14 @@
icon_state = closed_state
return ..()
+/obj/structure/fermenting_barrel/gunpowder
+ name = "Gunpowder Barrel"
+ desc = "A wooden barrel packed with gunpowder. You should probably keep this away from sparks or open fires."
+
+/obj/structure/fermenting_barrel/gunpowder/Initialize()
+ . = ..()
+ reagents.add_reagent(/datum/reagent/gunpowder, 200)
+
/obj/structure/fermenting_barrel/distiller
name = "Distiller"
icon_state = "distiller"
diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm
index a21e9f71afc..87e0f1a2a42 100644
--- a/code/modules/hydroponics/gene_modder.dm
+++ b/code/modules/hydroponics/gene_modder.dm
@@ -341,7 +341,6 @@
seed.genes += disk.gene.Copy()
if(istype(disk.gene, /datum/plant_gene/reagent))
seed.reagents_from_genes()
- disk.gene.apply_vars(seed)
repaint_seed()
diff --git a/code/modules/hydroponics/genes/attack.dm b/code/modules/hydroponics/genes/attack.dm
new file mode 100644
index 00000000000..37dabf0c06a
--- /dev/null
+++ b/code/modules/hydroponics/genes/attack.dm
@@ -0,0 +1,128 @@
+/// Traits that turn a plant into a weapon, giving them force and effects on attack.
+/datum/plant_gene/trait/attack
+ name = "On Attack Trait"
+ description = "It is a very dangerous weapon."
+ icon = "hand-fist"
+ /// The multiplier we apply to the potency to calculate force. Set to 0 to not affect the force.
+ var/force_multiplier = 0
+ /// If TRUE, our plant will degrade in force every hit until diappearing.
+ var/degrades_after_hit = FALSE
+ /// When we fully degrade, what degraded off of us?
+ var/degradation_noun = "leaves"
+
+/datum/plant_gene/trait/attack/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+
+ if(force_multiplier)
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ our_plant.force = round((5 + our_seed.potency * force_multiplier), 1)
+ RegisterSignal(our_plant, COMSIG_ITEM_ATTACK, PROC_REF(on_plant_attack))
+ RegisterSignal(our_plant, COMSIG_ITEM_AFTERATTACK, PROC_REF(after_plant_attack))
+
+/// Signal proc for [COMSIG_ITEM_ATTACK] that allows for effects on attack
+/datum/plant_gene/trait/attack/proc/on_plant_attack(obj/item/source, mob/living/target, mob/living/user)
+ SIGNAL_HANDLER
+
+ INVOKE_ASYNC(src, PROC_REF(attack_effect), source, target, user)
+
+/*
+ * Effects done when we hit people with our plant, ON attack.
+ * Override on a per-plant basis.
+ *
+ * our_plant - our plant, that we're attacking with
+ * user - the person who is attacking with the plant
+ * target - the person who is attacked by the plant
+ */
+/datum/plant_gene/trait/attack/proc/attack_effect(obj/item/our_plant, mob/living/target, mob/living/user)
+ return
+
+/// Signal proc for [COMSIG_ITEM_AFTERATTACK] that allows for effects after an attack is done
+/datum/plant_gene/trait/attack/proc/after_plant_attack(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
+ SIGNAL_HANDLER
+
+ if(!proximity_flag)
+ return
+
+ if(!ismovable(target))
+ return
+
+ if(isobj(target))
+ var/obj/object_target = target
+ if(!(object_target.obj_flags & CAN_BE_HIT))
+ return .
+
+ INVOKE_ASYNC(src, PROC_REF(after_attack_effect), source, target, user)
+ return .
+
+/*
+ * Effects done when we hit people with our plant, AFTER the attack is done.
+ * Extend on a per-plant basis.
+ *
+ * our_plant - our plant, that we're attacking with
+ * user - the person who is attacking with the plant
+ * target - the atom which is attacked by the plant
+ */
+/datum/plant_gene/trait/attack/proc/after_attack_effect(obj/item/our_plant, atom/target, mob/living/user)
+ SHOULD_CALL_PARENT(TRUE)
+
+ if(!degrades_after_hit)
+ return
+
+ // We probably hit something or someone. Reduce our force
+ if(our_plant.force > 0)
+ our_plant.force -= rand(1, (our_plant.force / 3) + 1)
+ return
+
+ // When our force degrades to zero or below, we're all done
+ to_chat(user, span_warning("All the [degradation_noun] have fallen off [our_plant] from violent whacking!"))
+ qdel(our_plant)
+
+/// Novaflower's attack effects (sets people on fire) + degradation on attack
+/datum/plant_gene/trait/attack/novaflower_attack
+ name = "Heated Petals"
+ description = "Hitting with it may cause things to combust."
+ force_multiplier = 0.2
+ degrades_after_hit = TRUE
+ degradation_noun = "petals"
+
+/datum/plant_gene/trait/attack/novaflower_attack/attack_effect(obj/item/our_plant, mob/living/target, mob/living/user)
+ if(!istype(target))
+ return
+
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ to_chat(target, span_danger("You are lit on fire from the intense heat of [our_plant]!"))
+ target.adjust_fire_stacks(round(our_seed.potency / 20))
+ if(target.IgniteMob())
+ message_admins("[ADMIN_LOOKUPFLW(user)] set [ADMIN_LOOKUPFLW(target)] on fire with [our_plant] at [AREACOORD(user)]")
+ user.log_message("set [key_name(target)] on fire with [our_plant]", LOG_ATTACK)
+ target.log_message("was set on fire by [key_name(user)] with [our_plant].", LOG_ATTACK)
+
+ our_plant.investigate_log("was used by [key_name(user)] to burn [key_name(target)] at [AREACOORD(user)]", INVESTIGATE_BOTANY)
+
+/// Sunflower's attack effect (shows cute text)
+/datum/plant_gene/trait/attack/sunflower_attack
+ name = "Bright Petals"
+ description = "Makes others feel the power on hit."
+
+/datum/plant_gene/trait/attack/sunflower_attack/after_attack_effect(obj/item/our_plant, atom/target, mob/user, proximity_flag, click_parameters)
+ if(ismob(target))
+ var/mob/target_mob = target
+ user.visible_message("[user] smacks [target_mob] with [user.p_their()] [our_plant.name]! FLOWER POWER!", ignored_mobs = list(target_mob, user))
+ if(target_mob != user)
+ to_chat(target_mob, "[user] smacks you with [our_plant]!FLOWER POWER!")
+ to_chat(user, "Your [our_plant.name]'s FLOWER POWER strikes [target_mob]!")
+
+ return ..()
+
+/// Normal nettle's force + degradation on attack
+/datum/plant_gene/trait/attack/nettle_attack
+ name = "Sharpened Leaves"
+ force_multiplier = 0.2
+ degrades_after_hit = TRUE
+
+/// Deathnettle force + degradation on attack
+/datum/plant_gene/trait/attack/nettle_attack/death
+ name = "Aggressive Sharpened Leaves"
+ force_multiplier = 0.4
diff --git a/code/modules/hydroponics/genes/backfire.dm b/code/modules/hydroponics/genes/backfire.dm
new file mode 100644
index 00000000000..338b0fb1745
--- /dev/null
+++ b/code/modules/hydroponics/genes/backfire.dm
@@ -0,0 +1,163 @@
+/// Traits for plants with backfire effects. These are negative effects that occur when a plant is handled without gloves/unsafely.
+/datum/plant_gene/trait/backfire
+ name = "Backfire Trait"
+ icon = "mitten"
+ description = "Be careful when holding it without protection."
+ /// Whether our actions are cancelled when the backfire triggers.
+ var/cancel_action_on_backfire = FALSE
+ /// A list of extra traits to check to be considered safe.
+ var/list/traits_to_check
+ /// A list of extra genes to check to be considered safe.
+ var/list/genes_to_check
+
+/datum/plant_gene/trait/backfire/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+ if(genes_to_check)
+ genes_to_check = string_list(genes_to_check)
+ if(traits_to_check)
+ traits_to_check = string_list(traits_to_check)
+ our_plant.AddElement(/datum/element/plant_backfire, cancel_action_on_backfire, traits_to_check, genes_to_check)
+ RegisterSignal(our_plant, COMSIG_PLANT_ON_BACKFIRE, PROC_REF(on_backfire))
+
+/// Signal proc for [COMSIG_PLANT_ON_BACKFIRE] that causes the backfire effect.
+/datum/plant_gene/trait/backfire/proc/on_backfire(obj/item/source, mob/living/carbon/user)
+ SIGNAL_HANDLER
+
+ INVOKE_ASYNC(src, PROC_REF(backfire_effect), source, user)
+
+/**
+ * The actual backfire effect on the user.
+ * Override with plant-specific effects.
+ */
+/datum/plant_gene/trait/backfire/proc/backfire_effect(obj/item/our_plant, mob/living/carbon/user)
+ return
+
+/// Rose's prick on backfire
+/datum/plant_gene/trait/backfire/rose_thorns
+ name = "Rose Thorns"
+ description = "The stem has a lot of thorns."
+ traits_to_check = list(TRAIT_PIERCEIMMUNE)
+
+/datum/plant_gene/trait/backfire/rose_thorns/backfire_effect(obj/item/our_plant, mob/living/carbon/user)
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ if(!our_seed.get_gene(/datum/plant_gene/trait/sticky) && prob(66))
+ to_chat(user, span_danger("[our_plant]'s thorns nearly prick your hand. Best be careful."))
+ return
+
+ to_chat(user, span_danger("[our_plant]'s thorns prick your hand. Ouch."))
+ our_plant.investigate_log("rose-pricked [key_name(user)] at [AREACOORD(user)]", INVESTIGATE_BOTANY)
+ var/obj/item/bodypart/affecting = user.get_active_hand()
+ affecting?.receive_damage(2)
+
+/// Novaflower's hand burn on backfire
+/datum/plant_gene/trait/backfire/novaflower_heat
+ name = "Burning Stem"
+ description = "The stem may burn your hand."
+ cancel_action_on_backfire = TRUE
+
+/datum/plant_gene/trait/backfire/novaflower_heat/backfire_effect(obj/item/our_plant, mob/living/carbon/user)
+ to_chat(user, span_danger("[our_plant] singes your bare hand!"))
+ our_plant.investigate_log("self-burned [key_name(user)] for [our_plant.force] at [AREACOORD(user)]", INVESTIGATE_BOTANY)
+ var/obj/item/bodypart/affecting = user.get_active_hand()
+ return affecting?.receive_damage(0, our_plant.force)
+
+/// Normal Nettle hannd burn on backfire
+/datum/plant_gene/trait/backfire/nettle_burn
+ name = "Stinging Stem"
+ description = "The stem may sting your hand."
+
+/datum/plant_gene/trait/backfire/nettle_burn/backfire_effect(obj/item/our_plant, mob/living/carbon/user)
+ to_chat(user, span_danger("[our_plant] burns your bare hand!"))
+ our_plant.investigate_log("self-burned [key_name(user)] for [our_plant.force] at [AREACOORD(user)]", INVESTIGATE_BOTANY)
+ var/obj/item/bodypart/affecting = user.get_active_hand()
+ return affecting?.receive_damage(0, our_plant.force)
+
+/// Deathnettle hand burn + stun on backfire
+/datum/plant_gene/trait/backfire/nettle_burn/death
+ name = "Aggressive Stinging Stem"
+ cancel_action_on_backfire = TRUE
+
+/datum/plant_gene/trait/backfire/nettle_burn/death/backfire_effect(obj/item/our_plant, mob/living/carbon/user)
+ . = ..()
+ if(!. || prob(50))
+ return
+
+ user.Paralyze(10 SECONDS)
+ to_chat(user, span_userdanger("You are stunned by the powerful acids of [our_plant]!"))
+
+/*
+/// Ghost-Chili heating up on backfire
+/datum/plant_gene/trait/backfire/chili_heat
+ name = "Active Capsicum Glands"
+ description = "You may survive a cold winter with this in hand."
+ genes_to_check = list(/datum/plant_gene/trait/chem_heating)
+ /// The mob currently holding the chili.
+ var/datum/weakref/held_mob
+ /// The chili this gene is tied to, to track it for processing.
+ var/datum/weakref/our_chili
+
+/datum/plant_gene/trait/backfire/chili_heat/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+
+ our_chili = WEAKREF(our_plant)
+ RegisterSignals(our_plant, list(COMSIG_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(stop_backfire_effect))
+
+/*
+ * Begin processing the trait on backfire.
+ *
+ * our_plant - our source plant, which is backfiring
+ * user - the mob holding our plant
+ */
+/datum/plant_gene/trait/backfire/chili_heat/backfire_effect(obj/item/our_plant, mob/living/carbon/user)
+ held_mob = WEAKREF(user)
+ START_PROCESSING(SSobj, src)
+
+/*
+ * Stop processing the trait when we're dropped or deleted.
+ *
+ * our_plant - our source plant
+ */
+/datum/plant_gene/trait/backfire/chili_heat/proc/stop_backfire_effect(datum/source)
+ SIGNAL_HANDLER
+
+ held_mob = null
+ STOP_PROCESSING(SSobj, src)
+
+/*
+ * The processing of our trait. Heats up the mob ([held_mob]) currently holding the source plant ([our_chili]).
+ * Stops processing if we're no longer being held by [held mob].
+ */
+/datum/plant_gene/trait/backfire/chili_heat/process(seconds_per_tick)
+ var/mob/living/carbon/our_mob = held_mob?.resolve()
+ var/obj/item/our_plant = our_chili?.resolve()
+
+ // If our weakrefs don't resolve, or if our mob is not holding our plant, stop processing.
+ if(!our_mob || !our_plant || !our_mob.is_holding(our_plant))
+ stop_backfire_effect()
+ return
+
+ our_mob.adjust_bodytemperature(7.5 * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick)
+ if(SPT_PROB(5, seconds_per_tick))
+ to_chat(our_mob, span_warning("Your hand holding [our_plant] burns!"))
+
+/// Bluespace Tomato squashing on the user on backfire
+/datum/plant_gene/trait/backfire/bluespace
+ name = "Bluespace Volatility"
+ description = "You may be spaced out if you hold this unprotected."
+ cancel_action_on_backfire = TRUE
+ genes_to_check = list(/datum/plant_gene/trait/squash)
+
+/datum/plant_gene/trait/backfire/bluespace/backfire_effect(obj/item/our_plant, mob/living/carbon/user)
+ if(prob(50))
+ return
+
+ to_chat(user, span_danger("[our_plant] slips out of your hand!"))
+
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ var/datum/plant_gene/trait/squash/squash_gene = our_seed.get_gene(/datum/plant_gene/trait/squash)
+ squash_gene.squash_plant(our_plant, user)
+*/
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index ed58e86e16d..4f2b2420ee5 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -44,8 +44,8 @@
dried_type = src.type
if(seed)
- for(var/datum/plant_gene/trait/T in seed.genes)
- T.on_new(src, loc)
+ for(var/datum/plant_gene/trait/trait in seed.genes)
+ trait.on_new_plant(src, loc)
seed.prepare_result(src)
transform *= TRANSFORM_USING_VARIABLE(seed.potency, 100) + 0.5 //Makes the resulting produce's sprite larger or smaller based on potency!
add_juice()
@@ -110,15 +110,13 @@
user.visible_message("[user] starts splitting \the [src].", "You dig into \the [src] and start to split it...", "You hear the sound of a sharp object digging into some plant matter.")
if(do_after(user, 20, target = src))
to_chat(user, "You split apart the [src]! Sadly you put too much force and it's remains are unusable, but hey, you got your seeds!")
- seedify(src, 1, TRUE, FALSE, src, user)
- squash(user)
+ seedify(src, 1, TRUE, TRUE, src, user)
if(TOOL_WRENCH)
playsound(loc, 'sound/misc/splort.ogg', 50, TRUE, -1)
user.visible_message("[user] starts whacking \the [src].", "You start whacking \the [src]...", "You hear the sound of a plant being whacked violently.")
if(do_after(user, 17, target = src))
to_chat(user, "You smash [src]! Sadly there's nothing left of it other than the seeds and some junk.")
- seedify(src, 1, TRUE, FALSE, src, user)
- squash(user)
+ seedify(src, 1, TRUE, TRUE, src, user)
if(!slice_path)
if(O.get_sharpness())
playsound(loc, 'sound/weapons/slice.ogg', 50, TRUE, -1)
@@ -127,44 +125,11 @@
to_chat(user, "You slice apart the [src]! You went too far and the tiny remaining scraps are worthless!")
seedify(src, 1, TRUE, TRUE, src, user)
-// Various gene procs
-/obj/item/reagent_containers/food/snacks/grown/attack_self(mob/user)
- if(seed && seed.get_gene(/datum/plant_gene/trait/squash))
- squash(user)
- ..()
-
/obj/item/reagent_containers/food/snacks/grown/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(!..()) //was it caught by a mob?
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_throw_impact(src, hit_atom)
- if(seed.get_gene(/datum/plant_gene/trait/squash))
- squash(hit_atom)
-
-/obj/item/reagent_containers/food/snacks/grown/proc/squash(atom/target)
- var/turf/T = get_turf(target)
- forceMove(T)
- if(ispath(splat_type, /obj/effect/decal/cleanable/food/plant_smudge))
- if(filling_color)
- var/obj/O = new splat_type(T)
- O.color = filling_color
- O.name = "[name] smudge"
- else if(splat_type)
- new splat_type(T)
-
- if(trash)
- generate_trash(T)
-
- visible_message("[src] is squashed.","You hear a smack.")
- if(seed)
- for(var/datum/plant_gene/trait/trait in seed.genes)
- trait.on_squash(src, target)
-
- reagents.expose(T)
- for(var/A in T)
- reagents.expose(A)
-
- qdel(src)
/obj/item/reagent_containers/food/snacks/grown/On_Consume()
if(iscarbon(usr))
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 64a529f8ea9..b567f091930 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -110,12 +110,3 @@
name = "bluespace banana peel"
desc = "A peel from a bluespace banana."
icon_state = "bluenana_peel"
-
-// Other
-/obj/item/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes
- name = "synthesized banana peel"
- desc = "A synthetic banana peel."
-
-/obj/item/grown/bananapeel/specialpeel/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/slippery, 40)
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index bbb1379bcc7..bb504941565 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -98,7 +98,7 @@
if(held_mob.is_holding(src))
if(istype(held_mob) && held_mob.gloves)
return
- held_mob.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT)
+ held_mob.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT)
if(prob(10))
to_chat(held_mob, "Your hand holding [src] burns!")
else
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 820ecae005d..9459a1f7a81 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -144,6 +144,7 @@
species = "sunflower"
plantname = "Sunflowers"
product = /obj/item/grown/sunflower
+ genes = list(/datum/plant_gene/trait/attack/sunflower_attack)
endurance = 20
production = 2
yield = 2
@@ -169,10 +170,6 @@
throw_speed = 1
throw_range = 3
-/obj/item/grown/sunflower/attack(mob/M, mob/user)
- to_chat(M, "[user] smacks you with a sunflower!FLOWER POWER!")
- to_chat(user, "Your sunflower's FLOWER POWER strikes [M]!")
-
// Moonflower
/obj/item/seeds/sunflower/moonflower
name = "pack of moonflower seeds"
@@ -211,11 +208,18 @@
icon_grow = "novaflower-grow"
icon_dead = "sunflower-dead"
product = /obj/item/grown/novaflower
+ genes = list(/datum/plant_gene/trait/backfire/novaflower_heat, /datum/plant_gene/trait/attack/novaflower_attack)
mutatelist = list()
reagents_add = list(/datum/reagent/consumable/condensedcapsaicin = 0.25, /datum/reagent/consumable/capsaicin = 0.3, /datum/reagent/consumable/nutriment = 0)
rarity = 20
research = PLANT_RESEARCH_TIER_3
+/obj/item/seeds/sunflower/novaflower/Initialize(mapload,nogenes)
+ . = ..()
+ if(!nogenes)
+ unset_mutability(/datum/plant_gene/trait/attack/novaflower_attack, PLANT_GENE_REMOVABLE)
+ unset_mutability(/datum/plant_gene/trait/backfire/novaflower_heat, PLANT_GENE_REMOVABLE)
+
/obj/item/grown/novaflower
seed = /obj/item/seeds/sunflower/novaflower
name = "novaflower"
@@ -232,33 +236,3 @@
throw_range = 3
attack_verb = list("roasted", "scorched", "burned")
grind_results = list(/datum/reagent/consumable/capsaicin = 0, /datum/reagent/consumable/condensedcapsaicin = 0)
-
-/obj/item/grown/novaflower/add_juice()
- ..()
- force = round((5 + seed.potency / 5), 1)
-
-/obj/item/grown/novaflower/attack(mob/living/carbon/M, mob/user)
- if(!..())
- return
- if(isliving(M))
- to_chat(M, "You are lit on fire from the intense heat of the [name]!")
- M.adjust_fire_stacks(seed.potency / 20)
- if(M.IgniteMob())
- message_admins("[ADMIN_LOOKUPFLW(user)] set [ADMIN_LOOKUPFLW(M)] on fire with [src] at [AREACOORD(user)]")
- log_game("[key_name(user)] set [key_name(M)] on fire with [src] at [AREACOORD(user)]")
-
-/obj/item/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity)
- . = ..()
- if(!proximity)
- return
- if(force > 0)
- force -= rand(1, (force / 3) + 1)
- else
- to_chat(usr, "All the petals have fallen off the [name] from violent whacking!")
- qdel(src)
-
-/obj/item/grown/novaflower/pickup(mob/living/carbon/human/user)
- ..()
- if(!user.gloves)
- to_chat(user, "The [name] burns your bare hand!")
- user.adjustFireLoss(rand(1, 5))
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index 73a322ce81a..be34ef0ec42 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -163,7 +163,7 @@
name = "gatfruit"
desc = "It smells like burning."
icon_state = "gatfruit"
- trash = /obj/item/gun/ballistic/revolver/syndicate
+ trash = /obj/item/gun/ballistic/revolver/viper
bitesize_mod = 2
foodtype = FRUIT
tastes = list("gunpowder" = 1)
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 17d43d0a31c..c3488c43f78 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -220,7 +220,7 @@
endurance = 8
yield = 4
growthstages = 2
- genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/liquidelectricity, /datum/plant_gene/trait/plant_type/carnivory)
+ genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/liquidelectricity, /datum/plant_gene/trait/carnivory)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
research = PLANT_RESEARCH_TIER_3
@@ -229,7 +229,7 @@
. = ..()
if(!nogenes)
unset_mutability(/datum/plant_gene/reagent/liquidelectricity, PLANT_GENE_EXTRACTABLE)
- unset_mutability(/datum/plant_gene/trait/plant_type/carnivory, PLANT_GENE_REMOVABLE)
+ unset_mutability(/datum/plant_gene/trait/carnivory, PLANT_GENE_REMOVABLE)
/obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup
seed = /obj/item/seeds/chanter/jupitercup
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 277245138a5..3fa14561b8d 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -9,10 +9,16 @@
endurance = 40 // tuff like a toiger
yield = 4
growthstages = 5
- genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy)
+ genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/attack/nettle_attack, /datum/plant_gene/trait/backfire/nettle_burn)
mutatelist = list(/obj/item/seeds/nettle/death)
reagents_add = list(/datum/reagent/toxin/acid = 0.5)
+/obj/item/seeds/nettle/Initialize(mapload,nogenes)
+ . = ..()
+ if(!nogenes)
+ unset_mutability(/datum/plant_gene/trait/attack/nettle_attack, PLANT_GENE_REMOVABLE)
+ unset_mutability(/datum/plant_gene/trait/backfire/nettle_burn, PLANT_GENE_REMOVABLE)
+
/obj/item/seeds/nettle/death
name = "pack of death-nettle seeds"
desc = "These seeds grow into death-nettles."
@@ -23,17 +29,23 @@
endurance = 25
maturation = 8
yield = 2
- genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/stinging)
+ genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/stinging, /datum/plant_gene/trait/attack/nettle_attack/death, /datum/plant_gene/trait/backfire/nettle_burn/death)
mutatelist = list()
reagents_add = list(/datum/reagent/toxin/acid/fluacid = 0.5, /datum/reagent/toxin/acid = 0.5)
rarity = 20
research = PLANT_RESEARCH_TIER_3
+/obj/item/seeds/nettle/death/Initialize(mapload,nogenes)
+ . = ..()
+ if(!nogenes)
+ unset_mutability(/datum/plant_gene/trait/attack/nettle_attack/death, PLANT_GENE_REMOVABLE)
+ unset_mutability(/datum/plant_gene/trait/backfire/nettle_burn/death, PLANT_GENE_REMOVABLE)
+
/obj/item/reagent_containers/food/snacks/grown/nettle // "snack"
seed = /obj/item/seeds/nettle
name = "nettle"
desc = "It's probably not wise to touch it with bare hands..."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "nettle"
lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi'
@@ -48,40 +60,6 @@
wine_power = 20
wine_flavor = "tingling itchiness" //WS edit: new wine flavors
-/obj/item/reagent_containers/food/snacks/grown/nettle/pickup(mob/living/user)
- ..()
- if(!iscarbon(user))
- return FALSE
- var/mob/living/carbon/C = user
- if(C.gloves)
- return FALSE
- if(HAS_TRAIT(C, TRAIT_PIERCEIMMUNE))
- return FALSE
- var/hit_zone = (C.held_index_to_dir(C.active_hand_index) == "l" ? "l_":"r_") + "arm"
- var/obj/item/bodypart/affecting = C.get_bodypart(hit_zone)
- if(affecting)
- if(affecting.receive_damage(0, force))
- C.update_damage_overlays()
- to_chat(C, "The nettle burns your bare hand!")
- return TRUE
-
-/obj/item/reagent_containers/food/snacks/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity)
- . = ..()
- if(!proximity)
- return
- if(force > 0)
- force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off
- else
- to_chat(usr, "All the leaves have fallen off the nettle from violent whacking.")
- qdel(src)
-
-/obj/item/reagent_containers/food/snacks/grown/nettle/basic
- seed = /obj/item/seeds/nettle
-
-/obj/item/reagent_containers/food/snacks/grown/nettle/basic/add_juice()
- ..()
- force = round((5 + seed.potency / 5), 1)
-
/obj/item/reagent_containers/food/snacks/grown/nettle/death
seed = /obj/item/seeds/nettle/death
name = "deathnettle"
@@ -91,26 +69,3 @@
throwforce = 15
wine_power = 50
wine_flavor = "burning rage" //WS edit: new wine flavors
-
-/obj/item/reagent_containers/food/snacks/grown/nettle/death/add_juice()
- ..()
- force = round((5 + seed.potency / 2.5), 1)
-
-/obj/item/reagent_containers/food/snacks/grown/nettle/death/pickup(mob/living/carbon/user)
- if(..())
- if(prob(50))
- user.Paralyze(100)
- to_chat(user, "You are stunned by [src] as you try picking it up!")
-
-/obj/item/reagent_containers/food/snacks/grown/nettle/death/attack(mob/living/carbon/M, mob/user)
- if(!..())
- return
- if(isliving(M))
- to_chat(M, "You are stunned by the powerful acid of [src]!")
- log_combat(user, M, "attacked", src)
-
- M.adjust_blurriness(force/7)
- if(prob(20))
- M.Unconscious(force / 0.3)
- M.Paralyze(force / 0.75)
- M.drop_all_held_items()
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index 703df831552..44a987dc86a 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -29,25 +29,6 @@
juice_results = list(/datum/reagent/consumable/potato_juice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/vodka
-/obj/item/reagent_containers/food/snacks/grown/potato/wedges
- name = "potato wedges"
- desc = "Slices of neatly cut potato."
- icon_state = "potato_wedges"
- filling_color = "#E9967A"
- bitesize = 100
-
-
-/obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params)
- if(W.get_sharpness())
- to_chat(user, "You cut the potato into wedges with [W].")
- var/obj/item/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/reagent_containers/food/snacks/grown/potato/wedges
- remove_item_from_storage(user)
- qdel(src)
- user.put_in_hands(Wedges)
- else
- return ..()
-
-
// Sweet Potato
/obj/item/seeds/potato/sweet
name = "pack of sweet potato seeds"
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index 97773e39f27..d3f847d7e29 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -28,7 +28,7 @@
/obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
if(I.get_sharpness())
to_chat(user, "You sharpen the carrot into a shiv with [I].")
- var/obj/item/kitchen/knife/shiv/carrot/Shiv = new /obj/item/kitchen/knife/shiv/carrot
+ var/obj/item/melee/knife/shiv/carrot/Shiv = new /obj/item/melee/knife/shiv/carrot
remove_item_from_storage(user)
qdel(src)
user.put_in_hands(Shiv)
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index f97596c348f..8ab59cc6f65 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -7,6 +7,7 @@
icon = 'icons/obj/hydroponics/harvest.dmi'
resistance_flags = FLAMMABLE
var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
+ var/auto_scatter = TRUE
/obj/item/grown/Initialize(newloc, obj/item/seeds/new_seed)
. = ..()
@@ -18,13 +19,14 @@
// This is for adminspawn or map-placed growns. They get the default stats of their seed type.
seed = new seed()
seed.adjust_potency(50-seed.potency)
-
- pixel_x = base_pixel_x + rand(-5, 5)
- pixel_y = base_pixel_y + rand(-5, 5)
+ if(auto_scatter)
+ pixel_x = base_pixel_x + rand(-5, 5)
+ pixel_y = base_pixel_y + rand(-5, 5)
if(seed)
- for(var/datum/plant_gene/trait/T in seed.genes)
- T.on_new(src, newloc)
+ // Go through all traits in their genes and call on_new_plant from them.
+ for(var/datum/plant_gene/trait/trait in seed.genes)
+ trait.on_new_plant(src, newloc)
if(istype(src, seed.product)) // no adding reagents if it is just a trash item
seed.prepare_result(src)
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 74d004849a2..5f0e38920cc 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -7,7 +7,7 @@
item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_BELT
custom_materials = list(/datum/material/iron=30, /datum/material/glass=20)
var/scan_mode = PLANT_SCANMODE_STATS
@@ -59,7 +59,7 @@
/obj/item/cultivator
name = "cultivator"
desc = "It's used for removing weeds or scratching your back."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "cultivator"
item_state = "cultivator"
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
@@ -106,7 +106,7 @@
/obj/item/hatchet
name = "hatchet"
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/weapon/axe.dmi'
icon_state = "hatchet"
item_state = "hatchet"
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
@@ -179,11 +179,13 @@
volume = 50
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,15,25,50)
+ var/auto_scatter = TRUE
/obj/item/reagent_containers/glass/bottle/nutrient/Initialize()
. = ..()
- pixel_x = base_pixel_x + rand(-5, 5)
- pixel_y = base_pixel_y + rand(-5, 5)
+ if(auto_scatter)
+ pixel_x = base_pixel_x + rand(-5, 5)
+ pixel_y = base_pixel_y + rand(-5, 5)
/obj/item/reagent_containers/glass/bottle/nutrient/ez
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index bbfeaeeb5b5..13faaf5f15a 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -194,7 +194,7 @@
//Pests & Weeds//////////////////////////////////////////////////////////
if(pestlevel >= 8)
- if(!myseed.get_gene(/datum/plant_gene/trait/plant_type/carnivory))
+ if(!myseed.get_gene(/datum/plant_gene/trait/carnivory))
adjustHealth(-2 / rating)
else
@@ -202,7 +202,7 @@
adjustPests(-1 / rating)
else if(pestlevel >= 4)
- if(!myseed.get_gene(/datum/plant_gene/trait/plant_type/carnivory))
+ if(!myseed.get_gene(/datum/plant_gene/trait/carnivory))
adjustHealth(-1 / rating)
else
@@ -210,7 +210,7 @@
if(prob(50))
adjustPests(-1 / rating)
- else if(pestlevel < 4 && myseed.get_gene(/datum/plant_gene/trait/plant_type/carnivory))
+ else if(pestlevel < 4 && myseed.get_gene(/datum/plant_gene/trait/carnivory))
adjustHealth(-2 / rating)
if(prob(5))
adjustPests(-1 / rating)
@@ -269,10 +269,7 @@
update_appearance()
if(myseed && prob(5 * (11-myseed.production)))
- for(var/g in myseed.genes)
- if(istype(g, /datum/plant_gene/trait))
- var/datum/plant_gene/trait/selectedtrait = g
- selectedtrait.on_grow(src)
+ SEND_SIGNAL(myseed, COMSIG_SEED_ON_GROW, src)
return
/obj/machinery/hydroponics/update_appearance(updates)
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index a57934dc551..d34490d2bd2 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -1,6 +1,8 @@
/datum/plant_gene
var/name
var/mutability_flags = PLANT_GENE_EXTRACTABLE | PLANT_GENE_REMOVABLE ///These flags tells the genemodder if we want the gene to be extractable, only removable or neither.
+ /// The font awesome icon name representing the gene in the seed extractor UI (Once i port that -Fallcon)
+ var/icon = "dna"
/datum/plant_gene/proc/get_name() // Used for manipulator display and gene disk name.
var/formatted_name
@@ -14,16 +16,39 @@
formatted_name += name
return formatted_name
-/datum/plant_gene/proc/can_add(obj/item/seeds/S)
- return !istype(S, /obj/item/seeds/sample) // Samples can't accept new genes
+/*
+ * Check if the seed can accept this plant gene.
+ *
+ * our_seed - the seed we're adding the gene to
+ *
+ * Returns TRUE if the seed can take the gene, and FALSE otherwise.
+ */
+/datum/plant_gene/proc/can_add(obj/item/seeds/our_seed)
+ SHOULD_CALL_PARENT(TRUE)
+ return TRUE
+/// Copies over vars and information about our current gene to a new gene and returns the new instance of gene.
/datum/plant_gene/proc/Copy()
- var/datum/plant_gene/G = new type
- G.mutability_flags = mutability_flags
- return G
-
-/datum/plant_gene/proc/apply_vars(obj/item/seeds/S) // currently used for fire resist, can prob. be further refactored
- return
+ var/datum/plant_gene/new_gene = new type
+ new_gene.mutability_flags = mutability_flags
+ return new_gene
+
+/*
+ * on_new_seed is called when seed genes are initialized on the /obj/seed.
+ *
+ * new_seed - the seed being created
+ */
+/datum/plant_gene/proc/on_new_seed(obj/item/seeds/new_seed)
+ return // Not implemented
+
+/*
+ * on_removed is called when the gene is removed from a seed.
+ * Also called when a seed is qdel'd (and all the genes are removed and deleted).
+ *
+ * old_seed - our seed, before being removed
+ */
+/datum/plant_gene/proc/on_removed(obj/item/seeds/old_seed)
+ return // Not implemented
// Core plant genes store 5 main variables: lifespan, endurance, production, yield, potency
/datum/plant_gene/core
@@ -171,28 +196,70 @@
// Various traits affecting the product.
/datum/plant_gene/trait
+ /// The rate at which this trait affects something. This can be anything really - why? I dunno.
var/rate = 0.05
var/examine_line = ""
- var/trait_id // must be set and equal for any two traits of the same type
+ /// Bonus lines displayed on examine.
+ var/description = ""
+ /// Flag - Traits that share an ID cannot be placed on the same plant.
+ var/trait_ids
+ /// Flag - Modifications made to the final product.
+ var/trait_flags
+ /// A blacklist of seeds that a trait cannot be attached to.
+ var/list/obj/item/seeds/seed_blacklist
/datum/plant_gene/trait/Copy()
var/datum/plant_gene/trait/G = ..()
G.rate = rate
return G
-/datum/plant_gene/trait/can_add(obj/item/seeds/S)
+/datum/plant_gene/trait/can_add(obj/item/seeds/source_seed)
if(!..())
return FALSE
- for(var/datum/plant_gene/trait/R in S.genes)
- if(trait_id && R.trait_id == trait_id)
+ for(var/obj/item/seeds/found_seed as anything in seed_blacklist)
+ if(istype(source_seed, found_seed))
return FALSE
- if(type == R.type)
+
+ for(var/datum/plant_gene/trait/trait in source_seed.genes)
+ if(trait_ids & trait.trait_ids)
+ return FALSE
+ if(type == trait.type)
return FALSE
+
return TRUE
-/datum/plant_gene/trait/proc/on_new(obj/item/reagent_containers/food/snacks/grown/G, newloc)
- return
+/*
+ * on_new_plant is called for every plant trait on an /obj/item/grown or /obj/item/reagent_containers/food/snacks/grown when initialized.
+ *
+ * our_plant - the source plant being created
+ * newloc - the loc of the plant
+ */
+/datum/plant_gene/trait/proc/on_new_plant(obj/item/reagent_containers/food/snacks/grown/our_plant, newloc)
+ // Plants should always have seeds, but if a plant gene is somehow being instantiated on a plant with no seed, stop initializing genes
+ // (Plants hold their genes on their seeds, so we can't really add them to something that doesn't exist)
+ if(isnull(our_plant.get_plant_seed()))
+ stack_trace("[our_plant] ([our_plant.type]) has a nulled seed value while trying to initialize [src]!")
+ return FALSE
+
+ // Add on any bonus lines on examine
+ if(description)
+ RegisterSignal(our_plant, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
+ return TRUE
+
+/*
+ * on_new_seed is called when seed genes are initialized on the /obj/seed.
+ *
+ * new_seed - the seed being created
+ */
+/datum/plant_gene/trait/on_new_seed(obj/item/seeds/new_seed)
+ return TRUE
+
+/// Add on any unique examine text to the plant's examine text.
+/datum/plant_gene/trait/proc/examine(obj/item/reagent_containers/food/snacks/grown/our_plant, mob/examiner, list/examine_list)
+ SIGNAL_HANDLER
+
+ examine_list += span_info("[description]")
/datum/plant_gene/trait/proc/on_consume(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
return
@@ -213,84 +280,173 @@
/datum/plant_gene/trait/proc/on_grow(obj/machinery/hydroponics/H)
return
+/// Allows the plant to be squashed when thrown or slipped on, leaving a colored mess and trash type item behind.
/datum/plant_gene/trait/squash
- // Allows the plant to be squashed when thrown or slipped on, leaving a colored mess and trash type item behind.
- // Also splashes everything in target turf with reagents and applies other trait effects (teleporting, etc) to the target by on_squash.
- // For code, see grown.dm
name = "Liquid Contents"
- examine_line = "It has a lot of liquid contents inside."
+ icon = "droplet"
+ description = "It may burst open from the internal pressure on impact."
+ trait_ids = THROW_IMPACT_ID | REAGENT_TRANSFER_ID | ATTACK_SELF_ID
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
+
+// Register a signal that our plant can be squashed on add.
+/datum/plant_gene/trait/squash/on_new_plant(obj/item/reagent_containers/food/snacks/grown/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+
+ RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(squash_plant))
+ RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(squash_plant))
+ RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, PROC_REF(squash_plant))
+
+/*
+ * Signal proc to squash the plant this trait belongs to, causing a smudge, exposing the target to reagents, and deleting it,
+ *
+ * Arguments
+ * our_plant - the plant this trait belongs to.
+ * target - the atom being hit by this squashed plant.
+ */
+/datum/plant_gene/trait/squash/proc/squash_plant(obj/item/reagent_containers/food/snacks/grown/our_plant, atom/target)
+ SIGNAL_HANDLER
+
+ var/turf/our_turf = get_turf(target)
+ our_plant.forceMove(our_turf)
+ if(istype(our_plant))
+ if(ispath(our_plant.splat_type, /obj/effect/decal/cleanable/food/plant_smudge))
+ var/obj/plant_smudge = new our_plant.splat_type(our_turf)
+ plant_smudge.name = "[our_plant.name] smudge"
+ if(our_plant.filling_color)
+ plant_smudge.color = our_plant.filling_color
+ else if(our_plant.splat_type)
+ new our_plant.splat_type(our_turf)
+ else
+ var/obj/effect/decal/cleanable/food/plant_smudge/misc_smudge = new(our_turf)
+ misc_smudge.name = "[our_plant.name] smudge"
+ misc_smudge.color = "#82b900"
-/datum/plant_gene/trait/squash/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
- // Squash the plant on slip.
- G.squash(C)
+ our_plant.visible_message(span_warning("[our_plant] is squashed."),span_hear("You hear a smack."))
+ SEND_SIGNAL(our_plant, COMSIG_PLANT_ON_SQUASH, target)
+ our_plant.reagents?.expose(our_turf)
+ for(var/things in our_turf)
+ our_plant.reagents?.expose(things)
+
+ qdel(our_plant)
+
+/*
+ * Makes plant slippery, unless it has a grown-type trash. Then the trash gets slippery.
+ * Applies other trait effects (teleporting, etc) to the target by signal.
+ */
/datum/plant_gene/trait/slip
- // Makes plant slippery, unless it has a grown-type trash. Then the trash gets slippery.
- // Applies other trait effects (teleporting, etc) to the target by on_slip.
name = "Slippery Skin"
+ description = "Watch your step around this."
+ icon = "person-falling"
rate = 1.6
- examine_line = "It has a very slippery skin."
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
-/datum/plant_gene/trait/slip/on_new(obj/item/reagent_containers/food/snacks/grown/G, newloc)
- ..()
- if(istype(G) && ispath(G.trash, /obj/item/grown))
+/datum/plant_gene/trait/slip/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+
+ var/obj/item/reagent_containers/food/snacks/grown/grown_plant = our_plant
+ if(istype(grown_plant) && ispath(grown_plant.trash, /obj/item/grown))
return
- var/obj/item/seeds/seed = G.seed
- var/stun_len = seed.potency * rate
- if(!istype(G, /obj/item/grown/bananapeel) && (!G.reagents || !G.reagents.has_reagent(/datum/reagent/lube)))
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ var/stun_len = our_seed.potency * rate
+
+ if(!istype(our_plant, /obj/item/grown/bananapeel) && (!our_plant.reagents || !our_plant.reagents.has_reagent(/datum/reagent/lube)))
stun_len /= 3
- G.AddComponent(/datum/component/slippery, min(stun_len,140), NONE, CALLBACK(src, PROC_REF(handle_slip), G))
+ our_plant.AddComponent(/datum/component/slippery, min(stun_len, 140), NONE, CALLBACK(src, PROC_REF(handle_slip), our_plant))
+
+/// On slip, sends a signal that our plant was slipped on out.
+/datum/plant_gene/trait/slip/proc/handle_slip(obj/item/reagent_containers/food/snacks/grown/our_plant, mob/slipped_target)
+ SEND_SIGNAL(our_plant, COMSIG_PLANT_ON_SLIP, slipped_target)
-/datum/plant_gene/trait/slip/proc/handle_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/M)
- for(var/datum/plant_gene/trait/T in G.seed.genes)
- T.on_slip(G, M)
+/*
+ * Cell recharging trait. Charges all mob's power cells to (potency*rate)% mark when eaten.
+ * Generates sparks on squash.
+ * Small (potency * rate) chance to shock squish or slip target for (potency * rate) damage.
+ * Also affects plant batteries see capatative cell production datum
+ */
/datum/plant_gene/trait/cell_charge
- // Cell recharging trait. Charges all mob's power cells to (potency*rate)% mark when eaten.
- // Generates sparks on squash.
- // Small (potency*rate*5) chance to shock squish or slip target for (potency*rate*5) damage.
- // Also affects plant batteries see capatative cell production datum
name = "Electrical Activity"
+ description = "It can electrocute on interaction or recharge batteries when eaten."
+ icon = "bolt"
rate = 0.2
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
-/datum/plant_gene/trait/cell_charge/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
- var/power = G.seed.potency*rate
- if(prob(power))
- C.electrocute_act(round(power), G, 1, SHOCK_NOGLOVES)
-
-/datum/plant_gene/trait/cell_charge/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
- if(iscarbon(target))
- var/mob/living/carbon/C = target
- var/power = G.seed.potency*rate
- if(prob(power))
- C.electrocute_act(round(power), G, 1, SHOCK_NOGLOVES)
-
-/datum/plant_gene/trait/cell_charge/on_consume(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
- if(!G.reagents.total_volume)
- var/batteries_recharged = 0
- for(var/obj/item/stock_parts/cell/C in target.GetAllContents())
- var/newcharge = min(G.seed.potency*0.01*C.maxcharge, C.maxcharge)
- if(C.charge < newcharge)
- C.charge = newcharge
- if(isobj(C.loc))
- var/obj/O = C.loc
- O.update_appearance() //update power meters and such
- C.update_appearance()
- batteries_recharged = 1
- if(batteries_recharged)
- to_chat(target, "Your batteries are recharged!")
+/datum/plant_gene/trait/cell_charge/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ if(our_seed.get_gene(/datum/plant_gene/trait/squash))
+ // If we have the squash gene, let that handle slipping
+ RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, PROC_REF(zap_target))
+ else
+ RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(zap_target))
+ RegisterSignal(our_plant, COMSIG_FOOD_EATEN, PROC_REF(recharge_cells))
+/*
+ * Zaps the target with a stunning shock.
+ *
+ * our_plant - our source plant, shocking the target
+ * target - the atom being zapped by our plant
+ */
+/datum/plant_gene/trait/cell_charge/proc/zap_target(obj/item/our_plant, atom/target)
+ SIGNAL_HANDLER
+ if(!iscarbon(target))
+ return
+
+ our_plant.investigate_log("zapped [key_name(target)] at [AREACOORD(target)]. Last touched by: [our_plant.fingerprintslast].", INVESTIGATE_BOTANY)
+ var/mob/living/carbon/target_carbon = target
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ var/power = our_seed.potency * rate
+ if(prob(power))
+ target_carbon.electrocute_act(round(power), our_plant, 1, SHOCK_NOGLOVES)
+
+/*
+ * Recharges every cell the person is holding for a bit based on plant potency.
+ *
+ * our_plant - our source plant, that we consumed to charge the cells
+ * eater - the mob that bit the plant
+ * feeder - the mob that feed the eater the plant
+ */
+/datum/plant_gene/trait/cell_charge/proc/recharge_cells(obj/item/our_plant, mob/living/carbon/eater, mob/feeder)
+ SIGNAL_HANDLER
+
+ to_chat(eater, span_notice("You feel energized as you bite into [our_plant]."))
+ var/batteries_recharged = FALSE
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ for(var/obj/item/stock_parts/cell/found_cell in eater.get_contents())
+ var/newcharge = min(our_seed.potency * 0.01 * found_cell.maxcharge, found_cell.maxcharge)
+ if(found_cell.charge < newcharge)
+ found_cell.charge = newcharge
+ if(isobj(found_cell.loc))
+ var/obj/cell_location = found_cell.loc
+ cell_location.update_appearance() //update power meters and such
+ found_cell.update_appearance()
+ batteries_recharged = TRUE
+ if(batteries_recharged)
+ to_chat(eater, span_notice("Your batteries are recharged!"))
+
+/*
+ * Makes the plant glow. Makes the plant in tray glow, too.
+ * Adds (1.4 + potency * rate) light range and (potency * (rate + 0.01)) light_power to products.
+ */
/datum/plant_gene/trait/glow
- // Makes plant glow. Makes plant in tray glow too.
- // Adds 1 + potency*rate light range and potency*(rate + 0.01) light_power to products.
name = "Bioluminescence"
+ icon = "lightbulb"
rate = 0.03
- examine_line = "It emits a soft glow."
- trait_id = "glow"
+ description = "It emits a soft glow."
+ trait_ids = GLOW_ID
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
var/glow_color = "#C3E381"
/datum/plant_gene/trait/glow/proc/glow_range(obj/item/seeds/S)
@@ -299,15 +455,18 @@
/datum/plant_gene/trait/glow/proc/glow_power(obj/item/seeds/S)
return max(S.potency*(rate + 0.01), 0.1)
-/datum/plant_gene/trait/glow/on_new(obj/item/reagent_containers/food/snacks/grown/G, newloc)
+/datum/plant_gene/trait/glow/on_new_plant(obj/item/reagent_containers/food/snacks/grown/G, newloc)
. = ..()
G.light_system = MOVABLE_LIGHT
G.AddComponent(/datum/component/overlay_lighting, glow_range(G.seed), glow_power(G.seed), glow_color)
+/*
+ * Makes plant emit darkness. (Purple-ish shadows)
+ * Adds - (potency * (rate * 0.2)) light power to products.
+ */
/datum/plant_gene/trait/glow/shadow
- //makes plant emit slightly purple shadows
- //adds -potency*(rate*0.2) light power to products
name = "Shadow Emission"
+ icon = "lightbulb-o"
rate = 0.04
glow_color = "#AAD84B"
@@ -348,157 +507,359 @@
name = "Pink Bioluminescence"
glow_color = "#FFB3DA"
-
-
+/*
+ * Makes plant teleport people when squashed or slipped on.
+ * Teleport radius is roughly potency / 10.
+ */
/datum/plant_gene/trait/teleport
- // Makes plant teleport people when squashed or slipped on.
- // Teleport radius is calculated as max(round(potency*rate), 1)
name = "Bluespace Activity"
+ description = "It causes people to teleport on interaction."
+ icon = "right-left"
rate = 0.1
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
-/datum/plant_gene/trait/teleport/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
- if(isliving(target))
- var/teleport_radius = max(round(G.seed.potency / 10), 1)
- var/turf/T = get_turf(target)
- new /obj/effect/decal/cleanable/molten_object(T) //Leave a pile of goo behind for dramatic effect...
- do_teleport(target, T, teleport_radius, channel = TELEPORT_CHANNEL_BLUESPACE)
+/datum/plant_gene/trait/teleport/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ if(our_seed.get_gene(/datum/plant_gene/trait/squash))
+ // If we have the squash gene, let that handle slipping
+ RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, PROC_REF(squash_teleport))
+ else
+ RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(slip_teleport))
+
+/*
+ * When squashed, makes the target teleport.
+ *
+ * our_plant - our plant, being squashed, and teleporting the target
+ * target - the atom targeted by the squash
+ */
+/datum/plant_gene/trait/teleport/proc/squash_teleport(obj/item/our_plant, atom/target)
+ SIGNAL_HANDLER
+
+ if(!isliving(target))
+ return
-/datum/plant_gene/trait/teleport/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
- var/teleport_radius = max(round(G.seed.potency / 10), 1)
- var/turf/T = get_turf(C)
- to_chat(C, "You slip through spacetime!")
- do_teleport(C, T, teleport_radius, channel = TELEPORT_CHANNEL_BLUESPACE)
+ our_plant.investigate_log("squash-teleported [key_name(target)] at [AREACOORD(target)]. Last touched by: [our_plant.fingerprintslast].", INVESTIGATE_BOTANY)
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ var/teleport_radius = max(round(our_seed.potency / 10), 1)
+ var/turf/T = get_turf(target)
+ new /obj/effect/decal/cleanable/molten_object(T) //Leave a pile of goo behind for dramatic effect...
+ do_teleport(target, T, teleport_radius, channel = TELEPORT_CHANNEL_BLUESPACE)
+
+/*
+ * When slipped on, makes the target teleport and either teleport the source again or delete it.
+ *
+ * our_plant - our plant being slipped on
+ * target - the carbon targeted that was slipped and was teleported
+ */
+/datum/plant_gene/trait/teleport/proc/slip_teleport(obj/item/our_plant, mob/living/carbon/target)
+ SIGNAL_HANDLER
+
+ our_plant.investigate_log("slip-teleported [key_name(target)] at [AREACOORD(target)]. Last touched by: [our_plant.fingerprintslast].", INVESTIGATE_BOTANY)
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ var/teleport_radius = max(round(our_seed.potency / 10), 1)
+ var/turf/T = get_turf(target)
+ to_chat(target, span_warning("You slip through spacetime!"))
+ do_teleport(target, T, teleport_radius, channel = TELEPORT_CHANNEL_BLUESPACE)
if(prob(50))
- do_teleport(G, T, teleport_radius, channel = TELEPORT_CHANNEL_BLUESPACE)
+ do_teleport(our_plant, T, teleport_radius, channel = TELEPORT_CHANNEL_BLUESPACE)
else
new /obj/effect/decal/cleanable/molten_object(T) //Leave a pile of goo behind for dramatic effect...
- qdel(G)
-
+ qdel(our_plant)
+/**
+ * A plant trait that causes the plant's capacity to double.
+ *
+ * When harvested, the plant's individual capacity is set to double it's default.
+ */
/datum/plant_gene/trait/maxchem
- // 2x to max reagents volume.
name = "Densified Chemicals"
+ description = "The reagent volume is doubled."
+ icon = "flask-vial"
rate = 2
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
-/datum/plant_gene/trait/maxchem/on_new(obj/item/reagent_containers/food/snacks/grown/G, newloc)
- ..()
- G.reagents.maximum_volume *= rate
+/datum/plant_gene/trait/maxchem/on_new_plant(obj/item/reagent_containers/food/snacks/grown/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+ our_plant.reagents?.maximum_volume *= rate
+
+/// Allows a plant to be harvested multiple times.
/datum/plant_gene/trait/repeated_harvest
name = "Perennial Growth"
-
-/datum/plant_gene/trait/repeated_harvest/can_add(obj/item/seeds/S)
- if(!..())
- return FALSE
- if(istype(S, /obj/item/seeds/replicapod))
- return FALSE
- return TRUE
-
+ description = "It may be harvested multiple times from the same plant."
+ icon = "cubes-stacked"
+ /// Don't allow replica pods to be multi harvested, please.
+ seed_blacklist = list(
+ /obj/item/seeds/replicapod,
+ )
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
+
+/*
+ * Allows a plant to be turned into a battery when cabling is applied.
+ * 100 potency plants are made into 2 mj batteries.
+ * Plants with electrical activity has their capacities massively increased (up to 40 mj at 100 potency)
+ */
/datum/plant_gene/trait/battery
name = "Capacitive Cell Production"
+ description = "It can work like a power cell when wired properly."
+ icon = "car-battery"
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
+ /// The number of cables needed to make a battery.
+ var/cables_needed_per_battery = 5
-/datum/plant_gene/trait/battery/on_attackby(obj/item/reagent_containers/food/snacks/grown/G, obj/item/I, mob/user)
- if(istype(I, /obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/C = I
- if(C.use(5))
- to_chat(user, "You add some cable to [G] and slide it inside the battery encasing.")
- var/obj/item/stock_parts/cell/potato/pocell = new /obj/item/stock_parts/cell/potato(user.loc)
- pocell.icon_state = G.icon_state
- pocell.maxcharge = G.seed.potency * 20
-
- // The secret of potato supercells!
- var/datum/plant_gene/trait/cell_charge/CG = G.seed.get_gene(/datum/plant_gene/trait/cell_charge)
- if(CG) // Cell charge max is now 40MJ or otherwise known as 400KJ (Same as bluespace powercells)
- pocell.maxcharge *= CG.rate*100
- pocell.charge = pocell.maxcharge
- pocell.name = "[G.name] battery"
- pocell.desc = "A rechargeable plant-based power cell. This one has a rating of [DisplayEnergy(pocell.maxcharge)], and you should not swallow it."
-
- if(G.reagents.has_reagent(/datum/reagent/toxin/plasma, 2))
- pocell.rigged = TRUE
-
- qdel(G)
- else
- to_chat(user, "You need five lengths of cable to make a [G] battery!")
+/datum/plant_gene/trait/battery/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+
+ RegisterSignal(our_plant, COMSIG_PARENT_ATTACKBY, PROC_REF(make_battery))
+
+/*
+ * When a plant with this gene is hit (attackby) with cables, we turn it into a battery.
+ *
+ * our_plant - our plant being hit
+ * hit_item - the item we're hitting the plant with
+ * user - the person hitting the plant with an item
+ */
+/datum/plant_gene/trait/battery/proc/make_battery(obj/item/our_plant, obj/item/hit_item, mob/user)
+ SIGNAL_HANDLER
+
+ if(!istype(hit_item, /obj/item/stack/cable_coil))
+ return
+
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ var/obj/item/stack/cable_coil/cabling = hit_item
+ if(!cabling.use(cables_needed_per_battery))
+ to_chat(user, span_warning("You need five lengths of cable to make a [our_plant] battery!"))
+ return
+ to_chat(user, span_notice("You add some cable to [our_plant] and slide it inside the battery encasing."))
+ var/obj/item/stock_parts/cell/potato/pocell = new /obj/item/stock_parts/cell/potato(user.loc)
+ pocell.icon = our_plant.icon // Just in case the plant icons get spread out in different files eventually, this trait won't cause error sprites (also yay downstreams)
+ pocell.icon_state = our_plant.icon_state
+ pocell.maxcharge = our_seed.potency
+ // The secret of potato supercells!
+ var/datum/plant_gene/trait/cell_charge/electrical_gene = our_seed.get_gene(/datum/plant_gene/trait/cell_charge)
+ if(electrical_gene) // Cell charge max is now 40MJ or otherwise known as 400KJ (Same as bluespace power cells)
+ pocell.maxcharge *= (electrical_gene.rate * 100)
+
+ pocell.charge = pocell.maxcharge
+ pocell.name = "[our_plant.name] battery"
+ pocell.desc = "A rechargeable plant-based power cell. This one has a rating of [DisplayEnergy(pocell.maxcharge)], and you should not swallow it."
+
+ if(our_plant.reagents.has_reagent(/datum/reagent/toxin/plasma, 2))
+ pocell.rigged = TRUE
+
+ qdel(our_plant)
+
+/*
+ * Injects a number of chemicals from the plant when you throw it at someone or they slip on it.
+ * At 0 potency it can inject 1 unit of its chemicals, while at 100 potency it can inject 20 units.
+ */
/datum/plant_gene/trait/stinging
name = "Hypodermic Prickles"
+ description = "It stings, passing some reagents in the process."
+ icon = "syringe"
+ trait_ids = REAGENT_TRANSFER_ID
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
+
+/datum/plant_gene/trait/stinging/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+
+ RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(prickles_inject))
+ RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(prickles_inject))
+
+/*
+ * Injects a target with a number of reagents from our plant.
+ *
+ * our_plant - our plant that's injecting someone
+ * target - the atom being hit on thrown or slipping on our plant
+ */
+/datum/plant_gene/trait/stinging/proc/prickles_inject(obj/item/our_plant, atom/target)
+ SIGNAL_HANDLER
-/datum/plant_gene/trait/stinging/on_slip(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
- on_throw_impact(G, target)
+ if(!isliving(target) || !our_plant.reagents?.total_volume)
+ return
-/datum/plant_gene/trait/stinging/on_throw_impact(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
- if(isliving(target) && G.reagents && G.reagents.total_volume)
- var/mob/living/L = target
- if(L.reagents && L.can_inject(null, 0))
- var/injecting_amount = max(1, G.seed.potency*0.2) // Minimum of 1, max of 20
- G.reagents.trans_to(L, injecting_amount, method = INJECT)
- to_chat(target, "You are pricked by [G]!")
- log_combat(G, L, "pricked and attempted to inject reagents from [G] to [L]. Last touched by: [G.fingerprintslast].")
+ var/mob/living/living_target = target
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ if(living_target.reagents && living_target.can_inject())
+ var/injecting_amount = max(1, our_seed.potency * 0.2) // Minimum of 1, max of 20
+ our_plant.reagents.trans_to(living_target, injecting_amount, method = INJECT)
+ to_chat(target, span_danger("You are pricked by [our_plant]!"))
+ log_combat(our_plant, living_target, "pricked and attempted to inject reagents from [our_plant] to [living_target]. Last touched by: [our_plant.fingerprintslast].")
+ our_plant.investigate_log("pricked and injected [key_name(living_target)] and injected [injecting_amount] reagents at [AREACOORD(living_target)]. Last touched by: [our_plant.fingerprintslast].", INVESTIGATE_BOTANY)
+/// Explodes into reagent-filled smoke when squashed.
/datum/plant_gene/trait/smoke
name = "Gaseous Decomposition"
+ description = "It can be smashed to turn its Liquid Contents into smoke."
+ icon = "cloud"
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
-/datum/plant_gene/trait/smoke/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
- var/datum/effect_system/smoke_spread/chem/S = new
- var/splat_location = get_turf(target)
- var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1)
- S.attach(splat_location)
- S.set_up(G.reagents, smoke_amount, splat_location, 0)
- S.start()
- G.reagents.clear_reagents()
+/datum/plant_gene/trait/smoke/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+
+ RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, PROC_REF(make_smoke))
-/datum/plant_gene/trait/fire_resistance // Lavaland
+/*
+ * Makes a cloud of reagent smoke.
+ *
+ * our_plant - our plant being squashed and smoked
+ * target - the atom the plant was squashed on
+ */
+/datum/plant_gene/trait/smoke/proc/make_smoke(obj/item/reagent_containers/food/snacks/grown/our_plant, atom/target)
+ SIGNAL_HANDLER
+
+ our_plant.investigate_log("made smoke at [AREACOORD(target)]. Last touched by: [our_plant.fingerprintslast].", INVESTIGATE_BOTANY)
+ var/datum/effect_system/smoke_spread/chem/smoke = new
+ var/splat_location = get_turf(target)
+ var/smoke_amount = round(sqrt(our_plant.seed.potency * 0.1), 1)
+ smoke.attach(splat_location)
+ smoke.set_up(our_plant.reagents, smoke_amount, splat_location, 0)
+ smoke.start()
+ our_plant.reagents.clear_reagents()
+
+/// Makes the plant and its seeds fireproof. From lavaland plants.
+/datum/plant_gene/trait/fire_resistance
name = "Fire Resistance"
+ description = "Makes the seeds, plant and produce fireproof."
+ icon = "fire"
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
-/datum/plant_gene/trait/fire_resistance/apply_vars(obj/item/seeds/S)
- if(!(S.resistance_flags & FIRE_PROOF))
- S.resistance_flags |= FIRE_PROOF
+/datum/plant_gene/trait/fire_resistance/on_new_seed(obj/item/seeds/new_seed)
+ if(!(new_seed.resistance_flags & FIRE_PROOF))
+ new_seed.resistance_flags |= FIRE_PROOF
-/datum/plant_gene/trait/fire_resistance/on_new(obj/item/reagent_containers/food/snacks/grown/G, newloc)
- if(!(G.resistance_flags & FIRE_PROOF))
- G.resistance_flags |= FIRE_PROOF
+/datum/plant_gene/trait/fire_resistance/on_removed(obj/item/seeds/old_seed)
+ if(old_seed.resistance_flags & FIRE_PROOF)
+ old_seed.resistance_flags &= ~FIRE_PROOF
+
+/datum/plant_gene/trait/fire_resistance/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
-///Invasive spreading lets the plant jump to other trays, the spreadinhg plant won't replace plants of the same type.
+ if(!(our_plant.resistance_flags & FIRE_PROOF))
+ our_plant.resistance_flags |= FIRE_PROOF
+
+/// Invasive spreading lets the plant jump to other trays, and the spreading plant won't replace plants of the same type.
/datum/plant_gene/trait/invasive
name = "Invasive Spreading"
+ description = "It attempts to spread around if not contained."
+ icon = "virus"
+ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_EXTRACTABLE
+
+/datum/plant_gene/trait/invasive/on_new_seed(obj/item/seeds/new_seed)
+ RegisterSignal(new_seed, COMSIG_SEED_ON_GROW, PROC_REF(try_spread))
+
+/datum/plant_gene/trait/invasive/on_removed(obj/item/seeds/old_seed)
+ UnregisterSignal(old_seed, COMSIG_SEED_ON_GROW)
+
+/*
+ * Attempt to find an adjacent tray we can spread to.
+ *
+ * our_seed - our plant's seed, what spreads to other trays
+ * our_tray - the hydroponics tray we're currently in
+ */
+/datum/plant_gene/trait/invasive/proc/try_spread(obj/item/seeds/our_seed, obj/machinery/hydroponics/our_tray)
+ SIGNAL_HANDLER
+
+ if(prob(100 - (5 * (11 - our_seed.production))))
+ return
-/datum/plant_gene/trait/invasive/on_grow(obj/machinery/hydroponics/H)
for(var/step_dir in GLOB.alldirs)
- var/obj/machinery/hydroponics/HY = locate() in get_step(H, step_dir)
- if(HY && prob(15))
- if(HY.myseed) // check if there is something in the tray.
- if(HY.myseed.type == H.myseed.type && HY.dead != 0)
- continue //It should not destroy its owm kind.
- qdel(HY.myseed)
- HY.myseed = null
- HY.myseed = H.myseed.Copy()
- HY.age = 0
- HY.dead = 0
- HY.plant_health = HY.myseed.endurance
- HY.lastcycle = world.time
- HY.harvest = 0
- HY.weedlevel = 0 // Reset
- HY.pestlevel = 0 // Reset
- HY.update_appearance()
- HY.visible_message("The [H.myseed.plantname] spreads!")
-
-/datum/plant_gene/trait/plant_type // Parent type
+ var/obj/machinery/hydroponics/spread_tray = locate() in get_step(our_tray, step_dir)
+ if(spread_tray && prob(15))
+ if(!our_tray.Adjacent(spread_tray))
+ continue //Don't spread through things we can't go through.
+
+ spread_seed(spread_tray, our_tray)
+
+/*
+ * Actually spread the plant to the tray we found in try_spread.
+ *
+ * target_tray - the tray we're spreading to
+ * origin_tray - the tray we're currently in
+ */
+/datum/plant_gene/trait/invasive/proc/spread_seed(obj/machinery/hydroponics/target_tray, obj/machinery/hydroponics/origin_tray)
+ if(target_tray.myseed) // Check if there's another seed in the next tray.
+ if(target_tray.myseed.type == origin_tray.myseed.type && target_tray.dead != FALSE)
+ return FALSE // It should not destroy its own kind.
+ target_tray.visible_message(span_warning("The [target_tray.myseed.plantname] is overtaken by [origin_tray.myseed.plantname]!"))
+ QDEL_NULL(target_tray.myseed)
+ target_tray.myseed = origin_tray.myseed.Copy()
+ target_tray.age = 0
+ target_tray.plant_health = target_tray.myseed.endurance
+ target_tray.lastcycle = world.time
+ target_tray.weedlevel = 0
+ target_tray.pestlevel = 0
+ target_tray.visible_message(span_warning("The [origin_tray.myseed.plantname] spreads!"))
+ if(target_tray.myseed)
+ target_tray.name = "[initial(target_tray.name)] ([target_tray.myseed.plantname])"
+ else
+ target_tray.name = initial(target_tray.name)
+
+ return TRUE
+
+/// Makes the plant embed on thrown impact.
+/datum/plant_gene/trait/sticky
+ name = "Prickly Adhesion"
+ description = "It sticks to people when thrown, also passing reagents if stingy."
+ icon = "bandage"
+ trait_ids = THROW_IMPACT_ID
+
+/datum/plant_gene/trait/sticky/on_new_plant(obj/item/our_plant, newloc)
+ . = ..()
+ if(!.)
+ return
+
+ var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
+ if(our_seed.get_gene(/datum/plant_gene/trait/stinging))
+ our_plant.embedding = EMBED_POINTY
+ else
+ our_plant.embedding = EMBED_HARMLESS
+ our_plant.updateEmbedding()
+ our_plant.throwforce = (our_seed.potency/20)
+
+/datum/plant_gene/trait/carnivory
+ name = "Obligate Carnivory"
+ description = "Pests have positive effect on the plant health."
+ icon = "spider"
+
+/// Plant type traits. Incompatible with one another.
+/datum/plant_gene/trait/plant_type
name = "you shouldn't see this"
- trait_id = "plant_type"
+ trait_ids = PLANT_TYPE_ID
+ mutability_flags = PLANT_GENE_EXTRACTABLE
+/// Weeds don't get annoyed by weeds in their tray.
/datum/plant_gene/trait/plant_type/weed_hardy
name = "Weed Adaptation"
+ description = "It is a weed that needs no nutrients and doesn't suffer from other weeds."
+ icon = "seedling"
+/// Mushrooms need less light and have a minimum yield.
/datum/plant_gene/trait/plant_type/fungal_metabolism
name = "Fungal Vitality"
+ description = "It is a mushroom that needs no water, less light and can't be overtaken by weeds."
+ icon = "droplet-slash"
-/datum/plant_gene/trait/plant_type/crystal // WS edit - Crystals
- name = "Crystalline Growing Patterns"
-
+/// Currently unused and does nothing. Appears in strange seeds.
/datum/plant_gene/trait/plant_type/alien_properties
name ="?????"
+ icon = "reddit-alien"
-/datum/plant_gene/trait/plant_type/carnivory
- name = "Obligate Carnivory"
+/datum/plant_gene/trait/plant_type/crystal
+ name = "Crystalline Growing Patterns"
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index ad24dccff43..65f47357899 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -40,7 +40,7 @@
var/research = 0 // Defines "discovery value", which will give a one-time point payout if a seed is given to an R&D console. Seed discovery is determined on a ship-by-ship basis.
var/seed_flags = MUTATE_EARLY // Determines if a plant is allowed to mutate early at 30+ instability
-/obj/item/seeds/Initialize(mapload, nogenes = 0)
+/obj/item/seeds/Initialize(mapload, nogenes = FALSE)
. = ..()
pixel_x = base_pixel_y + rand(-8, 8)
pixel_y = base_pixel_x + rand(-8, 8)
@@ -66,10 +66,14 @@
genes += new /datum/plant_gene/core/potency(potency)
genes += new /datum/plant_gene/core/instability(instability)
- for(var/p in genes)
- if(ispath(p))
- genes -= p
- genes += new p
+ for(var/plant_gene in genes)
+ if(ispath(plant_gene))
+ genes -= plant_gene
+ genes += new plant_gene
+
+ // Go through all traits in their genes and call on_new_seed from them.
+ for(var/datum/plant_gene/trait/traits in genes)
+ traits.on_new_seed(src)
for(var/reag_id in reagents_add)
genes += new /datum/plant_gene/reagent(reag_id, reagents_add[reag_id])
@@ -557,3 +561,21 @@
genes += P
else
qdel(P)
+
+/*
+ * Both `/item/food/grown` and `/item/grown` implement a seed variable which tracks
+ * plant statistics, genes, traits, etc. This proc gets the seed for either grown food or
+ * grown inedibles and returns it, or returns null if it's not a plant.
+ *
+ * Returns an `/obj/item/seeds` ref for grown foods or grown inedibles.
+ * - returned seed CAN be null in weird cases but in all applications it SHOULD NOT be.
+ * Returns null if it is not a plant.
+ */
+/obj/item/proc/get_plant_seed()
+ return null
+
+/obj/item/reagent_containers/food/snacks/grown/get_plant_seed()
+ return seed
+
+/obj/item/grown/get_plant_seed()
+ return seed
diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm
index 022b3278e92..490742d7cdf 100644
--- a/code/modules/instruments/items.dm
+++ b/code/modules/instruments/items.dm
@@ -271,9 +271,8 @@
hitsound = 'sound/items/bikehorn.ogg'
/obj/item/choice_beacon/music
- name = "instrument delivery beacon"
- desc = "Summon your tool of art."
- icon_state = "gangtool-red"
+ name = "instrument box"
+ desc = "Contains your tool of art."
/obj/item/choice_beacon/music/generate_display_names()
var/static/list/instruments
@@ -299,9 +298,8 @@
return instruments
/obj/item/choice_beacon/rnd
- name = "C.R.E.W.M.A.T.E type R&D Choice Beacon"
- desc = "This aging launch beacon summons a limited production RND package from a nearby orbital satellite, delivered via impact pod."
- icon_state = "gangtool-sus"
+ name = "C.R.E.W.M.A.T.E type R&D box"
+ desc = "This box contains a limited production RND package."
/obj/item/choice_beacon/rnd/generate_display_names()
var/static/list/rndboxes
diff --git a/code/modules/interview/interview.dm b/code/modules/interview/interview.dm
index 27b2c83321f..64e78e43d79 100644
--- a/code/modules/interview/interview.dm
+++ b/code/modules/interview/interview.dm
@@ -102,13 +102,14 @@
set name = "Open Interview"
set category = "Admin.Interview"
var/mob/dead/new_player/M = usr
- if (M?.client?.interviewee)
- var/datum/interview/I = GLOB.interviews.interview_for_client(M.client)
- if (I) // we can be returned nothing if the user is on cooldown
- I.ui_interact(M)
- else
- to_chat(usr, "You are on cooldown for interviews. Please" \
- + " wait at least 3 minutes before starting a new questionnaire.", confidential = TRUE)
+ if (!M?.client?.interviewee)
+ return
+ var/datum/interview/I = GLOB.interviews.interview_for_client(M.client)
+ if (I) // we can be returned nothing if the user is on cooldown
+ I.ui_interact(M)
+ else
+ to_chat(usr, "You are on cooldown for interviews. Please" \
+ + " wait at least 3 minutes before starting a new questionnaire.", confidential = TRUE)
/datum/interview/ui_interact(mob/user, datum/tgui/ui = null)
ui = SStgui.try_update_ui(user, src, ui)
diff --git a/code/modules/interview/interview_manager.dm b/code/modules/interview/interview_manager.dm
index f5a557a854d..d09d90a8c6d 100644
--- a/code/modules/interview/interview_manager.dm
+++ b/code/modules/interview/interview_manager.dm
@@ -18,7 +18,7 @@ GLOBAL_DATUM_INIT(interviews, /datum/interview_manager, new)
/// Ckeys which are currently in the cooldown system, they will be unable to create new interviews
var/list/cooldown_ckeys = list()
-/datum/interview_manager/Destroy(force, ...)
+/datum/interview_manager/Destroy(force)
QDEL_LIST(open_interviews)
QDEL_LIST(interview_queue)
QDEL_LIST(closed_interviews)
diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
index 39eb0874987..1d13660682f 100644
--- a/code/modules/jobs/access.dm
+++ b/code/modules/jobs/access.dm
@@ -186,7 +186,7 @@
ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL,
ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_PHARMACY, ACCESS_RC_ANNOUNCE,
ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_SOLGOV
- ) //WS Edit - SolGov Rep
+ )
/proc/get_all_centcom_access()
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN)
@@ -368,22 +368,19 @@
if(ACCESS_NETWORK)
return "Network Access"
if(ACCESS_MECH_MINING)
- return "Mining Mech Access"
+ return "Mining Exosuit Access"
if(ACCESS_MECH_MEDICAL)
- return "Medical Mech Access"
+ return "Medical Exosuit Access"
if(ACCESS_MECH_SECURITY)
- return "Security Mech Access"
+ return "Security Exosuit Access"
if(ACCESS_MECH_SCIENCE)
- return "Science Mech Access"
+ return "Science Exosuit Access"
if(ACCESS_MECH_ENGINE)
- return "Engineering Mech Access"
-
-//WS Begin
+ return "Engineering Exosuit Access"
if(ACCESS_CLONING)
return "Cloning Room"
if(ACCESS_SOLGOV)
return "SolGov Office"
-//WS End
/proc/get_centcom_access_desc(A)
switch(A)
@@ -412,8 +409,5 @@
"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", "Prisoner", "Psychologist", //WS Edit - Brig Phys / SolGov Rep
"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "SolGov Representative") //WS Edit - Brig Phys / SolGov Rep
-/proc/get_all_job_icons() //For all existing HUD icons
- return get_all_jobs() + list("Emergency Response Team Commander", "Security Response Officer", "Engineering Response Officer", "Medical Response Officer", "Entertainment Response Officer", "Religious Response Officer", "Janitorial Response Officer", "Death Commando")
-
/proc/get_all_centcom_jobs()
return list("Central Command","VIP Guest","Custodian","Thunderdome Overseer","CentCom Official","Medical Officer","Research Officer","Special Ops Officer","Admiral","CentCom Commander","CentCom Bartender","Private Security Force")
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index ee953b0fb74..0ac783477e7 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -123,7 +123,7 @@
return FALSE
if(!visualsOnly)
var/datum/bank_account/bank_account = new(H.real_name, H.age)
- bank_account.adjust_money(officer ? 250 : 100, "starting_money") //just a little bit of money for you
+ bank_account.adjust_money(officer ? 250 : 100, CREDIT_LOG_STARTING_MONEY) //just a little bit of money for you
H.account_id = bank_account.account_id
//Equip the rest of the gear
diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm
index 42ca9b6de9f..f6c4aa85fb6 100644
--- a/code/modules/jobs/job_types/assistant.dm
+++ b/code/modules/jobs/job_types/assistant.dm
@@ -25,23 +25,12 @@ Assistant
/datum/outfit/job/assistant/pre_equip(mob/living/carbon/human/H)
..()
- if (CONFIG_GET(flag/grey_assistants))
- switch(H.jumpsuit_style)
- if(PREF_SUIT)
- uniform = initial(uniform)
- if(PREF_ALTSUIT)
- uniform = /obj/item/clothing/under/misc/assistantformal
- if(PREF_SKIRT)
- uniform = /obj/item/clothing/under/color/jumpskirt/grey
- else
- uniform = /obj/item/clothing/under/color/grey
- else
- switch(H.jumpsuit_style)
- if(PREF_SUIT)
- uniform = initial(uniform)
- if(PREF_ALTSUIT)
- uniform = /obj/item/clothing/under/misc/assistantformal
- if(PREF_SKIRT)
- uniform = /obj/item/clothing/under/utility/skirt
- else
- uniform = /obj/item/clothing/under/utility
+ switch(H.jumpsuit_style)
+ if(PREF_SUIT)
+ uniform = initial(uniform)
+ if(PREF_ALTSUIT)
+ uniform = /obj/item/clothing/under/misc/assistantformal
+ if(PREF_SKIRT)
+ uniform = /obj/item/clothing/under/utility/skirt
+ else
+ uniform = /obj/item/clothing/under/utility
diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm
index ab4ceb6968c..5efe0a0a00d 100644
--- a/code/modules/jobs/job_types/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain.dm
@@ -15,20 +15,6 @@
var/obj/item/storage/book/bible/booze/B = new
- if(GLOB.religion)
- B.deity_name = GLOB.deity
- B.name = GLOB.bible_name
- B.icon_state = GLOB.bible_icon_state
- B.item_state = GLOB.bible_item_state
- to_chat(H, "There is already an established religion onboard the station. You are an acolyte of [GLOB.deity]. Defer to the Chaplain.")
- H.equip_to_slot_or_del(B, ITEM_SLOT_BACKPACK)
- var/nrt = GLOB.holy_weapon_type || /obj/item/nullrod
- var/obj/item/nullrod/N = new nrt(H)
- H.put_in_hands(N)
- if(GLOB.religious_sect)
- GLOB.religious_sect.on_conversion(H)
- return
-
var/new_religion = DEFAULT_RELIGION
if(M.client && M.client.prefs.custom_names["religion"])
new_religion = M.client.prefs.custom_names["religion"]
diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm
index d131d8ad4cd..e2c0e24501b 100644
--- a/code/modules/jobs/job_types/clown.dm
+++ b/code/modules/jobs/job_types/clown.dm
@@ -22,8 +22,7 @@
belt = /obj/item/pda/clown
ears = /obj/item/radio/headset/headset_srv
uniform = /obj/item/clothing/under/rank/civilian/clown
- alt_uniform = /obj/item/clothing/under/rank/civilian/clown/green //WS Edit - Alt Uniforms
- shoes = /obj/item/clothing/shoes/clown_shoes
+ alt_uniform = /obj/item/clothing/under/rank/civilian/clown/green
mask = /obj/item/clothing/mask/gas/clown_hat
l_pocket = /obj/item/bikehorn
backpack_contents = list(
@@ -35,8 +34,6 @@
implants = list(/obj/item/implant/sad_trombone)
- backpack = /obj/item/storage/backpack/clown
- satchel = /obj/item/storage/backpack/clown
duffelbag = /obj/item/storage/backpack/duffelbag/clown //strangely has a duffel
box = /obj/item/storage/box/hug/survival
diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm
index 2720dcf064f..dd8e5ef8f97 100644
--- a/code/modules/jobs/job_types/geneticist.dm
+++ b/code/modules/jobs/job_types/geneticist.dm
@@ -25,7 +25,6 @@
l_pocket = /obj/item/sequence_scanner
backpack = /obj/item/storage/backpack/genetics
- satchel = /obj/item/storage/backpack/satchel/gen
duffelbag = /obj/item/storage/backpack/duffelbag/med
courierbag = /obj/item/storage/backpack/messenger/med
diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm
index a1071d7d3ce..d535e1fb705 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -39,7 +39,6 @@
alt_suit = /obj/item/clothing/suit/ianshirt
dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain //WS Edit - Alt Uniforms
shoes = /obj/item/clothing/shoes/sneakers/brown
- head = /obj/item/clothing/head/hopcap
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm
index 60c8ab9672b..1c9393a49c9 100644
--- a/code/modules/jobs/job_types/janitor.dm
+++ b/code/modules/jobs/job_types/janitor.dm
@@ -22,5 +22,5 @@
/datum/outfit/job/janitor/pre_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(GARBAGEDAY in SSevents.holidays)
- l_pocket = /obj/item/gun/ballistic/revolver/syndicate
+ l_pocket = /obj/item/gun/ballistic/revolver/viper
r_pocket = /obj/item/ammo_box/a357
diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm
index 1469e592b4d..341116d30c8 100644
--- a/code/modules/jobs/job_types/shaft_miner.dm
+++ b/code/modules/jobs/job_types/shaft_miner.dm
@@ -26,7 +26,7 @@
r_pocket = /obj/item/storage/bag/ore //causes issues if spawned in backpack
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
- /obj/item/kitchen/knife/combat/survival=1,\
+ /obj/item/melee/knife/survival=1,\
/obj/item/stack/marker_beacon/ten=1,\
/obj/item/radio/weather_monitor=1)
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index 4feaed96faf..ba4150f5a7f 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -47,4 +47,4 @@
implants = list(/obj/item/implant/mindshield)
- chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+ chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/m11
diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm
index eaa0812998b..9b348a4ed2d 100644
--- a/code/modules/language/language_holder.dm
+++ b/code/modules/language/language_holder.dm
@@ -298,11 +298,6 @@ Key procs
/datum/language/slime = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/slime = list(LANGUAGE_ATOM))
-/datum/language_holder/swarmer
- understood_languages = list(/datum/language/swarmer = list(LANGUAGE_ATOM))
- spoken_languages = list(/datum/language/swarmer = list(LANGUAGE_ATOM))
- blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
-
/datum/language_holder/venus
understood_languages = list(/datum/language/sylvan = list(LANGUAGE_ATOM))
spoken_languages = list(/datum/language/sylvan = list(LANGUAGE_ATOM))
diff --git a/code/modules/library/lib_codex_gigas.dm b/code/modules/library/lib_codex_gigas.dm
deleted file mode 100644
index 69155c9230d..00000000000
--- a/code/modules/library/lib_codex_gigas.dm
+++ /dev/null
@@ -1,104 +0,0 @@
-#define PRE_TITLE 1
-#define TITLE 2
-#define SYLLABLE 3
-#define MULTIPLE_SYLLABLE 4
-#define SUFFIX 5
-
-/obj/item/book/codex_gigas
- name = "\improper Codex Gigas"
- desc = "A book documenting the nature of devils."
- icon_state ="demonomicon"
- lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
- throw_speed = 1
- throw_range = 10
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- author = "Forces beyond your comprehension"
- unique = 1
- title = "the Codex Gigas"
- var/inUse = 0
- var/currentName = ""
- var/currentSection = PRE_TITLE
-
-/obj/item/book/codex_gigas/attack_self(mob/user)
- if(!user.can_read(src))
- return FALSE
- if(inUse)
- to_chat(user, "Someone else is reading it.")
- if(ishuman(user))
- var/mob/living/carbon/human/U = user
- if(U.check_acedia())
- to_chat(user, "None of this matters, why are you reading this? You put [title] down.")
- return
- user.visible_message("[user] opens [title] and begins reading intently.")
- ask_name(user)
-
-
-/obj/item/book/codex_gigas/proc/perform_research(mob/user, devilName)
- if(!devilName)
- user.visible_message("[user] closes [title] without looking anything up.")
- return
- inUse = TRUE
- var/speed = 300
- var/correctness = 85
- if(ishuman(user))
- var/mob/living/carbon/human/U = user
- if(U.job in list("Curator")) // the curator is both faster, and more accurate than normal crew members at research
- speed = 100
- correctness = 100
- correctness -= U.getOrganLoss(ORGAN_SLOT_BRAIN) * 0.5 //Brain damage makes researching hard.
- speed += U.getOrganLoss(ORGAN_SLOT_BRAIN) * 3
- if(do_after(user, speed, user, timed_action_flags = IGNORE_HELD_ITEM))
- var/usedName = devilName
- if(!prob(correctness))
- usedName += "x"
- var/datum/antagonist/devil/devil = devilInfo(usedName)
- display_devil(devil, user, usedName)
- sleep(10)
- onclose(user, "book")
- inUse = FALSE
-
-/obj/item/book/codex_gigas/proc/display_devil(datum/antagonist/devil/devil, mob/reader, devilName)
- reader << browse("Information on [devilName]
[GLOB.lawlorify[LORE][devil.ban]] [GLOB.lawlorify[LORE][devil.obligation]] [GLOB.lawlorify[LORE][devil.banish]] [devil.ascendable?"This devil may ascend given enough souls.":""]", "window=book[window_size != null ? ";size=[window_size]" : ""]")
-
-/obj/item/book/codex_gigas/proc/ask_name(mob/reader)
- ui_interact(reader)
-
-/obj/item/book/codex_gigas/ui_act(action, params)
- if(..())
- return
- if(!action)
- return FALSE
- if(action == "search")
- SStgui.close_uis(src)
- addtimer(CALLBACK(src, PROC_REF(perform_research), usr, currentName), 0)
- currentName = ""
- currentSection = PRE_TITLE
- return FALSE
- else
- currentName += action
- var/oldSection = currentSection
- if(GLOB.devil_pre_title.Find(action))
- currentSection = TITLE
- else if(GLOB.devil_title.Find(action))
- currentSection = SYLLABLE
- else if(GLOB.devil_syllable.Find(action))
- if (currentSection>=SYLLABLE)
- currentSection = MULTIPLE_SYLLABLE
- else
- currentSection = SYLLABLE
- else if(GLOB.devil_suffix.Find(action))
- currentSection = SUFFIX
- return currentSection != oldSection
-
-/obj/item/book/codex_gigas/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "CodexGigas", name)
- ui.open()
-
-/obj/item/book/codex_gigas/ui_data(mob/user)
- var/list/data = list()
- data["name"]=currentName
- data["currentSection"]=currentSection
- return data
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 55d33ee80d2..9c6e90469fc 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -319,7 +319,7 @@
scanner.computer.inventory.Add(src)
to_chat(user, "[I]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'")
- else if(istype(I, /obj/item/kitchen/knife) || I.tool_behaviour == TOOL_WIRECUTTER)
+ else if(istype(I, /obj/item/melee/knife) || I.tool_behaviour == TOOL_WIRECUTTER)
to_chat(user, "You begin to carve out [title]...")
if(do_after(user, 30, target = src))
to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.")
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index 71de02b3ca1..38b3728651c 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -358,7 +358,6 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
return null
/obj/machinery/computer/bookmanagement/proc/print_forbidden_lore(mob/user)
- new /obj/item/melee/cultblade/dagger(get_turf(src))
to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a sinister dagger sitting on the desk. You don't even remember where it came from...")
user.visible_message("[user] stares at the blank screen for a few moments, [user.p_their()] expression frozen in fear. When [user.p_they()] finally awaken[user.p_s()] from it, [user.p_they()] look[user.p_s()] a lot older.", 2)
diff --git a/code/modules/lighting/emissive_blocker.dm b/code/modules/lighting/emissive_blocker.dm
index 308ba8f2448..84c71203dd2 100644
--- a/code/modules/lighting/emissive_blocker.dm
+++ b/code/modules/lighting/emissive_blocker.dm
@@ -32,9 +32,6 @@
/atom/movable/emissive_blocker/singularity_pull()
return
-/atom/movable/emissive_blocker/blob_act()
- return
-
//Prevents people from moving these after creation, because they shouldn't be.
/atom/movable/emissive_blocker/forceMove(atom/destination, no_tp=FALSE, harderforce = FALSE)
if(harderforce)
diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm
index a5a68d98d60..0ef451b2979 100644
--- a/code/modules/lighting/lighting_atom.dm
+++ b/code/modules/lighting/lighting_atom.dm
@@ -80,7 +80,7 @@
. = ..()
var/datum/light_source/L
var/thing
- for (thing in light_sources) // Cycle through the light sources on this atom and tell them to update.
+ for(thing in light_sources) // Cycle through the light sources on this atom and tell them to update.
L = thing
L.source_atom.update_light()
diff --git a/code/modules/lighting/lighting_object.dm b/code/modules/lighting/lighting_object.dm
index 7b6bc79aec4..d2d95678ef0 100644
--- a/code/modules/lighting/lighting_object.dm
+++ b/code/modules/lighting/lighting_object.dm
@@ -130,9 +130,6 @@
/atom/movable/lighting_object/singularity_pull()
return
-/atom/movable/lighting_object/blob_act()
- return
-
/atom/movable/lighting_object/wash(clean_types)
return
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index e9ac7662eda..1e4e4275711 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -4,7 +4,7 @@
/obj/effect/baseturf_helper //Set the baseturfs of every turf in the /area/ it is placed.
name = "baseturf editor"
- icon = 'icons/effects/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping/mapping_helpers.dmi'
icon_state = ""
var/list/baseturf_to_replace
@@ -71,14 +71,6 @@
name = "asteroid snow baseturf editor"
baseturf = /turf/open/floor/plating/asteroid/snow
-/obj/effect/baseturf_helper/beach/sand
- name = "beach sand baseturf editor"
- baseturf = /turf/open/floor/plating/beach/sand
-
-/obj/effect/baseturf_helper/beach/water
- name = "water baseturf editor"
- baseturf = /turf/open/floor/plating/beach/water
-
/obj/effect/baseturf_helper/lava
name = "lava baseturf editor"
baseturf = /turf/open/lava/smooth
@@ -89,8 +81,9 @@
/obj/effect/mapping_helpers
- icon = 'icons/effects/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping/mapping_helpers.dmi'
icon_state = ""
+ invisibility = INVISIBILITY_OBSERVER
var/late = FALSE
/obj/effect/mapping_helpers/Initialize()
@@ -152,6 +145,25 @@
else
airlock.locked = TRUE
+/obj/effect/mapping_helpers/airlock/welded
+ name = "airlock welder"
+
+/obj/effect/mapping_helpers/airlock/welded/payload(obj/machinery/door/airlock/airlock)
+ if(airlock.welded)
+ log_mapping("[src] at [AREACOORD(src)] tried to weld [airlock] but it's already locked!")
+ else
+ airlock.welded = TRUE
+
+/obj/effect/mapping_helpers/airlock/sealed
+ name = "airlock sealer"
+
+/obj/effect/mapping_helpers/airlock/sealed/payload(obj/machinery/door/airlock/airlock)
+ if(airlock.seal)
+ log_mapping("[src] at [AREACOORD(src)] tried to seal [airlock] but it's already already got a seal? What the hell!")
+ else
+ airlock.seal = new /obj/item/door_seal(airlock)
+
+
/obj/effect/mapping_helpers/airlock/unres
name = "airlock unresctricted side helper"
@@ -253,7 +265,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
/obj/effect/mapping_helpers/ianbirthday
name = "Ian's Bday Helper"
late = TRUE
- icon_state = "iansbdayhelper"
var/balloon_clusters = 2
/obj/effect/mapping_helpers/ianbirthday/LateInitialize()
@@ -280,8 +291,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
//cake + knife to cut it!
if(length(table))
var/turf/food_turf = get_turf(pick(table))
- new /obj/item/kitchen/knife(food_turf)
- var/obj/item/reagent_containers/food/snacks/store/cake/birthday/iancake = new(food_turf)
+ new /obj/item/melee/knife/kitchen(food_turf)
+ var/obj/item/food/cake/birthday/iancake = new(food_turf)
iancake.desc = "Happy birthday, Ian!"
//some balloons! this picks an open turf and pops a few balloons in and around that turf, yay.
@@ -312,7 +323,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
/obj/effect/mapping_helpers/ianbirthday/admin//so admins may birthday any room
name = "generic birthday setup"
- icon_state = "bdayhelper"
/obj/effect/mapping_helpers/ianbirthday/admin/LateInitialize()
birthday()
@@ -322,7 +332,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
/obj/effect/mapping_helpers/iannewyear
name = "Ian's New Years Helper"
late = TRUE
- icon_state = "iansnewyrshelper"
/obj/effect/mapping_helpers/iannewyear/LateInitialize()
if(SSevents.holidays && SSevents.holidays[NEW_YEAR])
@@ -374,7 +383,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
found_airlock.update_appearance()
qdel(src)
if(note_info)
- var/obj/item/paper/paper = new /obj/item/paper(src)
+ var/obj/item/paper/paper = new /obj/item/paper(found_airlock)
if(note_name)
paper.name = note_name
paper.add_raw_text("[note_info]")
@@ -480,3 +489,32 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
var/icon/I = new(file_name)
icon_cache[url] = I
return I
+
+/obj/effect/mapping_helpers/chair
+ name = "chair helper"
+
+/obj/effect/mapping_helpers/chair/tim_buckley
+ name = "chair buckler 12000"
+ desc = "buckles a guy into the chair if theres a guy and a chair."
+
+/obj/effect/mapping_helpers/chair/tim_buckley/LateInitialize()
+ var/turf/turf = get_turf(src)
+ if(locate(/obj/structure/chair) in turf && locate(/mob/living/carbon) in turf)
+ var/obj/structure/chair/idiot_throne = locate(/obj/structure/chair) in turf
+ var/mob/living/carbon/idiot = locate(/mob/living/carbon)
+ idiot_throne.buckle_mob(idiot, TRUE)
+ qdel(src)
+ log_mapping("[src] at [x],[y] could not find a chair and guy on current turf.")
+ qdel(src)
+
+/obj/effect/mapping_helpers/turf
+ name = "turf helper"
+
+/obj/effect/mapping_helpers/turf/burnt
+ name = "turf_burner"
+ desc = "burns the everliving shit out of the turf its on."
+
+/obj/effect/mapping_helpers/turf/burnt/LateInitialize()
+ var/turf/our_turf = loc
+ our_turf.burn_tile()
+ qdel(src)
diff --git a/code/modules/mapping/writer.dm b/code/modules/mapping/writer.dm
index 35d85edc784..c07ce002908 100644
--- a/code/modules/mapping/writer.dm
+++ b/code/modules/mapping/writer.dm
@@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(save_file_chars, list(
var/turf_type = /turf/template_noop
var/area/place_area = get_area(place_turf)
var/area_type = /area/template_noop
- var/is_shuttle_area = istype(place_area, /area/shuttle)
+ var/is_shuttle_area = istype(place_area, /area/ship)
//If there is nothing there, save as a noop (For odd shapes)
if(!place_turf)
turf_type = /turf/template_noop
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index d86cfebf119..1166a0db0db 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -124,6 +124,10 @@
qdel(src)
..()
+// No busting open (used to disallow angle grinder cheesing
+/obj/structure/closet/crate/secure/loot/bust_open()
+ boom()
+
/obj/structure/closet/crate/secure/loot/proc/spawn_loot()
var/loot = rand(1,100) //100 different crates with varying chances of spawning
switch(loot)
@@ -136,7 +140,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/mask/cigarette/rollie(src)
if(6 to 10)
- new /obj/item/melee/skateboard/pro(src)
+ new /obj/item/skateboard/pro(src)
if(11 to 15)
new /mob/living/simple_animal/bot/honkbot(src)
if(16 to 20)
@@ -178,7 +182,6 @@
new /obj/item/clothing/shoes/kindleKicks(src)
if(65 to 66)
new /obj/item/clothing/suit/ianshirt(src)
- new /obj/item/clothing/suit/hooded/ian_costume(src)
if(67 to 68)
new /obj/item/toy/plush/awakenedplushie(src)
if(69 to 70)
@@ -204,14 +207,14 @@
if(88)
new /obj/item/reagent_containers/food/drinks/bottle/lizardwine(src)
if(89)
- new /obj/item/melee/transforming/energy/sword/bananium(src)
+ new /obj/item/melee/energy/sword/bananium(src)
if(90)
new /obj/item/dnainjector/wackymut(src)
if(91)
for(var/i in 1 to 30)
new /mob/living/simple_animal/hostile/cockroach(src)
if(92)
- new /obj/item/katana(src)
+ new /obj/item/melee/sword/katana(src)
if(93)
new /obj/item/dnainjector/xraymut(src)
if(94)
@@ -220,7 +223,6 @@
if(95)
new /obj/item/toy/plush/nukeplushie(src)
if(96)
- new /obj/item/banhammer(src)
for(var/i in 1 to 3)
new /obj/item/mine/pressure/sound(src)
if(97)
@@ -229,13 +231,13 @@
new /obj/item/gun/ballistic/shotgun/toy(src)
new /obj/item/gun/ballistic/automatic/toy/pistol(src)
new /obj/item/gun/ballistic/automatic/toy(src)
- new /obj/item/gun/ballistic/automatic/hmg/l6_saw/toy(src)
- new /obj/item/ammo_box/foambox(src)
+ new /obj/item/gun/ballistic/automatic/toy(src)
+ new /obj/item/storage/box/ammo/foam_darts(src)
if(98)
for(var/i in 1 to 3)
new /mob/living/simple_animal/hostile/poison/bees/toxin(src)
if(99)
new /obj/item/implanter/sad_trombone(src)
if(100)
- new /obj/item/melee/skateboard/hoverboard(src)
+ new /obj/item/skateboard/hoverboard(src)
spawned_loot = TRUE
diff --git a/code/modules/mining/drill.dm b/code/modules/mining/drill.dm
index 9a35c2b4bf1..c327efab39a 100644
--- a/code/modules/mining/drill.dm
+++ b/code/modules/mining/drill.dm
@@ -344,6 +344,8 @@
//Overly long proc to handle the unique properties for each malfunction type
/obj/machinery/drill/proc/malfunction(malfunction_type)
+ if(active)
+ mining.toggle_spawning() //turns mob spawning off after a malfunction
switch(malfunction_type)
if(MALF_LASER)
say("Malfunction: Laser array damaged, please replace before continuing mining operations.")
diff --git a/code/modules/mining/equipment/angle_grinder.dm b/code/modules/mining/equipment/angle_grinder.dm
new file mode 100644
index 00000000000..f90b709efeb
--- /dev/null
+++ b/code/modules/mining/equipment/angle_grinder.dm
@@ -0,0 +1,146 @@
+/obj/item/gear_pack/anglegrinder
+ name = "grinder pack"
+ desc = "Supplies the high voltage needed to run the attached grinder."
+ icon = 'icons/obj/item/gear_packs.dmi'
+ item_state = "anglegrinderpack"
+ icon_state = "anglegrinderpack"
+ lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
+ gear_handle_type = /obj/item/gear_handle/anglegrinder
+ slowdown = 0.3
+ drag_slowdown = 0.3
+
+/obj/item/gear_handle/anglegrinder
+ name = "angle grinder"
+ desc = "A powerful salvage tool used to cut apart walls and airlocks. A hazard sticker recommends ear and eye protection."
+ icon = 'icons/obj/item/gear_packs.dmi'
+ icon_state = "anglegrinder"
+ item_state = "anglegrinder"
+ lefthand_file = 'icons/mob/inhands/equipment/gear_handle_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/gear_handle_righthand.dmi'
+ flags_1 = CONDUCT_1
+ force = 13
+ armour_penetration = 5
+ w_class = WEIGHT_CLASS_BULKY
+ item_flags = ABSTRACT
+ attack_verb = list("lacerated", "ripped", "sliced", "sawed", "cut", "chopped", "diced")
+ hitsound = 'sound/weapons/anglegrinder.ogg'
+ usesound = 'sound/weapons/anglegrinder.ogg'
+ tool_behaviour = null // is set to TOOL_DECONSTRUCT once wielded
+ toolspeed = 0.6
+ wall_decon_damage = 350
+ usecost = 2.5
+ pack = /obj/item/gear_pack/anglegrinder
+ var/startsound = 'sound/weapons/chainsawhit.ogg'
+ var/adv = FALSE
+ var/wielded = FALSE // track wielded status on item
+ var/two_hand_force = 24
+
+/obj/item/gear_handle/anglegrinder/tool_start_check(mob/living/user, amount)
+ if(!pack)
+ to_chat(user, "how do you not have a pack for this. what.")
+ return FALSE
+ if(!pack.cell)
+ to_chat(user, "You need a cell to start!")
+ return FALSE
+ var/obj/item/stock_parts/cell/cell = pack.get_cell()
+ if(cell.charge < usecost)
+ to_chat(user, "You need more charge to complete this task!")
+ return FALSE
+ return TRUE
+
+/obj/item/gear_handle/anglegrinder/tool_use_check(mob/living/user, amount)
+ if(!pack.cell)
+ return FALSE
+ if(pack.deductcharge(usecost))
+ return TRUE
+ else
+ to_chat(user, "You need more charge to complete this task!")
+ return FALSE
+
+/obj/item/gear_handle/anglegrinder/use(used)
+ return TRUE
+
+/obj/item/gear_handle/anglegrinder/Initialize()
+ . = ..()
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
+
+/obj/item/gear_handle/anglegrinder/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/butchering, 30, 100, 0, startsound, TRUE)
+ AddComponent(/datum/component/two_handed, force_unwielded=force, force_wielded=two_hand_force, wieldsound=startsound)
+ AddElement(/datum/element/tool_bang, 1)
+
+/// triggered on wield of two handed item
+/obj/item/gear_handle/anglegrinder/proc/on_wield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ tool_behaviour = TOOL_DECONSTRUCT
+ wielded = TRUE
+ sharpness = IS_SHARP
+ icon_state = "[initial(item_state)]-wield"
+ item_state = "[initial(item_state)]-wield"
+
+/// triggered on unwield of two handed item
+/obj/item/gear_handle/anglegrinder/proc/on_unwield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ tool_behaviour = null
+ wielded = FALSE
+ sharpness = initial(sharpness)
+ icon_state = initial(icon_state)
+ item_state = initial(item_state)
+
+/obj/item/gear_handle/anglegrinder/get_dismemberment_chance()
+ if(wielded)
+ . = ..()
+
+/obj/item/gear_handle/anglegrinder/use_tool(atom/target, mob/living/user, delay, amount=1, volume=0, datum/callback/extra_checks)
+ if(adv)
+ target.add_overlay(GLOB.advanced_cutting_effect)
+ . = ..()
+ target.cut_overlay(GLOB.advanced_cutting_effect)
+ else
+ target.add_overlay(GLOB.cutting_effect)
+ . = ..()
+ target.cut_overlay(GLOB.cutting_effect)
+
+/obj/item/gear_pack/anglegrinder/energy
+ name = "energy supply pack"
+ desc = "a highly inefficient GEC-E-014 Supply Pack, used to generate and contain an energy field."
+ item_state = "energyanglegrinderpack"
+ icon_state = "energyanglegrinderpack"
+ gear_handle_type = /obj/item/gear_handle/anglegrinder/energy
+
+/obj/item/gear_handle/anglegrinder/energy
+ name = "energy saw"
+ desc = "An early prototype for handheld energy weapons, designed by a joint GEC-Cybersun lab to create an energy field for combat use."
+ icon_state = "energyanglegrinder"
+ item_state = "energyanglegrinder"
+ force = 5
+ two_hand_force = 28
+ armour_penetration = 16
+ w_class = WEIGHT_CLASS_BULKY
+ item_flags = ABSTRACT
+ attack_verb = list("lacerated", "ripped", "burned", "sliced", "cauterized", "seared", "diced")
+ hitsound = 'sound/weapons/blade1.ogg'
+ usesound = 'sound/weapons/blade1.ogg'
+ startsound = 'sound/weapons/saberon.ogg'
+ toolspeed = 0.4
+ usecost = 4
+ pack = /obj/item/gear_pack/anglegrinder/energy
+ light_system = MOVABLE_LIGHT
+ light_range = 3
+ light_color = LIGHT_COLOR_ELECTRIC_GREEN
+ light_on = FALSE
+ adv = TRUE
+
+/obj/item/gear_handle/anglegrinder/energy/on_wield(obj/item/source, mob/user)
+ . = ..()
+ set_light_on(TRUE)
+
+/obj/item/gear_handle/anglegrinder/energy/on_unwield(obj/item/source, mob/user)
+ . = ..()
+ set_light_on(FALSE)
+
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 46c20dd02e1..b5e112713a8 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -11,7 +11,7 @@
heat_protection = CHEST|GROIN|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hooded/explorer
armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/pinpointer/mineral, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
resistance_flags = FIRE_PROOF
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
@@ -65,7 +65,7 @@
resistance_flags = FIRE_PROOF | LAVA_PROOF
slowdown = 0
armor = list("melee" = 70, "bullet" = 40, "laser" = 30, "energy" = 45, "bomb" = 70, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/pinpointer/mineral, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
/obj/item/clothing/suit/space/hostile_environment/Initialize()
. = ..()
@@ -147,10 +147,10 @@
/obj/item/clothing/gloves/explorer/old
name = "prototype exploration gauntlets"
- desc = "Thick-fingered gloves with a heavy layer of armor plating, meant to stop all but the most brutal of stovetop-touching accidents in the field. This premium pre-run prototype comes with an added layer of electrical insulation."
+ desc = "Thick-fingered gloves with a heavy layer of armor plating, meant to stop all but the most brutal of stovetop-touching accidents in the field."
icon_state = "explorerold"
armor = list("melee" = 25, "bullet" = 10, "laser" = 15, "energy" = 15, "bomb" = 65, "bio" = 100, "rad" = 75, "fire" = 75, "acid" = 75)
- siemens_coefficient = 0
+ siemens_coefficient = 0.5
permeability_coefficient = 0.05
/obj/item/clothing/suit/hooded/survivor
@@ -167,7 +167,7 @@
heat_protection = CHEST|GROIN|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hooded/survivor_hood
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 10, "bomb" = 20, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 30)
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/pinpointer/mineral, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
resistance_flags = FIRE_PROOF
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
@@ -190,3 +190,37 @@
/obj/item/clothing/head/hooded/survivor_hood/Initialize()
. = ..()
AddComponent(/datum/component/armor_plate)
+
+/obj/item/clothing/suit/hooded/scrap
+ name = "scrap suit"
+ desc = "A ragged makeshift suit."
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+ icon_state = "survivor"
+ item_state = "survivor_suit"
+ body_parts_covered = CHEST|GROIN|LEGS|ARMS
+ min_cold_protection_temperature = (FIRE_SUIT_MIN_TEMP_PROTECT * 2)
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ max_heat_protection_temperature = (FIRE_SUIT_MAX_TEMP_PROTECT / 2)
+ heat_protection = CHEST|GROIN|LEGS|ARMS
+ hoodtype = /obj/item/clothing/head/hooded/scrap
+ armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 20, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 30)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals)
+ resistance_flags = FIRE_PROOF
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
+
+/obj/item/clothing/head/hooded/scrap
+ name = "scrap hood"
+ desc = "A loose-fitting hood. It gets the job done."
+ icon_state = "explorerold"
+ suit = /obj/item/clothing/suit/hooded/scrap
+ body_parts_covered = HEAD
+ flags_inv = HIDEHAIR|HIDEEARS
+ armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 20, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 30)
+
+/obj/item/clothing/suit/armor/vest/scrap
+ name = "scrap armor"
+ desc = "An 'armor' vest consisting of sheet metal held together with cable. Who thought this was a good idea?"
+ icon_state = "scraparmor"
+ item_state = "scraparmor"
+ armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 20, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 30)
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 030e592d80c..27f71dfa935 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -8,7 +8,7 @@
name = "proto-magnetic crusher"
desc = "A multipurpose disembarkation and self-defense tool designed by EXOCOM using an incomplete Nanotrasen prototype. \
Found in the grime-stained hands of wannabee explorers across the frontier, it cuts rock and hews flora using magnetic osscilation and a heavy cleaving edge."
- force = 0 //You can't hit stuff unless wielded
+ force = 0 //You can't hit stuff unless it's wielded
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
throwforce = 5
@@ -28,25 +28,13 @@
var/charge_time = 15
var/detonation_damage = 20
var/backstab_bonus = 10
- var/wielded = FALSE // track wielded status on item
-
-/obj/item/kinetic_crusher/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
+ var/unwielded_force = 0
+ var/wielded_force = 25
/obj/item/kinetic_crusher/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it
- AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=15)
-
-/// triggered on wield of two handed item
-/obj/item/kinetic_crusher/proc/on_wield(obj/item/source, mob/user)
- wielded = TRUE
-
-/// triggered on unwield of two handed item
-/obj/item/kinetic_crusher/proc/on_unwield(obj/item/source, mob/user)
- wielded = FALSE
+ AddComponent(/datum/component/two_handed, force_unwielded=unwielded_force, force_wielded=wielded_force)
/obj/item/kinetic_crusher/examine(mob/living/user)
. = ..()
@@ -54,7 +42,7 @@
. += "Does [force + detonation_damage + backstab_bonus] damage if the target is backstabbed, instead of [force + detonation_damage]."
/obj/item/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user)
- if(!wielded)
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
to_chat(user, "[src] is too heavy to use with one hand! You fumble and drop everything.")
user.drop_all_held_items()
return
@@ -66,7 +54,7 @@
/obj/item/kinetic_crusher/afterattack(atom/target, mob/living/user, proximity_flag, clickparams)
. = ..()
- if(!wielded)
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
return
if(!proximity_flag && charged)//Mark a target, or mine a tile.
var/turf/proj_turf = user.loc
@@ -113,12 +101,12 @@
/obj/item/kinetic_crusher/ui_action_click(mob/user, actiontype)
set_light_on(!light_on)
- playsound(user, 'sound/weapons/empty.ogg', 100, TRUE)
+ playsound(user, SOUND_EMPTY_MAG, 100, TRUE)
update_appearance()
/obj/item/kinetic_crusher/update_icon_state()
- item_state = "crusher[wielded]" // this is not icon_state and not supported by 2hcomponent
+ item_state = "crusher[HAS_TRAIT(src, TRAIT_WIELDED)]" // this is not icon_state and not supported by 2hcomponent
return ..()
/obj/item/kinetic_crusher/update_overlays()
@@ -135,6 +123,8 @@
nodamage = TRUE
damage = 0 //We're just here to mark people. This is still a melee weapon.
damage_type = BRUTE
+ wall_damage_flags = PROJECTILE_BONUS_DAMAGE_MINERALS
+ wall_damage_override = MINERAL_WALL_INTEGRITY
flag = "bomb"
range = 6
log_override = TRUE
@@ -150,9 +140,9 @@
L.apply_status_effect(STATUS_EFFECT_CRUSHERMARK, hammer_synced)
var/target_turf = get_turf(target)
if(ismineralturf(target_turf))
+ SSblackbox.record_feedback("tally", "pick_used_mining", 1, src.type)
var/turf/closed/mineral/M = target_turf
new /obj/effect/temp_visual/kinetic_blast(M)
- M.gets_drilled(firer, TRUE)
..()
//outdated Nanotrasen prototype of the crusher. Incredibly heavy, but the blade was made at a premium. //to alter this I had to duplicate some code, big moment.
@@ -166,22 +156,19 @@
detonation_damage = 10
slowdown = 0.5//hevy
attack_verb = list("mashed", "flattened", "bisected", "eradicated","destroyed")
+ unwielded_force = 0
+ wielded_force = 30
/obj/item/kinetic_crusher/old/examine(mob/user)
. = ..()
. += "This hunk of junk's so heavy that you can barely swing it! Though, that blade looks pretty sharp..."
-/obj/item/kinetic_crusher/old/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/butchering, 60, 110)
- AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=25)//big choppa!
-
/obj/item/kinetic_crusher/old/melee_attack_chain(mob/user, atom/target, params)
..()
user.changeNext_move(CLICK_CD_MELEE * 2.0)//...slow swinga.
/obj/item/kinetic_crusher/old/update_icon_state()
- item_state = "crusherold[wielded]" // still not supported by 2hcomponent
+ item_state = "crusherold[HAS_TRAIT(src, TRAIT_WIELDED)]" // still not supported by 2hcomponent
return ..()
//100% original syndicate oc, plz do not steal. More effective against human targets then the typical crusher, with a bit of block chance.
@@ -194,7 +181,7 @@
name = "magnetic cleaver"
desc = "Designed by Syndicate Research and Development for their resource-gathering operations on hostile worlds. Syndicate Legal Ops would like to stress that you've never seen anything like this before. Ever."
armour_penetration = 69//nice cut
- force = 0 //You can't hit stuff unless wielded
+ force = 0 //You can't hit stuff unless HAS_TRAIT(src, TRAIT_WIELDED)
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
throwforce = 5
@@ -215,35 +202,36 @@
charge_time = 15
detonation_damage = 35
backstab_bonus = 15
- wielded = FALSE // track wielded status on item
actions_types = list()
+ unwielded_force = 0
+ wielded_force = 22
-/obj/item/kinetic_crusher/syndie_crusher/ComponentInitialize()
+/obj/item/kinetic_crusher/syndie_crusher/Initialize()
. = ..()
- AddComponent(/datum/component/butchering, 60, 150)
- AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=10)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/// triggered on wield of two handed item
-/obj/item/kinetic_crusher/syndie_crusher/on_wield(obj/item/source, mob/user)
- . = ..()
- wielded = TRUE
+/obj/item/kinetic_crusher/syndie_crusher/proc/on_wield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
icon_state = "crushersyndie1"
playsound(user, 'sound/weapons/saberon.ogg', 35, TRUE)
- set_light_on(wielded)
+ set_light_on(HAS_TRAIT(src, TRAIT_WIELDED))
/// triggered on unwield of two handed item
-/obj/item/kinetic_crusher/syndie_crusher/on_unwield(obj/item/source, mob/user)
- . = ..()
- wielded = FALSE
+/obj/item/kinetic_crusher/syndie_crusher/proc/on_unwield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
icon_state = "crushersyndie"
playsound(user, 'sound/weapons/saberoff.ogg', 35, TRUE)
- set_light_on(wielded)
+ set_light_on(HAS_TRAIT(src, TRAIT_WIELDED))
/obj/item/kinetic_crusher/syndie_crusher/update_icon_state()
- item_state = "crushersyndie[wielded]" // this is not icon_state and not supported by 2hcomponent
+ item_state = "crushersyndie[HAS_TRAIT(src, TRAIT_WIELDED)]" // this is not icon_state and not supported by 2hcomponent
return ..()
/obj/item/kinetic_crusher/syndie_crusher/update_overlays()
. = ..()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
. += "[icon_state]_lit"
diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm
index 74ed8ce30fb..c4ea06ac3e0 100644
--- a/code/modules/mining/equipment/marker_beacons.dm
+++ b/code/modules/mining/equipment/marker_beacons.dm
@@ -32,6 +32,12 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list(
/obj/item/stack/marker_beacon/thirty //and they're bought in stacks of 1, 10, or 30
amount = 30
+/obj/item/stack/marker_beacon/ten
+ amount = 10
+
+/obj/item/stack/marker_beacon/thirty
+ amount = 30
+
/obj/item/stack/marker_beacon/Initialize(mapload)
. = ..()
update_appearance()
diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm
index 7c62a915f65..4def7dbe5dd 100644
--- a/code/modules/mining/equipment/mineral_scanner.dm
+++ b/code/modules/mining/equipment/mineral_scanner.dm
@@ -126,6 +126,7 @@
/obj/item/pinpointer/mineral/examine(mob/user)
. = ..()
. += "It is currently set to [scanmode ? "scan underground" : "scan the surface"]."
+ . += span_notice("You can use the scanner on an vein on harm intent to mark them as sites of no interest, causing them to no longer show up on scans.")
/obj/item/pinpointer/mineral/AltClick(mob/user) //switching modes
..()
@@ -204,7 +205,7 @@
var/located_dist
var/obj/structure/located_vein
for(var/obj/structure/vein/I in GLOB.ore_veins)
- if(I.z == 0 || I.virtual_z() != here.virtual_z())
+ if(I.z == 0 || I.virtual_z() != here.virtual_z() || I.detectable == FALSE)
continue
if(located_vein)
var/new_dist = get_dist(here, get_turf(I))
@@ -223,6 +224,16 @@
if(!proximity || !istype(O,/obj/structure/vein))
return
playsound(src, 'sound/effects/fastbeep.ogg', 10)
+ if(user.a_intent == INTENT_HARM)
+ if(O.detectable == TRUE)
+ to_chat(user,span_notice("You blacklist the vein from the scanner's telemetry, and will no longer be detected as a site of interest to the scanner."))
+ O.detectable = FALSE
+ return
+ else
+ to_chat(user,span_notice("You mark vein into the scanner's telemetry, allowing it be located by underground scans."))
+ O.detectable = TRUE
+ return
+
if(O.vein_contents.len > 0)
to_chat(user, "Class [O.vein_class] ore vein with [O.mining_charges] possible ore lodes found.")
for(var/re in O.vein_contents)
diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
index d38a3ce8b55..a0548a2cb9f 100644
--- a/code/modules/mining/equipment/mining_tools.dm
+++ b/code/modules/mining/equipment/mining_tools.dm
@@ -17,6 +17,7 @@
toolspeed = 0.5
usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
attack_verb = list("hit", "pierced", "sliced", "attacked")
+ wall_decon_damage = MINERAL_WALL_INTEGRITY
/obj/item/pickaxe/rusted
name = "rusty pickaxe"
@@ -24,6 +25,7 @@
attack_verb = list("ineffectively hit")
force = 1
throwforce = 1
+ wall_decon_damage = 50
/obj/item/pickaxe/mini
name = "compact pickaxe"
diff --git a/code/modules/mining/equipment/miningradio.dm b/code/modules/mining/equipment/miningradio.dm
index a0bef397d8c..d0712db194d 100644
--- a/code/modules/mining/equipment/miningradio.dm
+++ b/code/modules/mining/equipment/miningradio.dm
@@ -7,6 +7,7 @@
luminosity = 1
light_power = 1
light_range = 1.6
+ light_system = MOVABLE_LIGHT
/obj/item/radio/weather_monitor/update_overlays()
. = ..()
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index 4bd6824327f..98c5c15e0e2 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/chemical/medicine.dmi'
icon_state = "bottle19"
desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely."
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_NORMAL
custom_price = 400
/obj/item/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user, proximity)
@@ -27,6 +27,7 @@
icon_state = "roro core 2"
item_flags = NOBLUDGEON
slot = ORGAN_SLOT_REGENERATIVE_CORE
+ organ_flags = null
force = 0
actions_types = list(/datum/action/item_action/organ_action/use)
var/inert = 0
@@ -67,7 +68,7 @@
owner.adjustOxyLoss(-50)
owner.adjustToxLoss(-50)
if(owner.dna.species.id != SPECIES_IPC)
- owner.adjustCloneLoss(10) //dont abuse it or take cloneloss (organic only)
+ owner.adjustCloneLoss(20) //dont abuse it or take cloneloss (organic only)
qdel(src)
/obj/item/organ/regenerative_core/on_life()
@@ -79,21 +80,26 @@
/obj/item/organ/regenerative_core/proc/applyto(atom/target, mob/user)
if(ishuman(target))
var/mob/living/carbon/human/H = target
+ if(H.dna.species.id == SPECIES_IPC)
+ to_chat(user, span_notice("[src] has no effect on silicate life."))
+ return
if(inert)
- to_chat(user, "[src] has decayed and can no longer be used to heal.")
+ to_chat(user, span_notice("[src] has decayed past usabality."))
return
- else
- if(H.stat == DEAD)
- to_chat(user, "[src] is useless on the dead.")
- return
+ if(H.stat == DEAD)
+ to_chat(user, span_notice("[src] is useless on the dead."))
+ return
+ if(do_after(user, 10, target))
if(H != user)
- H.visible_message("[user] forces [H] to apply [src]... Black tendrils entangle and reinforce [H.p_them()]!")
+ H.visible_message(span_notice("[user] smears [src] across [H]... malignant black tendrils entangle and reinforce [H.p_their()] flesh!"))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other"))
else
- to_chat(user, "You start to smear [src] on yourself. Disgusting tendrils hold you together and allow you to keep moving, but for how long?")
+ to_chat(user, span_notice("You smear [src] across your body. Malignant black tendrils start to grow around the application site, reinforcing your flesh!"))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
H.apply_status_effect(STATUS_EFFECT_REGENERATIVE_CORE)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman) //Now THIS is a miner buff (fixed - nerf)
+ H.reagents.add_reagent(/datum/reagent/medicine/soulus,15)
+ H.force_scream()
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman)
qdel(src)
/obj/item/organ/regenerative_core/afterattack(atom/target, mob/user, proximity_flag)
@@ -179,21 +185,21 @@
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(inert)
- to_chat(user, "[src] has broken and can no longer be used to heal.")
+ to_chat(user, span_notice("[src] has decayed beyond usability."))
return
else
if(H.stat == DEAD)
- to_chat(user, "[src] is useless on the dead.")
+ to_chat(user, span_notice("[src] is useless on the dead."))
return
if(H != user)
- H.visible_message("[user] forces [H] to apply [src]... Cancer like crystals grow on and reinforce [H.p_them()]!")
+ H.visible_message(span_notice("[user] smears [src] across [H]... malignant crystals and cancerous tendrils grow on and reinforce [H.p_them()]!"))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other"))
else
- to_chat(user, "You start to apply [src] on yourself. Cancer like crystals hold you together and add something to you to keep yourself moving, but for how long?")
+ to_chat(user, span_notice("You smear [src] across yourself. malignant crystals and cancerous tendrils grow on you, toughening and healing where they touch."))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
H.apply_status_effect(STATUS_EFFECT_REGENERATIVE_CORE)
H.reagents.add_reagent(/datum/reagent/determination, 4)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman) //Now THIS is a miner buff (fixed - nerf)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman)
qdel(src)
/obj/item/organ/regenerative_core/legion/crystal/update_icon_state()
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 7ba30d32744..15f7cb2e3a6 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -5,7 +5,7 @@
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = FALSE
has_gravity = STANDARD_GRAVITY
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA
+ area_flags = UNIQUE_AREA
flags_1 = CAN_BE_DIRTY_1
//Survival Capsule
@@ -308,17 +308,16 @@
var/possible = list(/obj/item/ship_in_a_bottle,
/obj/item/gun/energy/pulse,
/obj/item/book/granter/martial/carp,
- /obj/item/melee/supermatter_sword,
+ /obj/item/melee/sword/supermatter,
/obj/item/shield/changeling,
/obj/item/lava_staff,
- /obj/item/energy_katana,
+ /obj/item/melee/sword/energy_katana,
/obj/item/hierophant_club,
/obj/item/gun/energy/minigun,
- /obj/item/gun/ballistic/automatic/hmg/l6_saw,
+ /obj/item/gun/ballistic/automatic/assault/hydra/lmg/extended,
/obj/item/stack/telecrystal/twenty,
/obj/item/nuke_core,
- /obj/item/phylactery,
- /obj/item/banhammer)
+ /obj/item/phylactery)
/obj/item/fakeartefact/Initialize()
. = ..()
diff --git a/code/modules/mining/equipment/trophies.dm b/code/modules/mining/equipment/trophies.dm
index a9631c7ffc1..3510a0b5962 100644
--- a/code/modules/mining/equipment/trophies.dm
+++ b/code/modules/mining/equipment/trophies.dm
@@ -30,7 +30,7 @@
desc = "A sliced-off goliath tentacle."
icon_state = "goliath_tentacle"
-//ancient goliath0
+//ancient goliath
/obj/item/mob_trophy/elder_tentacle
name = "elder tentacle"
desc = "The barbed tip of a tentacle sliced from an incredibly ancient goliath."
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 2af4c1b5ce4..e44dd4b14dc 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -41,10 +41,7 @@
var/turf/targetturf = find_safe_turf()
if(!targetturf)
- if(GLOB.blobstart.len > 0)
- targetturf = get_turf(pick(GLOB.blobstart))
- else
- CRASH("Unable to find a blobstart landmark")
+ CRASH("Unable to find a blobstart landmark")
var/obj/effect/portal/jaunt_tunnel/J = new (get_turf(src), 100, null, FALSE, targetturf)
log_game("[user] Has jaunted to [loc_name(targetturf)].")
message_admins("[user] Has jaunted to [ADMIN_VERBOSEJMP(targetturf)].")
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index f9563cc078e..bf4ad80647e 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -419,7 +419,7 @@
/obj/item/seeds/lavaland/puce/attackby(obj/item/item, mob/user, params)
. = ..()
//anyone intending to add more garnishes using this method should componentize this
- if(!istype(item, /obj/item/kitchen/knife))
+ if(!istype(item, /obj/item/melee/knife))
return
playsound(src, 'sound/effects/glassbr1.ogg', 50, TRUE, -1)
to_chat(user, "You start breaking [src] up into shards...")
@@ -508,7 +508,7 @@
icon_state = "garden"
harvested_name = "lush garden"
harvested_desc = "In the soil and shade, something softly grew. It seems some industrious scavenger already passed by."
- harvest = /obj/effect/spawner/lootdrop/garden
+ harvest = /obj/effect/spawner/random/food_or_drink/garden
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You discover something nestled away in the growing bough."
@@ -527,7 +527,7 @@
icon_state = "gardenarid"
harvested_name = "sandy garden"
harvested_desc = "Beneath a bluff of soft silicate, a sheltered grove slumbered. Some desert wanderer seems to have picked it clean."
- harvest = /obj/effect/spawner/lootdrop/garden/arid
+ harvest = /obj/effect/spawner/random/food_or_drink/garden/arid
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You brush sand away from a verdant prize, nestled in the leaves."
@@ -540,7 +540,7 @@
icon_state = "gardencold"
harvested_name = "chilly garden"
harvested_desc = "A delicate layer of frost covers hardy brush. Someone came with the blizzard, and left with any prize this might contain."
- harvest = /obj/effect/spawner/lootdrop/garden/cold
+ harvest = /obj/effect/spawner/random/food_or_drink/garden/cold
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You unearth a snow-covered treat."
@@ -553,7 +553,7 @@
icon_state = "gardensick"
harvested_name = "sickly garden"
harvested_desc = "Polluted water wells up from the cracked earth, where it once fed a patch of something curious. Now only wilted leaves remain."
- harvest = /obj/effect/spawner/lootdrop/garden/sick
+ harvest = /obj/effect/spawner/random/food_or_drink/garden/sick
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You pry something odd from the poisoned soil."
@@ -567,124 +567,13 @@
icon_state = "seaweed"
harvested_name = "seaweed patch"
harvested_desc = "A patch of seaweed, floating on the surface of the water. It seems someone has already searched through this"
- harvest = /obj/effect/spawner/lootdrop/garden/seaweed
+ harvest = /obj/effect/spawner/random/food_or_drink/garden/seaweed
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You discover some edible weeds within the patch."
harvest_message_med = "You discover some edible weeds within the patch."
harvest_message_high = "You discover some edible weeds within the patch."
-/obj/effect/spawner/lootdrop/garden
- name = "lush garden seeder"
- lootcount = 3
- var/list/plant = list(
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus = 1,
- /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth = 2,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d = 1,
- /obj/item/reagent_containers/food/snacks/grown/trumpet = 1,
- /obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
- /obj/item/seeds/random = 1,
- /obj/item/grown/log/bamboo = 2,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 2,
- /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth = 5,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2,
- /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2,
- /obj/item/reagent_containers/food/snacks/grown/moonflower = 2,
- /obj/item/reagent_containers/food/snacks/grown/cocoapod = 2,
- /obj/item/reagent_containers/food/snacks/grown/pineapple = 2,
- /obj/item/reagent_containers/food/snacks/grown/poppy/lily = 2,
- /obj/item/reagent_containers/food/snacks/grown/poppy/geranium = 2,
- /obj/item/reagent_containers/food/snacks/grown/sugarcane = 2,
- /obj/item/reagent_containers/food/snacks/grown/tea = 2,
- /obj/item/reagent_containers/food/snacks/grown/tobacco = 2,
- /obj/item/reagent_containers/food/snacks/grown/watermelon = 4,
- /obj/item/grown/sunflower = 4,
- /obj/item/reagent_containers/food/snacks/grown/banana = 4,
- /obj/item/reagent_containers/food/snacks/grown/apple = 4,
- /obj/item/reagent_containers/food/snacks/grown/berries = 5,
- /obj/item/reagent_containers/food/snacks/grown/cherries = 4,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 4,
- /obj/item/reagent_containers/food/snacks/grown/garlic = 4,
- /obj/item/reagent_containers/food/snacks/grown/grapes = 4,
- /obj/item/reagent_containers/food/snacks/grown/grass = 5,
- /obj/item/reagent_containers/food/snacks/grown/pumpkin = 4,
- /obj/item/reagent_containers/food/snacks/grown/rainbow_flower = 4,
- /obj/item/reagent_containers/food/snacks/grown/wheat = 4,
- /obj/item/reagent_containers/food/snacks/grown/parsnip = 4,
- /obj/item/reagent_containers/food/snacks/grown/peas = 4,
- /obj/item/reagent_containers/food/snacks/grown/rice = 4,
- /obj/item/reagent_containers/food/snacks/grown/soybeans = 4,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 4,
- /obj/item/reagent_containers/food/snacks/grown/cabbage = 4,
- /obj/item/reagent_containers/food/snacks/grown/onion = 4,
- /obj/item/reagent_containers/food/snacks/grown/carrot = 4)
-
-/obj/effect/spawner/lootdrop/garden/Initialize(mapload)
- loot = plant
- . = ..()
-
-/obj/effect/spawner/lootdrop/garden/arid
- name = "arid garden seeder"
- plant = list(
- /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 1,
- /obj/item/reagent_containers/food/snacks/grown/nettle = 1,
- /obj/item/grown/cotton/durathread = 1,
- /obj/item/seeds/random = 1,
- /obj/item/reagent_containers/food/snacks/grown/redbeet = 1,
- /obj/item/reagent_containers/food/snacks/grown/aloe = 2,
- /obj/item/grown/cotton = 2,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/angel = 2,
- /obj/item/reagent_containers/food/snacks/grown/chili = 2,
- /obj/item/reagent_containers/food/snacks/grown/whitebeet = 5,
- /obj/item/reagent_containers/food/snacks/grown/potato = 4,
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 4,
- /obj/item/reagent_containers/food/snacks/grown/corn = 4)
-
-/obj/effect/spawner/lootdrop/garden/cold
- name = "frigid garden seeder"
- plant = list(
- /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1,
- /obj/item/reagent_containers/food/snacks/grown/galaxythistle = 1,
- /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth = 1,
- /obj/item/seeds/random = 1,
- /obj/item/reagent_containers/food/snacks/grown/poppy = 2,
- /obj/item/reagent_containers/food/snacks/grown/tomato/blue = 2,
- /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth = 2,
- /obj/item/reagent_containers/food/snacks/grown/berries = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 4,
- /obj/item/reagent_containers/food/snacks/grown/oat = 4,
- /obj/item/reagent_containers/food/snacks/grown/grapes/green = 4,
- /obj/item/reagent_containers/food/snacks/grown/grass = 4,
- /obj/item/reagent_containers/food/snacks/grown/harebell = 5,
- /obj/item/seeds/starthistle = 5)
-
-/obj/effect/spawner/lootdrop/garden/sick
- name = "sickly garden seeder"
- plant = list(
- /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow = 1,
- /obj/item/reagent_containers/food/snacks/grown/cannabis/death = 1,
- /obj/item/seeds/replicapod = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/angel = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 2,
- /obj/item/seeds/tower/steel = 2,
- /obj/item/reagent_containers/food/snacks/grown/cannabis = 2,
- /obj/item/seeds/random = 2,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup = 2,
- /obj/item/reagent_containers/food/snacks/grown/cherrybulbs = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi = 4,
- /obj/item/reagent_containers/food/snacks/grown/berries/glow = 4)
-
-/obj/effect/spawner/lootdrop/garden/seaweed
- name = "seaweed patch seeder"
- plant = list(
- /obj/item/reagent_containers/food/snacks/grown/seaweed = 1
- )
-
/obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth //careful eating from random jungle bushes
seed = /obj/item/seeds/berry/poison
name = "bunch of berries"
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 268413ef203..0ee00128d85 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -15,16 +15,12 @@
/obj/structure/closet/crate/necropolis/tendril/PopulateContents()
var/loot = rand(1,29)
switch(loot)
- if(1)
+ if(1,2)
new /obj/item/shared_storage/red(src)
- if(2)
- new /obj/item/clothing/suit/space/hardsuit/cult(src)
if(3)
new /obj/item/necromantic_stone/lava(src)
- if(4)
- new /obj/item/katana/cursed(src)
if(5)
- new /obj/item/clothing/glasses/godeye(src)
+ new /obj/item/pickaxe/diamond(src)
if(6)
new /obj/item/reagent_containers/glass/bottle/potion/flight(src)
if(7)
@@ -47,14 +43,11 @@
new /obj/item/borg/upgrade/modkit/lifesteal(src)
new /obj/item/bedsheet/cult(src)
if(14)
- new /obj/item/nullrod/scythe/talking/necro(src)
+ new /obj/item/scythe(src)
if(15)
new /obj/item/book_of_babel(src)
if(16)
- if(prob(75))
- new /obj/item/guardiancreator/miner(src)
- else
- new /obj/item/guardiancreator/miner/choose (src)
+ new /obj/item/ship_in_a_bottle(src)
if(17)
if(prob(50))
new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src)
@@ -80,8 +73,6 @@
new /obj/item/gun/energy/spur(src)
if(28)
new /obj/item/clothing/suit/armor/ascetic(src)
- if(29)
- new /obj/item/kitchen/knife/envy(src)
/obj/structure/closet/crate/necropolis/tendril/greater
desc = "It's watching you wearily. It seems terribly bloated."
@@ -96,10 +87,8 @@
new /obj/item/clothing/suit/space/hardsuit/cult(src)
if(3)
new /obj/item/necromantic_stone/lava(src)
- if(4)
- new /obj/item/katana/cursed(src)
if(5)
- new /obj/item/clothing/glasses/godeye(src)
+ new /obj/item/pickaxe/diamond(src)
if(6)
new /obj/item/reagent_containers/glass/bottle/potion/flight(src)
if(7)
@@ -122,14 +111,11 @@
new /obj/item/borg/upgrade/modkit/lifesteal(src)
new /obj/item/bedsheet/cult(src)
if(14)
- new /obj/item/nullrod/scythe/talking/necro(src)
+ new /obj/item/scythe(src)
if(15)
new /obj/item/book_of_babel(src)
if(16)
- if(prob(75))
- new /obj/item/guardiancreator/miner(src)
- else
- new /obj/item/guardiancreator/miner/choose (src)
+ new /obj/item/ship_in_a_bottle(src)
if(17)
if(prob(50))
new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src)
@@ -155,36 +141,6 @@
new /obj/item/gun/energy/spur(src)
if(28)
new /obj/item/clothing/suit/armor/ascetic(src)
- if(29)
- new /obj/item/kitchen/knife/envy(src)
-
-//KA modkit design discs
-/obj/item/disk/design_disk/modkit_disc
- name = "KA Mod Disk"
- desc = "A design disc containing the design for a unique kinetic accelerator modkit. It's compatible with a research console."
- illustration = "accel"
- color = "#6F6F6F"
- var/modkit_design = /datum/design/unique_modkit
-
-/obj/item/disk/design_disk/modkit_disc/Initialize()
- . = ..()
- blueprints[1] = new modkit_design
-
-/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe
- name = "Offensive Mining Explosion Mod Disk"
- modkit_design = /datum/design/unique_modkit/offensive_turf_aoe
-
-/obj/item/disk/design_disk/modkit_disc/rapid_repeater
- name = "Rapid Repeater Mod Disk"
- modkit_design = /datum/design/unique_modkit/rapid_repeater
-
-/obj/item/disk/design_disk/modkit_disc/resonator_blast
- name = "Resonator Blast Mod Disk"
- modkit_design = /datum/design/unique_modkit/resonator_blast
-
-/obj/item/disk/design_disk/modkit_disc/bounty
- name = "Death Syphon Mod Disk"
- modkit_design = /datum/design/unique_modkit/bounty
/datum/design/unique_modkit
category = list("Mining Designs", "Cyborg Upgrade Modules") //can't be normally obtained
@@ -659,7 +615,7 @@
ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
playsound(C.loc, 'sound/items/poster_ripped.ogg', 50, TRUE, -1)
C.adjustBruteLoss(20)
- C.emote("scream")
+ C.force_scream()
..()
//nerfed necrostone
@@ -736,10 +692,9 @@
var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionnaire)
H.equip_to_slot_or_del(new hat(H), ITEM_SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING)
- H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET)
H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
- H.put_in_hands(new /obj/item/claymore(H), TRUE)
- H.equip_to_slot_or_del(new /obj/item/spear(H), ITEM_SLOT_BACK)
+ H.put_in_hands(new /obj/item/melee/sword/claymore(H), TRUE)
+ H.equip_to_slot_or_del(new /obj/item/melee/spear(H), ITEM_SLOT_BACK)
//ice cube
/obj/item/freeze_cube
@@ -869,8 +824,8 @@
name = "Slowpoke"
desc = "The work of a truly genius gunsmith, altered and \"improved\" by a truly deranged Nanotrasen scientist, using components from a kinetic accelerator and beam rifle. Draw, partner!"
icon = 'icons/obj/guns/energy.dmi'
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ lefthand_file = GUN_LEFTHAND_ICON
+ righthand_file = GUN_RIGHTHAND_ICON
icon_state = "spur"
item_state = "spur"
selfcharge = 1
@@ -878,7 +833,7 @@
slot_flags = ITEM_SLOT_BELT
fire_delay = 0.1 SECONDS
recoil = 1
- cell_type = /obj/item/stock_parts/cell/gun
+ default_ammo_type = /obj/item/stock_parts/cell/gun
ammo_type = list(/obj/item/ammo_casing/energy/spur)
supports_variations = VOX_VARIATION
var/chargesound
@@ -933,6 +888,8 @@
range = 20
damage = 30
damage_type = BRUTE
+ wall_damage_flags = PROJECTILE_BONUS_DAMAGE_MINERALS
+ wall_damage_override = MINERAL_WALL_INTEGRITY
icon = 'icons/obj/projectiles.dmi'
icon_state = "spur_high"
var/skip = FALSE //this is the hackiest thing ive ever done but i dont know any other solution other than deparent the spur projectile
@@ -994,9 +951,6 @@
spawn(15)
target.overlays -= impact
playsound(loc, impact_sound, 30)
- if(istype(target,/turf/closed/mineral))
- var/turf/closed/mineral/M = target
- M.gets_drilled()
..()
/obj/item/ammo_casing/energy/spur/spur
@@ -1103,99 +1057,12 @@
C.update_inv_wear_suit()
/obj/item/clothing/suit/armor/ascetic/worn_overlays(isinhands)
- . = list()
+ . = ..()
if(!isinhands)
. += mutable_appearance('icons/effects/effects.dmi', shield_state, MOB_LAYER - 0.01)
///Bosses
-//Miniboss Miner
-
-/obj/item/melee/transforming/cleaving_saw
- name = "cleaving saw"
- desc = "This saw, effective at drawing the blood of beasts, transforms into a long cleaver that makes use of centrifugal force."
- force = 12
- force_on = 20 //force when active
- throwforce = 20
- throwforce_on = 20
- icon = 'icons/obj/lavaland/artefacts.dmi'
- lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
- inhand_x_dimension = 64
- inhand_y_dimension = 64
- icon_state = "cleaving_saw"
- icon_state_on = "cleaving_saw_open"
- slot_flags = ITEM_SLOT_BELT
- attack_verb_off = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut")
- attack_verb_on = list("cleaved", "swiped", "slashed", "chopped")
- hitsound = 'sound/weapons/bladeslice.ogg'
- hitsound_on = 'sound/weapons/bladeslice.ogg'
- w_class = WEIGHT_CLASS_BULKY
- sharpness = IS_SHARP
- faction_bonus_force = 30
- nemesis_factions = list("mining", "boss")
- var/transform_cooldown
- var/swiping = FALSE
- var/bleed_stacks_per_hit = 3
-
-/obj/item/melee/transforming/cleaving_saw/examine(mob/user)
- . = ..()
- . += "It is [active ? "open, will cleave enemies in a wide arc and deal additional damage to fauna":"closed, and can be used for rapid consecutive attacks that cause fauna to bleed"].\n"+\
- "Both modes will build up existing bleed effects, doing a burst of high damage if the bleed is built up high enough.\n"+\
- "Transforming it immediately after an attack causes the next attack to come out faster."
-
-/obj/item/melee/transforming/cleaving_saw/transform_weapon(mob/living/user, supress_message_text)
- if(transform_cooldown > world.time)
- return FALSE
- . = ..()
- if(.)
- transform_cooldown = world.time + (CLICK_CD_MELEE * 0.5)
- user.changeNext_move(CLICK_CD_MELEE * 0.25)
-
-/obj/item/melee/transforming/cleaving_saw/transform_messages(mob/living/user, supress_message_text)
- if(!supress_message_text)
- if(active)
- to_chat(user, "You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.")
- else
- to_chat(user, "You close [src]. It will now attack rapidly and cause fauna to bleed.")
- playsound(user, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
-
-/obj/item/melee/transforming/cleaving_saw/clumsy_transform_effect(mob/living/user)
- if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
- to_chat(user, "You accidentally cut yourself with [src], like a doofus!")
- user.take_bodypart_damage(10)
-
-/obj/item/melee/transforming/cleaving_saw/melee_attack_chain(mob/user, atom/target, params)
- ..()
- if(!active)
- user.changeNext_move(CLICK_CD_MELEE * 0.5) //when closed, it attacks very rapidly
-
-/obj/item/melee/transforming/cleaving_saw/nemesis_effects(mob/living/user, mob/living/target)
- var/datum/status_effect/stacking/saw_bleed/B = target.has_status_effect(STATUS_EFFECT_SAWBLEED)
- if(!B)
- target.apply_status_effect(STATUS_EFFECT_SAWBLEED,bleed_stacks_per_hit)
- else
- B.add_stacks(bleed_stacks_per_hit)
-
-/obj/item/melee/transforming/cleaving_saw/attack(mob/living/target, mob/living/carbon/human/user)
- if(!active || swiping || !target.density || get_turf(target) == get_turf(user))
- if(!active)
- faction_bonus_force = 0
- ..()
- if(!active)
- faction_bonus_force = initial(faction_bonus_force)
- else
- var/turf/user_turf = get_turf(user)
- var/dir_to_target = get_dir(user_turf, get_turf(target))
- swiping = TRUE
- var/static/list/cleaving_saw_cleave_angles = list(0, -45, 45) //so that the animation animates towards the target clicked and not towards a side target
- for(var/i in cleaving_saw_cleave_angles)
- var/turf/T = get_step(user_turf, turn(dir_to_target, i))
- for(var/mob/living/L in T)
- if(user.Adjacent(L) && L.density)
- melee_attack_chain(user, L)
- swiping = FALSE
-
//Dragon
/obj/structure/closet/crate/necropolis/dragon
@@ -1205,7 +1072,7 @@
var/loot = rand(1,4)
switch(loot)
if(1)
- new /obj/item/melee/ghost_sword(src)
+ new /obj/item/melee/sword/claymore(src)
if(2)
new /obj/item/lava_staff(src)
if(3)
@@ -1213,91 +1080,6 @@
if(4)
new /obj/item/dragons_blood(src)
-/obj/item/melee/ghost_sword
- name = "\improper spectral blade"
- desc = "A rusted and dulled blade. It doesn't look like it'd do much damage. It glows weakly."
- icon_state = "spectral"
- item_state = "spectral"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- flags_1 = CONDUCT_1
- sharpness = IS_SHARP
- w_class = WEIGHT_CLASS_BULKY
- force = 1
- throwforce = 1
- hitsound = 'sound/effects/ghost2.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended")
- var/summon_cooldown = 0
- var/list/mob/dead/observer/spirits
-
-/obj/item/melee/ghost_sword/Initialize()
- . = ..()
- spirits = list()
- START_PROCESSING(SSobj, src)
- GLOB.poi_list |= src
- AddComponent(/datum/component/butchering, 150, 90)
-
-/obj/item/melee/ghost_sword/Destroy()
- for(var/mob/dead/observer/G in spirits)
- G.invisibility = GLOB.observer_default_invisibility
- spirits.Cut()
- STOP_PROCESSING(SSobj, src)
- GLOB.poi_list -= src
- . = ..()
-
-/obj/item/melee/ghost_sword/attack_self(mob/user)
- if(summon_cooldown > world.time)
- to_chat(user, "You just recently called out for aid. You don't want to annoy the spirits!")
- return
- to_chat(user, "You call out for aid, attempting to summon spirits to your side.")
-
- notify_ghosts("[user] is raising [user.p_their()] [src], calling for your help!",
- enter_link="(Click to help)",
- source = user, action=NOTIFY_ORBIT, ignore_key = POLL_IGNORE_SPECTRAL_BLADE, header = "Spectral blade")
-
- summon_cooldown = world.time + 300
-
-/obj/item/melee/ghost_sword/process()
- ghost_check()
-
-/obj/item/melee/ghost_sword/proc/ghost_check()
- var/ghost_counter = 0
- var/turf/T = get_turf(src)
- var/list/contents = T.GetAllContents()
- var/mob/dead/observer/current_spirits = list()
- for(var/thing in contents)
- var/atom/A = thing
- A.transfer_observers_to(src)
-
- for(var/i in orbiters?.orbiters)
- if(!isobserver(i))
- continue
- var/mob/dead/observer/G = i
- ghost_counter++
- G.invisibility = 0
- current_spirits |= G
-
- for(var/mob/dead/observer/G in spirits - current_spirits)
- G.invisibility = GLOB.observer_default_invisibility
-
- spirits = current_spirits
-
- return ghost_counter
-
-/obj/item/melee/ghost_sword/attack(mob/living/target, mob/living/carbon/human/user)
- force = 0
- var/ghost_counter = ghost_check()
-
- force = clamp((ghost_counter * 4), 0, 75)
- user.visible_message("[user] strikes with the force of [ghost_counter] vengeful spirits!")
- ..()
-
-/obj/item/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- var/ghost_counter = ghost_check()
- final_block_chance += clamp((ghost_counter * 5), 0, 75)
- owner.visible_message("[owner] is protected by a ring of [ghost_counter] ghosts!")
- return ..()
-
//Blood
/obj/item/dragons_blood
@@ -1767,11 +1549,9 @@
name = "puzzling chest"
/obj/structure/closet/crate/necropolis/puzzle/PopulateContents()
- var/loot = rand(1,3)
+ var/loot = rand(1,2)
switch(loot)
if(1)
- new /obj/item/soulstone/anybody(src)
- if(2)
new /obj/item/wisp_lantern(src)
- if(3)
+ if(2)
new /obj/item/prisoncube(src)
diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm
index 444e7299268..03401c46f58 100644
--- a/code/modules/mining/machine_silo.dm
+++ b/code/modules/mining/machine_silo.dm
@@ -35,6 +35,9 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
connected = null
+ return ..()
+
+/obj/machinery/ore_silo/on_deconstruction()
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
materials.retrieve_all()
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 15cde601689..5489b44aeb0 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -22,7 +22,6 @@
/obj/item/mining_scanner = 2,
/obj/item/t_scanner/adv_mining_scanner = 2,
/obj/item/hivelordstabilizer = 3,
- /obj/item/clothing/glasses/meson/gar = 2,
/obj/item/kinetic_crusher = 1,
/obj/item/gun/energy/kinetic_accelerator = 2,
/obj/item/pickaxe/silver = 1,
@@ -106,7 +105,6 @@
icon_state = "mining_voucher"
w_class = WEIGHT_CLASS_TINY
-
///Conscript kit
/obj/item/storage/backpack/duffelbag/mining_conscript
@@ -121,6 +119,6 @@
new /obj/item/clothing/suit/hooded/explorer(src)
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/gun/energy/kinetic_accelerator(src)
- new /obj/item/kitchen/knife/combat/survival(src)
+ new /obj/item/melee/knife/survival(src)
new /obj/item/flashlight/seclite(src)
new /obj/item/clothing/gloves/explorer(src)
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index cc2a9f176c7..2563e2644bf 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -13,7 +13,7 @@
mouse_opacity = MOUSE_OPACITY_ICON
faction = list("neutral")
a_intent = INTENT_HARM
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
move_to_delay = 10
health = 125
@@ -303,29 +303,5 @@
M.updatehealth()
qdel(src)
-//AI
-
-/obj/item/slimepotion/slime/sentience/mining
- name = "minebot AI upgrade"
- desc = "Can be used to grant sentience to minebots. It's incompatible with minebot armor and melee upgrades, and will override them."
- icon_state = "door_electronics"
- icon = 'icons/obj/module.dmi'
- sentience_type = SENTIENCE_MINEBOT
- custom_price = 1000
- var/base_health_add = 5 //sentient minebots are penalized for beign sentient; they have their stats reset to normal plus these values
- var/base_damage_add = 1 //this thus disables other minebot upgrades
- var/base_speed_add = 1
- var/base_cooldown_add = 10 //base cooldown isn't reset to normal, it's just added on, since it's not practical to disable the cooldown module
-
-/obj/item/slimepotion/slime/sentience/mining/after_success(mob/living/user, mob/living/simple_animal/SM)
- if(istype(SM, /mob/living/simple_animal/hostile/mining_drone))
- var/mob/living/simple_animal/hostile/mining_drone/M = SM
- M.maxHealth = initial(M.maxHealth) + base_health_add
- M.melee_damage_lower = initial(M.melee_damage_lower) + base_damage_add
- M.melee_damage_upper = initial(M.melee_damage_upper) + base_damage_add
- M.move_to_delay = initial(M.move_to_delay) + base_speed_add
- if(M.stored_gun)
- M.stored_gun.overheat_time += base_cooldown_add
-
#undef MINEDRONE_COLLECT
#undef MINEDRONE_ATTACK
diff --git a/code/modules/mining/ore_veins.dm b/code/modules/mining/ore_veins.dm
index cfd908c23cb..fa497b44a32 100644
--- a/code/modules/mining/ore_veins.dm
+++ b/code/modules/mining/ore_veins.dm
@@ -10,6 +10,8 @@ GLOBAL_LIST_EMPTY(ore_veins)
move_resist = INFINITY
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ //Whether the mining scanner is able to locate this vein.
+ var/detectable = TRUE
var/mining_charges = 6
//Classification of the quality of possible ores within a vein
//Used to determine difficulty & ore amounts
@@ -40,8 +42,8 @@ GLOBAL_LIST_EMPTY(ore_veins)
var/max_mobs = 6
var/spawn_time = 150 //15 seconds
var/mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 60,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 20,
+ /mob/living/simple_animal/hostile/asteroid/goliath/beast/nest = 60,
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest = 20,
/mob/living/simple_animal/hostile/asteroid/brimdemon = 20,
)
var/spawn_text = "emerges from"
@@ -70,11 +72,16 @@ GLOBAL_LIST_EMPTY(ore_veins)
else
ore_type_amount = 1
for(var/ore_count in 1 to ore_type_amount)
- var/picked = pickweight(ore_list)
+ var/picked = pick_weight(ore_list)
vein_contents.Add(picked)
ore_list.Remove(picked)
GLOB.ore_veins += src
+/obj/structure/vein/examine(mob/user)
+ . = ..()
+ if(!detectable)
+ . += span_notice("This vein has been marked as a site of no interest, and will not show up on deep core scans.")
+
/obj/structure/vein/Destroy()
GLOB.ore_veins -= src
return ..()
@@ -105,6 +112,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
/obj/structure/vein/proc/toggle_spawning()
spawning_started = SEND_SIGNAL(src, COMSIG_SPAWNER_TOGGLE_SPAWNING, spawning_started)
+
//
// Planetary and Class Subtypes
// The current set of subtypes are heavily subject to future balancing and reworking as the balance of them is tested more
@@ -126,11 +134,11 @@ GLOBAL_LIST_EMPTY(ore_veins)
max_mobs = 6
spawn_time = 100
mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 60,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 30,
+ /mob/living/simple_animal/hostile/asteroid/goliath/beast/nest = 60,
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest = 30,
/mob/living/simple_animal/hostile/asteroid/brimdemon = 20,
/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient = 5,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf/tendril = 5,
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf/nest = 5,
)
/obj/structure/vein/classthree
@@ -149,18 +157,18 @@ GLOBAL_LIST_EMPTY(ore_veins)
max_mobs = 6 //Best not to go past 6 due to balance and lag reasons
spawn_time = 80
mob_types = list(
- /mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril = 60,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril = 30,
+ /mob/living/simple_animal/hostile/asteroid/goliath/beast/nest = 60,
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest = 30,
/mob/living/simple_animal/hostile/asteroid/brimdemon = 20,
/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient = 10,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf/tendril = 10,
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf/nest = 10,
)
/obj/structure/vein/ice
mob_types = list(
/mob/living/simple_animal/hostile/asteroid/wolf = 30,
/mob/living/simple_animal/hostile/asteroid/polarbear = 30,
- /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/tendril = 20,
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/nest = 20,
/mob/living/simple_animal/hostile/asteroid/ice_demon = 10,
/mob/living/simple_animal/hostile/asteroid/ice_whelp = 5,
/mob/living/simple_animal/hostile/asteroid/lobstrosity = 20,
diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm
index ef0e5193082..6c733fd7669 100644
--- a/code/modules/mining/shelters.dm
+++ b/code/modules/mining/shelters.dm
@@ -8,7 +8,7 @@
/datum/map_template/shelter/New()
. = ..()
- banned_areas = typecacheof(/area/shuttle)
+ banned_areas = typecacheof(/area/ship)
blacklisted_turfs = typecacheof(list(/turf/closed, /turf/open/indestructible))
whitelisted_turfs = typecacheof(/turf/closed/mineral)
banned_objects = typecacheof(/obj/structure/stone_tile)
diff --git a/code/modules/mob/camera/camera.dm b/code/modules/mob/camera/camera.dm
index 7d5bd8b4286..170cb25b49c 100644
--- a/code/modules/mob/camera/camera.dm
+++ b/code/modules/mob/camera/camera.dm
@@ -1,4 +1,4 @@
-// Camera mob, used by AI camera and blob.
+// Camera mob, used by AI camera.
/mob/camera
name = "camera mob"
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 85c60a15b03..490efbbabef 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -96,18 +96,17 @@ INITIALIZE_IMMEDIATE(/mob/dead)
return
/mob/dead/Destroy()
- for(var/level in SSmobs.dead_players_by_virtual_z)
- LAZYREMOVEASSOC(SSmobs.dead_players_by_virtual_z, level, src)
- // Forgive me for this one. This loop can be replaced by the line below by the one brave enough to fix
- // observers not cleanly removing themselves from the dead_players_by_virtual_z /list when they should
- //LAZYREMOVEASSOC(SSmobs.dead_players_by_virtual_z, "[virtual_z()]", src)
+ //Observers should no longer be duplicating themselves across virtual z so it SHOULD be fine to only check its virtual z.
+ LAZYREMOVEASSOC(SSmobs.dead_players_by_virtual_z, "[virtual_z()]", src)
return ..()
/mob/dead/Login()
. = ..()
if(!client)
return
- LAZYADDASSOCLIST(SSmobs.dead_players_by_virtual_z, "[virtual_z()]", src)
+ var/virt_z = virtual_z()
+ if(virt_z)
+ LAZYADDASSOCLIST(SSmobs.dead_players_by_virtual_z, "[virt_z]", src)
/mob/dead/Logout()
. = ..()
diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm
index 5c47ccd6d52..29573693cb3 100644
--- a/code/modules/mob/dead/new_player/login.dm
+++ b/code/modules/mob/dead/new_player/login.dm
@@ -34,9 +34,9 @@
var/required_living_minutes = CONFIG_GET(number/panic_bunker_living)
var/living_minutes = client.get_exp_living(TRUE)
if (required_living_minutes > living_minutes)
- client.interviewee = TRUE
register_for_interview()
return
+ client.interviewee = FALSE
new_player_panel()
if(SSticker.current_state < GAME_STATE_SETTING_UP)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 8fbf9c32a38..d88c8368a82 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -35,6 +35,7 @@
. = ..()
GLOB.new_player_list += src
+ SSpoints_of_interest.make_point_of_interest(src)
/mob/dead/new_player/Destroy()
GLOB.new_player_list -= src
@@ -129,10 +130,10 @@
return
if(src != usr)
- return 0
+ return FALSE
if(!client)
- return 0
+ return FALSE
if(client.interviewee)
return FALSE
@@ -344,6 +345,7 @@
log_manifest(character.mind.key, character.mind, character, TRUE)
+ SSblackbox.record_feedback("tally", "player_joined_faction", 1, ship.get_faction())
if(length(ship.job_slots) > 1 && ship.job_slots[1] == job) // if it's the "captain" equivalent job of the ship. checks to make sure it's not a one-job ship
minor_announce("[job.name] [character.real_name] on deck!", zlevel = ship.shuttle_port.virtual_z())
return TRUE
@@ -431,7 +433,7 @@
mind.active = FALSE //we wish to transfer the key manually
mind.original_character_slot_index = client.prefs.default_slot
mind.transfer_to(H) //won't transfer key since the mind is not active
- mind.set_original_character(H)
+ H.mind.set_original_character(H)
H.name = real_name
client.init_verbs()
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index cc5a69dd095..71b66ac54fb 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -52,7 +52,9 @@
var/random_species_type = GLOB.species_list[pick(GLOB.roundstart_races)]
pref_species = new random_species_type
if(randomise[RANDOM_NAME])
- real_name = pref_species.random_name(gender,1)
+ real_name = pref_species.random_name(gender, TRUE)
+ if(randomise[RANDOM_AGE])
+ age = rand(pref_species.species_age_min, pref_species.species_age_max)
/datum/preferences/proc/update_preview_icon(show_gear = TRUE, show_loadout = FALSE)
// Set up the dummy for its photoshoot
diff --git a/code/modules/mob/dead/new_player/ship_select.dm b/code/modules/mob/dead/new_player/ship_select.dm
index fe88abdf339..dd60c13ce2c 100644
--- a/code/modules/mob/dead/new_player/ship_select.dm
+++ b/code/modules/mob/dead/new_player/ship_select.dm
@@ -100,7 +100,8 @@
to_chat(spawnee, "There was an error loading the ship. Please contact admins!")
spawnee.new_player_panel()
return
- SSblackbox.record_feedback("tally", "ship_purchased", 1, template.name) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.record_feedback("tally", "ship_purchased", 1, template.name)
+ SSblackbox.record_feedback("tally", "faction_ship_purchased", 1, template.faction_datum.name)
// Try to spawn as the first listed job in the job slots (usually captain)
// Playtime checks are overridden, to ensure the player gets to join the ship they spawned.
if(!spawnee.AttemptLateSpawn(target.job_slots[1], target, FALSE))
@@ -166,7 +167,7 @@
continue
var/list/ship_data = list(
"name" = T.name,
- "faction" = ship_prefix_to_faction(T.prefix),
+ "faction" = T.faction_name,
"desc" = T.description,
"tags" = T.tags,
"crewCount" = length(T.job_slots),
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/elzuose.dm b/code/modules/mob/dead/new_player/sprite_accessories/elzuose.dm
index 58317b5ab91..9a15f0270fd 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/elzuose.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/elzuose.dm
@@ -37,6 +37,18 @@
name = "Sharp"
icon_state = "sharp"
+/datum/sprite_accessory/elzu_horns/cervid
+ name = "Cervid"
+ icon_state = "cervid"
+
+/datum/sprite_accessory/elzu_horns/prong
+ name = "Prong"
+ icon_state = "prong"
+
+/datum/sprite_accessory/elzu_horns/brow
+ name = "Brow"
+ icon_state = "brow"
+
//Start tails
/datum/sprite_accessory/tails/elzu
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
index 34d8dd27466..86f1b281b59 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
@@ -90,29 +90,21 @@
name = "Bowlcut 2"
icon_state = "hair_bowlcut2"
-/datum/sprite_accessory/hair/braid
- name = "Braid (Floorlength)"
- icon_state = "hair_braid"
-
-/datum/sprite_accessory/hair/braided
- name = "Braided"
- icon_state = "hair_braided"
-
-/datum/sprite_accessory/hair/front_braid
- name = "Braided Front"
- icon_state = "hair_braidfront"
-
-/datum/sprite_accessory/hair/not_floorlength_braid
- name = "Braid (High)"
+/datum/sprite_accessory/hair/ponytail_braided
+ name = "Ponytail (Braided)"
icon_state = "hair_braid2"
-/datum/sprite_accessory/hair/lowbraid
- name = "Braid (Low)"
- icon_state = "hair_hbraid"
+/datum/sprite_accessory/hair/ponytail_braided_short
+ name = "Ponytail (Braided Short)"
+ icon_state = "hair_braid"
+
+/datum/sprite_accessory/hair/ponytail_straight
+ name = "Ponytail (Straight)"
+ icon_state = "hair_longstraightponytail"
-/datum/sprite_accessory/hair/shortbraid
- name = "Braid (Short)"
- icon_state = "hair_shortbraid"
+/datum/sprite_accessory/hair/ponytail_straight_short
+ name = "Ponytail (Straight Short)"
+ icon_state = "hair_highponytail"
/datum/sprite_accessory/hair/braidtail
name = "Braided Tail"
@@ -503,12 +495,8 @@
icon_state = "hair_ponytail"
/datum/sprite_accessory/hair/ponytail2
- name = "Ponytail 2"
- icon_state = "hair_ponytail2"
-
-/datum/sprite_accessory/hair/ponytail3
- name = "Ponytail 3"
- icon_state = "hair_ponytail3"
+ name = "Ponytail (Grace)"
+ icon_state = "hair_ponytailgrace"
/datum/sprite_accessory/hair/ponytail4
name = "Ponytail 4"
@@ -526,21 +514,14 @@
name = "Ponytail 7"
icon_state = "hair_ponytail7"
-/datum/sprite_accessory/hair/highponytail
- name = "Ponytail (High)"
- icon_state = "hair_highponytail"
/datum/sprite_accessory/hair/stail
name = "Ponytail (Short)"
icon_state = "hair_stail"
-/datum/sprite_accessory/hair/longponytail
- name = "Ponytail (Long)"
- icon_state = "hair_longstraightponytail"
-
/datum/sprite_accessory/hair/countryponytail
name = "Ponytail (Country)"
- icon_state = "hair_country"
+ icon_state = "hair_ponytailcountry"
/datum/sprite_accessory/hair/fringetail
name = "Ponytail (Fringe)"
@@ -722,6 +703,10 @@
name = "Ruby"
icon_state = "hair_ruby"
+/datum/sprite_accessory/hair/rubylong
+ name = "Ruby (Long)"
+ icon_state = "hair_rubylong"
+
/datum/sprite_accessory/hair/undercut
name = "Undercut"
icon_state = "hair_undercut"
@@ -821,3 +806,7 @@
/datum/sprite_accessory/hair_gradient/long_fade_down
name = "Long Fade Down"
icon_state = "long_fade_down"
+
+/datum/sprite_accessory/hair_gradient/splotches
+ name = "Splotches"
+ icon_state = "splotches"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 6fffc48e76a..e79427f2381 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -62,14 +62,16 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
var/datum/orbit_menu/orbit_menu
var/datum/spawners_menu/spawners_menu
+ // The POI we're orbiting (orbit menu)
+ var/orbiting_ref
+
/mob/dead/observer/Initialize()
set_invisibility(GLOB.observer_default_invisibility)
add_verb(src, list(
/mob/dead/observer/proc/dead_tele,
/mob/dead/observer/proc/open_spawners_menu,
- /mob/dead/observer/proc/tray_view,
- /mob/dead/observer/proc/possess_mouse_verb))
+ /mob/dead/observer/proc/tray_view))
if(icon_state in GLOB.ghost_forms_with_directions_list)
ghostimage_default = image(src.icon,src,src.icon_state + "_nodir")
@@ -143,6 +145,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
. = ..()
+ SSpoints_of_interest.make_point_of_interest(src)
+
grant_all_languages()
show_data_huds()
data_huds_on = 1
@@ -500,7 +504,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/list/dest = list() //List of possible destinations (mobs)
var/target = null //Chosen target.
- dest += getpois(mobs_only = TRUE) //Fill list, prompt user with list
+ dest += SSpoints_of_interest.get_mob_pois()
target = input("Please, select a player!", "Jump to Mob", null, null) as null|anything in dest
if (!target)//Make sure we actually have a target
@@ -840,20 +844,24 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/reset_perspective(atom/A)
if(client)
if(ismob(client.eye) && (client.eye != src))
- var/mob/target = client.eye
- observetarget = null
- if(target.observers)
- LAZYREMOVE(target.observers, src)
+ cleanup_observe()
if(..())
if(hud_used)
client.screen = list()
hud_used.show_hud(hud_used.hud_version)
+/mob/dead/observer/proc/cleanup_observe()
+ var/mob/target = client.eye
+ observetarget = null
+ client?.perspective = initial(client.perspective)
+ if(target.observers)
+ LAZYREMOVE(target.observers, src)
+
/mob/dead/observer/verb/observe()
set name = "Observe"
set category = "Ghost"
- var/list/creatures = getpois()
+ var/list/creatures = SSpoints_of_interest.get_mob_pois()
reset_perspective(null)
@@ -901,8 +909,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/examine_more(mob/user)
if(!isAdminObserver(user))
return ..()
- . = list("You examine [src] closer, and note the following...")
- . += list("\t>[ADMIN_FULLMONTY(src)]")
+ . += "You examine [src] closer, and note the following..."
+ . += "\t>[ADMIN_FULLMONTY(src)]"
/mob/dead/observer/proc/set_invisibility(value)
invisibility = value
@@ -962,70 +970,3 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
client.images += t_ray_images
else
client.images -= stored_t_ray_images
-
-//WS Begin
-/mob/dead/observer/proc/possess_mouse_verb()
- set category = "Ghost"
- set name = "Possess a mouse"
- set desc = "Possess a mouse to haunt the station.... and their food!"
-
- var/list/possessible = list()
-
- for(var/mob/living/simple_animal/mouse/M in GLOB.alive_mob_list)
- if(M.stat != CONSCIOUS)
- continue
- if(M.key)
- continue
- if(M in GLOB.player_list)
- continue
- if(M.mind)
- continue
-
- possessible += M
-
- if(!possessible.len)
- to_chat(src, "There are currently no mice able to be possessed!")
- return FALSE
-
- var/mob/living/simple_animal/mouse/M = pick(possessible)
-
- possess_mouse(M)
-
-
-/mob/dead/observer/proc/possess_mouse(mob/living/simple_animal/mouse/M)
- if(!M)
- return FALSE
-
- if(!SSticker.HasRoundStarted())
- to_chat(usr, "The round hasn't started yet!")
- return FALSE
-
- if(is_banned_from(key, ROLE_SENTIENCE))
- to_chat(src, "You are job banned!")
- return FALSE
-
- if(alert("Are you sure you want to become a mouse? (Warning, you can no longer be cloned!)",,"Yes","No") != "Yes")
- return FALSE
-
- if(M.key || (M.stat != CONSCIOUS) || (M in GLOB.player_list) || M.mind || QDELETED(src) || QDELETED(M))
- to_chat(src, "This mouse is unable to be controlled, please try again!")
- return FALSE
-
- log_game("[key_name(src)] has became a mouse")
-
- M.key = key
- M.faction = list("neutral")
- M.chew_probability = 0 //so they cant pull off a big brain play by ghosting somewhere or idk
- M.layer = BELOW_OPEN_DOOR_LAYER //ENGAGE ADVANCED HIDING BRAIN FUNCTIONS
- M.language_holder = new /datum/language_holder/mouse(M)
- M.pass_flags |= PASSDOORHATCH
- M.sentience_act()
- M.maxHealth = 15
- M.health = M.maxHealth
-
- to_chat(M , "You are now possessing a mouse. \
- You do not remember your previous life. You can eat trash and \
- food on the floor to gain health and help create new mice. Mouse traps will hurt your fragile body \
- and so will any kind of weapons. You can control click food and trash items in order to eat them. Get. That. Cheese.")
- return TRUE
-//WS End
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 86d54577538..051faa5beda 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -1,6 +1,9 @@
/datum/orbit_menu
+ ///mobs worth orbiting. Because spaghetti, all mobs have the point of interest, but only some are allowed to actually show up.
+ ///this obviously should be changed in the future, so we only add mobs as POI if they actually are interesting, and we don't use
+ ///a typecache.
+ var/static/list/mob_allowed_typecache
var/mob/dead/observer/owner
- var/auto_observe = FALSE
/datum/orbit_menu/New(mob/dead/observer/new_owner)
if(!istype(new_owner))
@@ -23,87 +26,243 @@
switch(action)
if ("orbit")
var/ref = params["ref"]
- var/atom/movable/poi = (locate(ref) in GLOB.mob_list) || (locate(ref) in GLOB.poi_list)
- if (poi == null)
- . = TRUE
- return
+ var/auto_observe = params["auto_observe"]
+ var/atom/movable/poi = SSpoints_of_interest.get_poi_atom_by_ref(ref)
+
+ if((ismob(poi) && !SSpoints_of_interest.is_valid_poi(poi, CALLBACK(src, PROC_REF(validate_mob_poi)))) \
+ || !SSpoints_of_interest.is_valid_poi(poi)
+ )
+ to_chat(usr, span_notice("That point of interest is no longer valid."))
+ return TRUE
+
+ var/mob/dead/observer/user = usr
owner.ManualFollow(poi)
owner.reset_perspective(null)
+ user.orbiting_ref = ref
if (auto_observe)
owner.do_observe(poi)
. = TRUE
if ("refresh")
update_static_data(owner, ui)
. = TRUE
- if ("toggle_observe")
- auto_observe = !auto_observe
- if (auto_observe && owner.orbit_target)
- owner.do_observe(owner.orbit_target)
- else
- owner.reset_perspective(null)
+
/datum/orbit_menu/ui_data(mob/user)
var/list/data = list()
- data["auto_observe"] = auto_observe
+
+ if(isobserver(user))
+ data["orbiting"] = get_currently_orbiting(user)
+
return data
/datum/orbit_menu/ui_static_data(mob/user)
- var/list/data = list()
+ var/list/new_mob_pois = SSpoints_of_interest.get_mob_pois(CALLBACK(src, PROC_REF(validate_mob_poi)), append_dead_role = FALSE)
+ var/list/new_other_pois = SSpoints_of_interest.get_other_pois()
var/list/alive = list()
var/list/antagonists = list()
+ var/list/critical = list()
var/list/dead = list()
var/list/ghosts = list()
var/list/misc = list()
var/list/npcs = list()
+ var/list/ships = list()
- var/list/pois = getpois(skip_mindless = TRUE, specify_dead_role = FALSE)
- for (var/name in pois)
+ for(var/name in new_mob_pois)
var/list/serialized = list()
- serialized["name"] = name
-
- var/poi = pois[name]
-
- serialized["ref"] = REF(poi)
-
- var/mob/M = poi
- if (istype(M))
- if (isobserver(M))
- ghosts += list(serialized)
- else if (M.stat == DEAD)
- dead += list(serialized)
- else if (M.mind == null)
- npcs += list(serialized)
- else
- var/number_of_orbiters = M.orbiters?.orbiters?.len
- if (number_of_orbiters)
- serialized["orbiters"] = number_of_orbiters
-
- var/datum/mind/mind = M.mind
- var/was_antagonist = FALSE
-
- for (var/_A in mind.antag_datums)
- var/datum/antagonist/A = _A
- if (A.show_to_ghosts)
- was_antagonist = TRUE
- serialized["antag"] = A.name
- antagonists += list(serialized)
- break
-
- if (!was_antagonist)
- alive += list(serialized)
+ var/mob/mob_poi = new_mob_pois[name]
+ var/number_of_orbiters = length(mob_poi.get_all_orbiters())
+
+ if(isnewplayer(mob_poi))
+ continue
+
+ serialized["ref"] = REF(mob_poi)
+ serialized["full_name"] = mob_poi.name
+ serialized["job"] = mob_poi.job
+ if(number_of_orbiters)
+ serialized["orbiters"] = number_of_orbiters
+
+ if(isobserver(mob_poi))
+ ghosts += list(serialized)
+ continue
+
+ if(mob_poi.stat == DEAD)
+ dead += list(serialized)
+ continue
+
+ if(isnull(mob_poi.mind))
+ if(isliving(mob_poi))
+ var/mob/living/npc = mob_poi
+ serialized["health"] = FLOOR((npc.health / npc.maxHealth * 100), 1)
+
+ npcs += list(serialized)
+ continue
+
+ serialized["client"] = !!mob_poi.client
+ serialized["name"] = mob_poi.real_name
+
+ if(isliving(mob_poi))
+ serialized += get_living_data(mob_poi)
+
+ var/list/antag_data = get_antag_data(mob_poi.mind)
+ if(length(antag_data))
+ serialized += antag_data
+ antagonists += list(serialized)
+ continue
+
+ alive += list(serialized)
+
+ for(var/name in new_other_pois)
+ var/atom/atom_poi = new_other_pois[name]
+
+ var/list/other_data = get_misc_data(atom_poi)
+ var/misc_data = list(other_data[1])
+
+ if(istype(atom_poi, /obj/machinery/computer/helm))
+ ships += misc_data
else
- misc += list(serialized)
-
- data["alive"] = alive
- data["antagonists"] = antagonists
- data["dead"] = dead
- data["ghosts"] = ghosts
- data["misc"] = misc
- data["npcs"] = npcs
- return data
+ misc += misc_data
+
+ if(other_data[2]) // Critical = TRUE
+ critical += misc_data
+
+ return list(
+ "alive" = alive,
+ "antagonists" = antagonists,
+ "critical" = critical,
+ "dead" = dead,
+ "ghosts" = ghosts,
+ "misc" = misc,
+ "npcs" = npcs,
+ "ships" = ships,
+ )
/datum/orbit_menu/ui_assets()
. = ..() || list()
. += get_asset_datum(/datum/asset/simple/orbit)
+/// Helper function to get threat type, group, overrides for job and icon
+/datum/orbit_menu/proc/get_antag_data(datum/mind/poi_mind) as /list
+ var/list/serialized = list()
+
+ for(var/datum/antagonist/antag as anything in poi_mind.antag_datums)
+ if(!antag.show_to_ghosts)
+ continue
+
+ serialized["antag"] = antag.name
+ serialized["antag_group"] = antag.antagpanel_category
+ serialized["job"] = antag.name
+ serialized["icon"] = antag.antag_hud_name
+
+ return serialized
+
+/// Helper to get the current thing we're orbiting (if any)
+/datum/orbit_menu/proc/get_currently_orbiting(mob/dead/observer/user)
+ if(isnull(user.orbiting_ref))
+ return
+
+ var/atom/poi = SSpoints_of_interest.get_poi_atom_by_ref(user.orbiting_ref)
+ if(isnull(poi))
+ user.orbiting_ref = null
+ return
+
+ if((ismob(poi) && !SSpoints_of_interest.is_valid_poi(poi, CALLBACK(src, PROC_REF(validate_mob_poi)))) \
+ || !SSpoints_of_interest.is_valid_poi(poi)
+ )
+ user.orbiting_ref = null
+ return
+
+ var/list/serialized = list()
+
+ if(!ismob(poi))
+ var/list/misc_info = get_misc_data(poi)
+ serialized += misc_info[1]
+ return serialized
+
+ var/mob/mob_poi = poi
+ serialized["full_name"] = mob_poi.name
+ serialized["ref"] = REF(poi)
+
+ if(mob_poi.mind)
+ serialized["client"] = !!mob_poi.client
+ serialized["name"] = mob_poi.real_name
+
+ if(isliving(mob_poi))
+ serialized += get_living_data(mob_poi)
+
+ return serialized
+
+/// Helper function to get job / icon / health data for a living mob
+/datum/orbit_menu/proc/get_living_data(mob/living/player) as /list
+ var/list/serialized = list()
+
+ serialized["health"] = FLOOR((player.health / player.maxHealth * 100), 1)
+
+ return serialized
+
+
+/// Gets a list: Misc data and whether it's critical. Handles all snowflakey type cases
+/datum/orbit_menu/proc/get_misc_data(atom/movable/atom_poi) as /list
+ var/list/misc = list()
+ var/critical = FALSE
+
+ misc["ref"] = REF(atom_poi)
+ misc["full_name"] = atom_poi.name
+
+ // Display the nuke timer
+ if(istype(atom_poi, /obj/machinery/nuclearbomb))
+ var/obj/machinery/nuclearbomb/bomb = atom_poi
+
+ if(bomb.timing)
+ misc["extra"] = "Timer: [bomb.countdown?.displayed_text]s"
+ critical = TRUE
+
+ return list(misc, critical)
+
+ // Display the holder if its a nuke disk
+ if(istype(atom_poi, /obj/item/disk/nuclear))
+ var/obj/item/disk/nuclear/disk = atom_poi
+ var/mob/holder = disk.pulledby || get(disk, /mob)
+ misc["extra"] = "Location: [holder?.real_name || "Unsecured"]"
+
+ return list(misc, critical)
+
+ // Display singuloths if they exist
+ if(istype(atom_poi, /obj/singularity))
+ var/obj/singularity/singulo = atom_poi
+ misc["extra"] = "Energy: [round(singulo.energy)]"
+
+ if(singulo.current_size > 2)
+ critical = TRUE
+
+ return list(misc, critical)
+
+ if(istype(atom_poi, /obj/machinery/computer/helm))
+ var/obj/machinery/computer/helm/helm_poi = atom_poi
+ if(helm_poi.current_ship)
+ misc["extra"] = "Ship: [helm_poi.current_ship.name]"
+
+ return list(misc, critical)
+
+ return list(misc, critical)
+
+/**
+ * Helper POI validation function passed as a callback to various SSpoints_of_interest procs.
+ *
+ * Provides extended validation above and beyond standard, limiting mob POIs without minds or ckeys
+ * unless they're mobs, camera mobs or megafauna. Also allows exceptions for mobs that are deadchat controlled.
+ *
+ * If they satisfy that requirement, falls back to default validation for the POI.
+ */
+/datum/orbit_menu/proc/validate_mob_poi(datum/point_of_interest/mob_poi/potential_poi)
+ var/mob/potential_mob_poi = potential_poi.target
+ if(!potential_mob_poi.mind && !potential_mob_poi.ckey)
+ if(!mob_allowed_typecache)
+ mob_allowed_typecache = typecacheof(list(
+ /mob/living/simple_animal/hostile/megafauna,
+ /mob/living/simple_animal/hostile/boss
+ ))
+ if(!is_type_in_typecache(potential_mob_poi, mob_allowed_typecache) && !potential_mob_poi.GetComponent(/datum/component/deadchat_control))
+ return FALSE
+
+ return potential_poi.validate()
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 0840ee37215..0e4a8ed748c 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -25,6 +25,22 @@
to_chat(src, "Unusable emote '[act]'. Say *help for a list.")
return FALSE
+/mob/proc/force_scream()
+ if(HAS_TRAIT(src, TRAIT_ANALGESIA))
+ return
+ if(HAS_TRAIT(src, TRAIT_PAIN_RESIST))
+ emote("gasp")
+ return
+ emote("scream")
+
+/mob/proc/force_manual_scream()
+ if(HAS_TRAIT(src, TRAIT_ANALGESIA))
+ return
+ if(HAS_TRAIT(src, TRAIT_PAIN_RESIST))
+ manual_emote("gasp")
+ return
+ manual_emote("scream")
+
/datum/emote/flip
key = "flip"
key_third_person = "flips"
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 1910347e4fd..8e2962e70d2 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -51,19 +51,31 @@
if(BLOOD_VOLUME_MAXIMUM to BLOOD_VOLUME_EXCESS)
if(prob(10))
to_chat(src, "You feel terribly bloated.")
+
if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
- if(prob(5))
+
+ if(prob(1))
to_chat(src, "You feel [word].")
- adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.01, 1))
+ if(oxyloss < 20)
+ adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1))
+
if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
- adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1))
- if(prob(5))
- blur_eyes(6)
+ if(eye_blurry < 50)
+ adjust_blurriness(5)
+ if(oxyloss < 40)
+ adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1))
+ else
+ adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.01, 1))
+
+ if(prob(15))
+ Unconscious(rand(2 SECONDS,6 SECONDS))
to_chat(src, "You feel very [word].")
+
if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
- adjustOxyLoss(5)
+ adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1))
+ adjustToxLoss(2)
if(prob(15))
- Unconscious(rand(20,60))
+ Unconscious(rand(2 SECONDS,6 SECONDS))
to_chat(src, "You feel extremely [word].")
if(-INFINITY to BLOOD_VOLUME_SURVIVE)
if(!HAS_TRAIT(src, TRAIT_NODEATH))
@@ -81,25 +93,76 @@
BP.adjust_bleeding(0.1, BLOOD_LOSS_DAMAGE_MAXIMUM)
limb_bleed += BP.bleeding
+ var/message_cooldown = 5 SECONDS
+ var/bleeeding_wording
+// var/bleed_change_wording
+ switch(limb_bleed)
+ if(0 to 0.5)
+ bleeeding_wording = "You hear droplets of blood drip down."
+ message_cooldown *= 2.5
+ if(0.5 to 1)
+ bleeeding_wording = "You feel your blood flow quietly to the floor."
+ message_cooldown *= 2
+ if(1 to 2)
+ bleeeding_wording = "The flow of blood leaving your body onto the ground is worrying..."
+ message_cooldown *= 1.7
+ if(2 to 4)
+ bleeeding_wording = "You're losing blood very fast, which is freaking you out!"
+ message_cooldown *= 1.5
+ if(4 to INFINITY)
+ bleeeding_wording = "Your heartbeat beats unstably fast as you lose a massive amount of blood!!"
+
if(limb_bleed && !bleedsuppress && !HAS_TRAIT(src, TRAIT_FAKEDEATH))
bleed(limb_bleed)
+ if(!blood_particle)
+ blood_particle = new(src, /particles/droplets/blood, PARTICLE_ATTACH_MOB)
+ blood_particle.particles.color = dna.blood_type.color //mouthful
+ blood_particle.particles.spawning = (limb_bleed/2)
+ blood_particle.particles.count = (round(clamp((limb_bleed * 2), 1, INFINITY)))
+
+ if(COOLDOWN_FINISHED(src, bloodloss_message) && bleeeding_wording)
+ to_chat(src, span_warning("[bleeeding_wording]"))
+ COOLDOWN_START(src, bloodloss_message, message_cooldown)
+ else
+ if(blood_particle)
+ QDEL_NULL(blood_particle)
+
//Makes a blood drop, leaking amt units of blood from the mob
/mob/living/carbon/proc/bleed(amt)
if(blood_volume)
blood_volume = max(blood_volume - amt, 0)
if (prob(sqrt(amt)*BLOOD_DRIP_RATE_MOD))
if(isturf(src.loc) && !isgroundlessturf(src.loc)) //Blood loss still happens in locker, floor stays clean
- if(amt >= 10)
- add_splatter_floor(src.loc)
+ if(amt >= 2)
+ add_splatter_floor(src.loc, amt = amt)
else
- add_splatter_floor(src.loc, 1)
+ add_splatter_floor(src.loc, TRUE, amt)
/mob/living/carbon/human/bleed(amt)
amt *= physiology.bleed_mod
if(!(NOBLOOD in dna.species.species_traits))
..()
+/**
+ * This proc is a helper for spraying blood for things like slashing/piercing wounds and dismemberment.
+ *
+ * The strength of the splatter in the second argument determines how much it can dirty and how far it can go
+ *
+ * Arguments:
+ * * splatter_direction: Which direction the blood is flying
+ * * splatter_strength: How many tiles it can go, and how many items it can pass over and dirty
+ */
+/mob/living/carbon/proc/spray_blood(splatter_direction, splatter_strength = 3)
+ if(!isturf(loc))
+ return
+ var/obj/effect/decal/cleanable/blood/hitsplatter/our_splatter = new(loc)
+
+// our_splatter.transfer_mob_blood_dna(return_blood_DNA(src))
+ our_splatter.blood_dna_info = get_blood_dna_list()
+ our_splatter.transfer_mob_blood_dna(src)
+ var/turf/targ = get_ranged_target_turf(src, splatter_direction, splatter_strength)
+ INVOKE_ASYNC(our_splatter, TYPE_PROC_REF(/obj/effect/decal/cleanable/blood/hitsplatter, fly_towards), targ, splatter_strength)
/mob/living/proc/restore_blood()
@@ -229,13 +292,14 @@
return blood_type.color
//to add a splatter of blood or other mob liquid.
-/mob/living/proc/add_splatter_floor(turf/T, small_drip)
+/mob/living/proc/add_splatter_floor(turf/T, small_drip, amt)
if(get_blood_id() != /datum/reagent/blood)
return
if(!T)
T = get_turf(src)
var/list/temp_blood_DNA
+
if(small_drip)
// Only a certain number of drips (or one large splatter) can be on a given turf.
var/obj/effect/decal/cleanable/blood/drip/drop = locate() in T
@@ -248,7 +312,7 @@
else
temp_blood_DNA = drop.return_blood_DNA() //we transfer the dna from the drip to the splatter
qdel(drop)//the drip is replaced by a bigger splatter
- else
+ else if (amt < 2)
drop = new(T, get_static_viruses())
drop.transfer_mob_blood_dna(src)
return
@@ -261,7 +325,11 @@
B = candidate
break
if(!B)
- B = new /obj/effect/decal/cleanable/blood/splatter(T, get_static_viruses())
+ if(amt > 4)
+ B = new /obj/effect/decal/cleanable/blood(T, get_static_viruses())
+ else
+ B = new /obj/effect/decal/cleanable/blood/splatter(T, get_static_viruses())
+
if(QDELETED(B)) //Give it up
return
B.bloodiness = min((B.bloodiness + BLOOD_AMOUNT_PER_DECAL), BLOOD_POOL_MAX)
@@ -269,11 +337,11 @@
if(temp_blood_DNA)
B.add_blood_DNA(temp_blood_DNA)
-/mob/living/carbon/human/add_splatter_floor(turf/T, small_drip)
+/mob/living/carbon/human/add_splatter_floor(turf/T, small_drip, amt)
if(!(NOBLOOD in dna.species.species_traits))
..()
-/mob/living/carbon/alien/add_splatter_floor(turf/T, small_drip)
+/mob/living/carbon/alien/add_splatter_floor(turf/T, small_drip, amt)
if(!T)
T = get_turf(src)
var/obj/effect/decal/cleanable/xenoblood/B = locate() in T.contents
@@ -281,7 +349,7 @@
B = new(T)
B.add_blood_DNA(list("UNKNOWN DNA" = "X*"))
-/mob/living/silicon/robot/add_splatter_floor(turf/T, small_drip)
+/mob/living/silicon/robot/add_splatter_floor(turf/T, small_drip, amt)
if(!T)
T = get_turf(src)
var/obj/effect/decal/cleanable/oil/B = locate() in T.contents
diff --git a/code/modules/mob/living/brain/brain.dm b/code/modules/mob/living/brain/brain.dm
index 80daa8de3e3..fa1267bdc23 100644
--- a/code/modules/mob/living/brain/brain.dm
+++ b/code/modules/mob/living/brain/brain.dm
@@ -41,9 +41,6 @@
/mob/living/brain/ex_act() //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up.
return
-/mob/living/brain/blob_act(obj/structure/blob/B)
- return
-
/mob/living/brain/get_eye_protection()//no eyes
return 2
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 8629d01650d..5fe96021461 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -381,7 +381,8 @@
if(resilience)
actual_trauma.resilience = resilience
. = actual_trauma
- SSblackbox.record_feedback("tally", "traumas", 1, actual_trauma.type)
+ if(owner?.client)
+ SSblackbox.record_feedback("tally", "traumas", 1, actual_trauma.type)
//Add a random trauma of a certain subtype
/obj/item/organ/brain/proc/gain_trauma_type(brain_trauma_type = /datum/brain_trauma, resilience, natural_gain = FALSE)
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index bfa71f3b335..3ae9bbb5b25 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -134,7 +134,7 @@
else if(ishuman(owner)) //Humans, being more fragile, are more overwhelmed by the mental backlash.
to_chat(owner, "You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!")
- owner.emote("scream")
+ owner.force_scream()
owner.Paralyze(100)
owner.jitteriness += 30
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index c9cdcaf8199..37384cf91e6 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -27,7 +27,7 @@
attack_verb_simple = "flail at"
attack_sound = 'sound/weapons/bladeslice.ogg'
faction = list(ROLE_ALIEN)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
verb_say = "squeaks"
verb_ask = "squeaks"
verb_exclaim = "shrieks"
@@ -35,7 +35,6 @@
initial_language_holder = /datum/language_holder/alien
flags_1 = PREVENT_CONTENTS_EXPLOSION_1
footstep_type = FOOTSTEP_MOB_CLAW
- gold_core_spawnable = NO_SPAWN
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
environment_smash = ENVIRONMENT_SMASH_NONE
diff --git a/code/modules/mob/living/carbon/alien/utilities/structures.dm b/code/modules/mob/living/carbon/alien/utilities/structures.dm
index 0ac30d207a4..c7e8a128c3d 100644
--- a/code/modules/mob/living/carbon/alien/utilities/structures.dm
+++ b/code/modules/mob/living/carbon/alien/utilities/structures.dm
@@ -182,7 +182,7 @@
qdel(src)
return
//lets try to grow in a direction
- for(var/turf/check_turf in src_turf.GetAtmosAdjacentTurfs())
+ for(var/turf/check_turf as anything in src_turf.get_atmos_adjacent_turfs())
//we cannot grow on blacklisted turfs
if(is_type_in_list(check_turf, blacklisted_turfs))
continue
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index dd5b2905908..5276cf514d6 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -386,7 +386,7 @@
/mob/living/carbon/get_standard_pixel_y_offset(lying = 0)
if(lying)
- return -6
+ return PIXEL_Y_OFFSET_LYING
else
return initial(pixel_y)
@@ -438,7 +438,7 @@
visible_message("[src] dry heaves!", \
"You try to throw up, but there's nothing in your stomach!")
if(stun)
- Paralyze(200)
+ Immobilize(30)
return TRUE
if(is_mouth_covered()) //make this add a blood/vomit overlay later it'll be hilarious
@@ -454,7 +454,7 @@
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomit)
if(stun)
- Paralyze(80)
+ Immobilize(10)
playsound(get_turf(src), 'sound/effects/splat.ogg', 50, TRUE)
var/turf/T = get_turf(src)
@@ -476,6 +476,7 @@
T = get_step(T, dir)
if (T?.is_blocked_turf())
break
+ adjust_disgust(-(lost_nutrition*rand(0.5, 2)))
return TRUE
/mob/living/carbon/proc/spew_organ(power = 5, amt = 1)
@@ -538,6 +539,7 @@
REMOVE_TRAIT(src, TRAIT_INCAPACITATED, STAMINA)
REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, STAMINA)
REMOVE_TRAIT(src, TRAIT_FLOORED, STAMINA)
+ REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, STAMINA)
else
return
update_health_hud()
@@ -708,7 +710,9 @@
//Fire and Brute damage overlay (BSSR)
var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
- if(hurtdamage)
+ if(HAS_TRAIT(src, TRAIT_PAIN_RESIST))
+ hurtdamage = round(hurtdamage/2)
+ if(hurtdamage && !HAS_TRAIT(src, TRAIT_ANALGESIA))
var/severity = 0
switch(hurtdamage)
if(5 to 15)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 43cefa251e3..12a40a456f1 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -1,6 +1,8 @@
/mob/living/carbon/attackby(obj/item/W, mob/user, params)
var/obj/item/bodypart/BP = get_bodypart(check_zone(user.zone_selected))
- var/has_painkillers = reagents.has_reagent(/datum/reagent/medicine/morphine, needs_metabolizing = TRUE)
+ if(!BP)
+ return ..()
+ var/painless = (HAS_TRAIT(user, TRAIT_ANALGESIA) || HAS_TRAIT(user, TRAIT_PAIN_RESIST))
if(W.tool_behaviour == TOOL_WELDER && IS_ROBOTIC_LIMB(BP) && BP.brute_dam) //prioritize healing if we're synthetic
return ..()
if(user.a_intent != INTENT_HELP || !W.get_temperature() || !BP.can_bandage()) //this will also catch low damage synthetic welding
@@ -9,7 +11,7 @@
var/heal_time = 2 SECONDS
playsound(user, 'sound/surgery/cautery1.ogg', 20)
balloon_alert(user, "cauterizing...")
- if(src == user && !has_painkillers)
+ if(src == user && !painless)
heal_time *= 2 //oof ouch owie
user.visible_message(span_nicegreen("[user] holds [W] up to [user == src ? "their" : "[src]'s"] [parse_zone(BP.body_zone)], trying to slow [p_their()] bleeding..."), span_nicegreen("You hold [W] up to [user == src ? "your" : "[src]'s"] [parse_zone(BP.body_zone)], trying to slow [user == src ? "your" : p_their()] bleeding..."))
if(do_after(user, heal_time, target = src))
@@ -352,13 +354,6 @@
if(is_type_in_typecache(active_item, GLOB.shove_disarming_types))
visible_message("[name] regains their grip on \the [active_item]!", "You regain your grip on \the [active_item]", null, COMBAT_MESSAGE_RANGE)
-/mob/living/carbon/blob_act(obj/structure/blob/B)
- if (stat == DEAD)
- return
- else
- show_message("The blob attacks!")
- adjustBruteLoss(10)
-
/mob/living/carbon/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_CONTENTS)
@@ -406,6 +401,8 @@
Paralyze(60)
/mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
+ var/datum/component/mood/hugger_mood = M.GetComponent(/datum/component/mood)
+ var/nosound = FALSE
if(on_fire)
to_chat(M, "You can't put [p_them()] out with just your bare hands!")
return
@@ -433,6 +430,22 @@
mothdust += 10;
if(istype(dna.species, /datum/species/moth))
M.mothdust += 10; // End WS edit
+
+ if(M.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Nose boops!
+ nosound = TRUE
+ playsound(src, 'sound/effects/boop.ogg', 50, 0)
+ if (HAS_TRAIT(M, TRAIT_FRIENDLY))
+ M.visible_message(span_notice("[M] playfully boops your nose."), span_notice("You playfully boop [src]'s nose."))
+ if (hugger_mood.sanity >= SANITY_GREAT)
+ new /obj/effect/temp_visual/heart(loc)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "best_boop", /datum/mood_event/best_boop, M)
+ else
+ M.visible_message(span_notice("[M] boops [src]'s nose."), span_notice("You boop [src] on the nose."))
+ if(HAS_TRAIT(src, TRAIT_BADTOUCH))
+ to_chat(M, span_warning("A scowl forms on [src]'s face as you daringly press your finger against [p_their()] nose."))
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "bad_boop", /datum/mood_event/bad_boop, M)
+
+
else if(check_zone(M.zone_selected) == BODY_ZONE_HEAD) //Headpats!
SEND_SIGNAL(src, COMSIG_CARBON_HEADPAT, M)
M.visible_message("[M] gives [src] a pat on the head to make [p_them()] feel better!", \
@@ -447,10 +460,35 @@
if(HAS_TRAIT(src, TRAIT_BADTOUCH))
to_chat(M, "[src] looks visibly upset as you pat [p_them()] on the head.")
+// Tail pulls!
+ else if((M.zone_selected == BODY_ZONE_PRECISE_GROIN) && !isnull(src.getorgan(/obj/item/organ/tail)))
+ M.visible_message(span_notice("[M] pulls on [src]'s tail!"), \
+ null, span_hear("You hear a soft patter."), DEFAULT_MESSAGE_RANGE, list(M, src))
+ to_chat(M, span_notice("You pull on [src]'s tail!"))
+ to_chat(src, span_notice("[M] pulls on your tail!"))
+
+// Rips off fake tails
+ else if((M.zone_selected == BODY_ZONE_PRECISE_GROIN) && (istype(head, /obj/item/clothing/head/kitty) || istype(head, /obj/item/clothing/head/collectable/kitty)))
+ var/obj/item/clothing/head/faketail = head
+ M.visible_message(span_danger("[M] pulls on [src]'s tail... and it rips off!"), \
+ null, span_hear("You hear a ripping sound."), DEFAULT_MESSAGE_RANGE, list(M, src))
+ to_chat(M, span_danger("You pull on [src]'s tail... and it rips off!"))
+ to_chat(src, span_userdanger("[M] pulls on your tail... and it rips off!"))
+ playsound(loc, 'sound/effects/rip1.ogg', 75, TRUE)
+ dropItemToGround(faketail)
+ M.put_in_hands(faketail)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "rippedtail", /datum/mood_event/rippedtail)
+
else if(M.zone_selected == BODY_ZONE_CHEST || M.zone_selected == BODY_ZONE_PRECISE_GROIN) //WS Edit - Adds more help emotes
SEND_SIGNAL(src, COMSIG_CARBON_HUGGED, M)
SEND_SIGNAL(M, COMSIG_CARBON_HUG, M, src)
- M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \
+ if (M.grab_state >= GRAB_AGGRESSIVE)
+ M.visible_message(span_notice("[M] embraces [src] in a tight bear hug!"), \
+ null, span_hear("You hear the rustling of clothes."), DEFAULT_MESSAGE_RANGE, list(M, src))
+ to_chat(M, span_notice("You wrap [src] into a tight bear hug!"))
+ to_chat(src, span_notice("[M] squeezes you super tightly in a firm bear hug!"))
+ else
+ M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \
"You hug [src] to make [p_them()] feel better!")
if(istype(M.dna.species, /datum/species/moth)) //WS edit - moth dust from hugging
mothdust += 15;
@@ -462,12 +500,17 @@
// No moodlets for people who hate touches
if(!HAS_TRAIT(src, TRAIT_BADTOUCH))
- if(bodytemperature > M.bodytemperature)
- if(!HAS_TRAIT(M, TRAIT_BADTOUCH))
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/warmhug, src) // Hugger got a warm hug (Unless they hate hugs)
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/hug) // Reciver always gets a mood for being hugged
- else
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/warmhug, M) // You got a warm hug
+ if (M.grab_state >= GRAB_AGGRESSIVE)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/bear_hug)
+ if(bodytemperature > M.bodytemperature)
+ if(!HAS_TRAIT(M, TRAIT_BADTOUCH))
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/warmhug) // Hugger got a warm hug (Unless they hate hugs)
+ SEND_SIGNAL(M, "hug", /datum/mood_event/hug) // Receiver always gets a mood for being hugged
+ else
+ SEND_SIGNAL(M, "hug", /datum/mood_event/warmhug,) // You got a warm hug
+ else
+ if (M.grab_state >= GRAB_AGGRESSIVE)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/bad_touch_bear_hug)
// Let people know if they hugged someone really warm or really cold
if(M.bodytemperature > M.dna.species.bodytemp_heat_damage_limit)
@@ -481,7 +524,6 @@
to_chat(M, "It feels like [src] is freezing as you hug them.")
if(HAS_TRAIT(M, TRAIT_FRIENDLY))
- var/datum/component/mood/hugger_mood = M.GetComponent(/datum/component/mood)
if (hugger_mood.sanity >= SANITY_GREAT)
new /obj/effect/temp_visual/heart(loc)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M)
@@ -510,8 +552,17 @@
AdjustParalyzed(-60)
AdjustImmobilized(-60)
set_resting(FALSE)
-
- playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+ if(!nosound)
+ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+
+// Shake animation
+#define SHAKE_ANIMATION_OFFSET (4)
+ if (incapacitated())
+ var/direction = prob(50) ? -1 : 1
+ animate(src, pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_OUT, flags = ANIMATION_PARALLEL)
+ animate(pixel_x = pixel_x - (SHAKE_ANIMATION_OFFSET * 2 * direction), time = 1)
+ animate(pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_IN)
+#undef SHAKE_ANIMATION_OFFSET
/// Check ourselves to see if we've got any shrapnel, return true if we do. This is a much simpler version of what humans do, we only indicate we're checking ourselves if there's actually shrapnel
/mob/living/carbon/proc/check_self_for_injuries()
@@ -653,3 +704,18 @@
ADD_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT)
else if(getOxyLoss() <= 50)
REMOVE_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT)
+
+/mob/living/carbon/bullet_act(obj/projectile/P, def_zone, piercing_hit = FALSE)
+ var/armor = run_armor_check(def_zone, P.flag, P.armour_penetration, silent = TRUE)
+ var/on_hit_state = P.on_hit(src, armor, piercing_hit)
+ if(!P.nodamage && on_hit_state != BULLET_ACT_BLOCK && !QDELETED(src)) //QDELETED literally just for the instagib rifle. Yeah.
+ apply_damage(P.damage, P.damage_type, def_zone, armor, sharpness = TRUE)
+ if(P.damage-armor >= 15 && P.damage_type == BRUTE && (!armor || prob(40) || P.damage-armor >= 25))
+ spray_blood(get_dir(P.starting,src), (P.damage-armor)/5)
+ bleed((P.damage-armor)/2)
+
+ recoil_camera(src, clamp((P.damage-armor)/4,0.5,10), clamp((P.damage-armor)/4,0.5,10), P.damage/8, P.Angle)
+ apply_effects(P.stun, P.knockdown, P.unconscious, P.irradiate, P.slur, P.stutter, P.eyeblur, P.drowsy, armor, P.stamina, P.jitter, P.paralyze, P.immobilize)
+ if(P.dismemberment)
+ check_projectile_dismemberment(P, def_zone)
+ return on_hit_state ? BULLET_ACT_HIT : BULLET_ACT_BLOCK
diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm
index 8c1a36c2061..1804a149718 100644
--- a/code/modules/mob/living/carbon/death.dm
+++ b/code/modules/mob/living/carbon/death.dm
@@ -31,6 +31,9 @@
if(prob(50))
step(W, pick(GLOB.alldirs))
var/atom/Tsec = drop_location()
+ var/amount_of_streams_to_spawn = rand(2,4)
+ for(var/i in 1 to amount_of_streams_to_spawn)
+ spray_blood(pick(GLOB.alldirs), rand(1,6))
for(var/mob/M in src)
M.forceMove(Tsec)
visible_message("[M] bursts out of [src]!")
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index f0d27e801cd..358fa062609 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -39,25 +39,6 @@
key = "blink_r"
message = "blinks rapidly."
-/datum/emote/living/carbon/clap
- key = "clap"
- key_third_person = "claps"
- message = "claps."
- muzzle_ignore = TRUE
- hands_use_check = TRUE
- emote_type = EMOTE_AUDIBLE
- vary = TRUE
-
-/datum/emote/living/carbon/clap/get_sound(mob/living/user)
- if(ishuman(user))
- if(!user.get_bodypart(BODY_ZONE_L_ARM) || !user.get_bodypart(BODY_ZONE_R_ARM))
- return
- else
- return pick('sound/misc/clap1.ogg',
- 'sound/misc/clap2.ogg',
- 'sound/misc/clap3.ogg',
- 'sound/misc/clap4.ogg')
-
/datum/emote/living/carbon/crack
key = "crack"
key_third_person = "cracks"
@@ -253,7 +234,7 @@
damage += rand(3,7)
if(damage >= 5)
- target.emote("scream")
+ target.force_scream()
target.apply_damage(damage, BRUTE, BODY_ZONE_HEAD)
user.adjustStaminaLoss(iteration + 5)
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 55adc5bd5d1..dad54c17ca0 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -62,8 +62,6 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift)
if(SSticker.HasRoundStarted())
SSblackbox.ReportDeath(src)
log_message("has died (BRUTE: [src.getBruteLoss()], BURN: [src.getFireLoss()], TOX: [src.getToxLoss()], OXY: [src.getOxyLoss()], CLONE: [src.getCloneLoss()])", LOG_ATTACK)
- if(is_devil(src))
- INVOKE_ASYNC(is_devil(src), TYPE_PROC_REF(/datum/antagonist/devil, beginResurrectionCheck), src)
to_chat(src, "You have died. Barring complete bodyloss, you can in most cases be revived by other players. If you do not wish to be brought back, use the \"Do Not Resuscitate\" verb in the ghost tab.")
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index da75efa5265..f973a2b7a59 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -67,6 +67,8 @@
return pick('sound/voice/human/malescream_1.ogg', 'sound/voice/human/malescream_2.ogg', 'sound/voice/human/malescream_3.ogg', 'sound/voice/human/malescream_4.ogg', 'sound/voice/human/malescream_5.ogg', 'sound/voice/human/malescream_6.ogg')
else if(ismoth(H))
return 'sound/voice/moth/scream_moth.ogg'
+ else if(isvox(H))
+ return 'sound/voice/vox/vox_scream_1.ogg'
else if(islizard(H))
return pick('sound/voice/lizard/lizard_scream_1.ogg', 'sound/voice/lizard/lizard_scream_2.ogg', 'sound/voice/lizard/lizard_scream_3.ogg', 'sound/voice/lizard/lizard_scream_4.ogg')
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 7bbe9fb1de7..c462eb294f7 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -25,7 +25,7 @@
//if we have no guestbook, we just KNOW okay?
var/known_name = user.mind?.guestbook ? user.mind.guestbook.get_known_name(user, src, face_name) : face_name
if(known_name)
- . += "You know them as [known_name]."
+ . += "You know [t_him] as [known_name]."
else
. += "You don't recognize [t_him]. You can Ctrl-Shift click [t_him] to memorize their face."
else
@@ -99,8 +99,6 @@
if(!(ITEM_SLOT_EYES in obscured))
if(glasses)
. += "[t_He] [t_has] [glasses.get_examine_string(user)] covering [t_his] eyes."
- else if(eye_color == BLOODCULT_EYE && iscultist(src) && HAS_TRAIT(src, CULT_EYES))
- . += "[t_His] eyes are glowing an unnatural red!"
//ears
if(ears && !(ITEM_SLOT_EARS in obscured))
@@ -432,4 +430,4 @@
if ((wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)))
return
if(get_age())
- . += list(span_notice("[p_they(TRUE)] appear[p_s()] to be [get_age()]."))
+ . += span_notice("[p_they(TRUE)] appear[p_s()] to be [get_age()].")
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 27fa569de7c..58f726aa508 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -24,7 +24,6 @@
RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, PROC_REF(clean_face))
AddComponent(/datum/component/personal_crafting)
AddComponent(/datum/component/footstep, FOOTSTEP_MOB_HUMAN, 1, -6)
- AddComponent(/datum/component/bloodysoles/feet)
GLOB.human_list += src
/mob/living/carbon/human/proc/setup_human_dna()
@@ -42,6 +41,8 @@
QDEL_NULL(physiology)
QDEL_LIST(bioware)
GLOB.human_list -= src
+ if(blood_particle)
+ QDEL_NULL(blood_particle)
return ..()
@@ -913,10 +914,10 @@
/mob/living/carbon/human/vomit(lost_nutrition = 10, blood = FALSE, stun = TRUE, distance = 1, message = TRUE, toxic = FALSE, harm = TRUE, force = FALSE, purge = FALSE)
if(blood && (NOBLOOD in dna.species.species_traits) && !HAS_TRAIT(src, TRAIT_TOXINLOVER))
if(message)
- visible_message("[src] dry heaves!", \
- "You try to throw up, but there's nothing in your stomach!")
+ visible_message(span_warning("[src] dry heaves!"), \
+ span_userdanger("You try to throw up, but there's nothing in your stomach!"))
if(stun)
- Paralyze(200)
+ Immobilize(30)
return 1
..()
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 1cb061ff9fd..081c94f4a8f 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -110,22 +110,24 @@
var/final_block_chance = I.block_chance - (clamp((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
if(I.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
return TRUE
+
if(wear_suit)
- var/final_block_chance = wear_suit.block_chance - (clamp((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
+ var/final_block_chance = wear_suit.block_chance - (clamp((armour_penetration - wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
if(wear_suit.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
return TRUE
if(w_uniform)
- var/final_block_chance = w_uniform.block_chance - (clamp((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
+ var/final_block_chance = w_uniform.block_chance - (clamp((armour_penetration - w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
if(w_uniform.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
return TRUE
if(wear_neck)
- var/final_block_chance = wear_neck.block_chance - (clamp((armour_penetration-wear_neck.armour_penetration)/2,0,100)) + block_chance_modifier
+ var/final_block_chance = wear_neck.block_chance - (clamp((armour_penetration - wear_neck.armour_penetration)/2,0,100)) + block_chance_modifier
if(wear_neck.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
return TRUE
if(head)
- var/final_block_chance = head.block_chance - (clamp((armour_penetration-head.armour_penetration)/2,0,100)) + block_chance_modifier
+ var/final_block_chance = head.block_chance - (clamp((armour_penetration - head.armour_penetration)/2,0,100)) + block_chance_modifier
if(head.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
return TRUE
+
return FALSE
/mob/living/carbon/human/proc/check_block()
@@ -473,16 +475,6 @@
if(!max_limb_loss)
break
-
-/mob/living/carbon/human/blob_act(obj/structure/blob/B)
- if(stat == DEAD)
- return
- show_message("The blob attacks you!")
- var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
- apply_damage(5, BRUTE, affecting, run_armor_check(affecting, "melee"))
-
-
///Calculates the siemens coeff based on clothing and species, can also restart hearts.
/mob/living/carbon/human/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
//If it doesnt have physiology its prob still initializing.
@@ -501,6 +493,10 @@
else if(!(flags & SHOCK_NOGLOVES)) //This gets the siemens_coeff for all non tesla shocks
if(gloves)
siemens_coeff *= gloves.siemens_coefficient
+ //If it doesnt have physiology its prob still initializing.
+ if(!physiology)
+ . = ..()
+ return
siemens_coeff *= physiology.siemens_coeff
siemens_coeff *= dna.species.siemens_coeff
. = ..()
@@ -528,8 +524,8 @@
var/informed = FALSE
for(var/obj/item/bodypart/L as anything in bodyparts)
if(!IS_ORGANIC_LIMB(L))
- if(!informed)
- to_chat(src, "You feel a sharp pain as your robotic limbs overload.")
+ if(!informed && !HAS_TRAIT(src, TRAIT_ANALGESIA))
+ to_chat(src, span_userdanger("You feel a sharp pain as your robotic limbs overload."))
informed = TRUE
switch(severity)
if(1)
@@ -661,7 +657,7 @@
if(affecting.name == BODY_ZONE_HEAD)
if(prob(min(acidpwr*acid_volume/10, 90))) //Applies disfigurement
affecting.receive_damage(acidity, 2*acidity)
- emote("scream")
+ force_scream()
facial_hairstyle = "Shaved"
hairstyle = "Bald"
update_hair()
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 567523c11d7..df006ead1f3 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -77,3 +77,7 @@
/// How many "units of blood" we have on our hands
var/blood_in_hands = 0
+ ///blood particle effect
+ var/obj/effect/abstract/particle_holder/blood_particle
+
+ COOLDOWN_DECLARE(bloodloss_message)
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 9e2cfe4f155..b7c5b987712 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -192,23 +192,65 @@
/mob/living/carbon/human/proc/get_age()
var/obscured = check_obscured_slots()
var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
- if((obscured & ITEM_SLOT_ICLOTHING) && skipface || isipc(src))
+ if((obscured & ITEM_SLOT_ICLOTHING) && skipface || isipc(src) || isskeleton(src)) // sorry ladies no middle aged robots
return FALSE
- switch(age)
- if(70 to INFINITY)
- return "Geriatric"
- if(60 to 70)
- return "Elderly"
- if(50 to 60)
- return "Old"
- if(40 to 50)
- return "Middle-Aged"
- if(24 to 40)
- return FALSE //not necessary because this is basically the most common age range
- if(18 to 24)
- return "Young"
- else
- return "Puzzling"
+ if(islizard(src))
+ switch(age)
+ if(175 to INFINITY)
+ return "Ancient"
+ if(130 to 175)
+ return "Elderly"
+ if(100 to 130)
+ return "Old"
+ if(65 to 100)
+ return "Middle-Aged"
+ if(40 to 65)
+ return FALSE
+ if(18 to 40)
+ return "Young"
+ else if(isvox(src))
+ switch(age)
+ if(280 to INFINITY)
+ return "Ancient"
+ if(200 to 280)
+ return "Elderly"
+ if(160 to 200)
+ return "Old"
+ if(120 to 160)
+ return "Middle-Aged"
+ if(60 to 120)
+ return FALSE
+ if(18 to 60)
+ return "Young"
+ else if(iselzuose(src))
+ switch(age)
+ if(300 to INFINITY)
+ return "Ancient"
+ if(260 to 300)
+ return "Elderly"
+ if(160 to 260)
+ return "Old"
+ if(100 to 160)
+ return "Middle-Aged"
+ if(40 to 100)
+ return FALSE // most common age range
+ if(18 to 40)
+ return "Young"
+ else
+ switch(age)
+ if(70 to INFINITY)
+ return "Ancient"
+ if(60 to 70)
+ return "Elderly"
+ if(50 to 60)
+ return "Old"
+ if(40 to 50)
+ return "Middle-Aged"
+ if(24 to 40)
+ return FALSE // most common age range
+ if(18 to 24)
+ return "Young"
+ return "Puzzling"
/mob/living/carbon/human/proc/get_generic_name(prefixed = FALSE, lowercase = FALSE)
var/final_string = ""
@@ -228,7 +270,7 @@
final_string += get_gender()
if(prefixed)
- final_string = "\A [final_string]"
+ final_string = "\improper [final_string]"
if(lowercase)
final_string = lowertext(final_string)
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 77e2045e357..aab8b681bf5 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -26,25 +26,8 @@
return 0
return ..()
-/mob/living/carbon/human/experience_pressure_difference(pressure_difference)
- if(pressure_difference > 100)
- playsound_local(null, 'sound/effects/space_wind_big.ogg', clamp(pressure_difference / 50, 10, 100), 1)
- else
- playsound_local(null, 'sound/effects/space_wind.ogg', clamp(pressure_difference, 10, 100), 1)
- if(shoes && istype(shoes, /obj/item/clothing))
- var/obj/item/clothing/S = shoes
- if((S.clothing_flags & NOSLIP))
- return 0
- return ..()
-
-/mob/living/carbon/human/mob_has_gravity()
- . = ..()
- if(!.)
- if(mob_negates_gravity())
- . = 1
-
/mob/living/carbon/human/mob_negates_gravity()
- return ((shoes && shoes.negates_gravity()) || (dna.species.negates_gravity(src)))
+ return dna.species.negates_gravity(src) || ..()
/mob/living/carbon/human/Move(NewLoc, direct)
. = ..()
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 756af00f183..12e152c0f3d 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -40,6 +40,45 @@
return s_store
return null
+/mob/living/carbon/human/get_slot_by_item(obj/item/looking_for)
+ if(looking_for == belt)
+ return ITEM_SLOT_BELT
+
+ if(looking_for == wear_id)
+ return ITEM_SLOT_ID
+
+ if(looking_for == ears)
+ return ITEM_SLOT_EARS
+
+ if(looking_for == glasses)
+ return ITEM_SLOT_EYES
+
+ if(looking_for == gloves)
+ return ITEM_SLOT_GLOVES
+
+ if(looking_for == head)
+ return ITEM_SLOT_HEAD
+
+ if(looking_for == shoes)
+ return ITEM_SLOT_FEET
+
+ if(looking_for == wear_suit)
+ return ITEM_SLOT_OCLOTHING
+
+ if(looking_for == w_uniform)
+ return ITEM_SLOT_ICLOTHING
+
+ if(looking_for == r_store)
+ return ITEM_SLOT_RPOCKET
+
+ if(looking_for == l_store)
+ return ITEM_SLOT_LPOCKET
+
+ if(looking_for == s_store)
+ return ITEM_SLOT_SUITSTORE
+
+ return ..()
+
/mob/living/carbon/human/proc/get_all_slots()
. = get_head_slots() | get_body_slots()
@@ -82,7 +121,9 @@
/mob/living/carbon/human/equip_to_slot(obj/item/I, slot, initial = FALSE, redraw_mob = FALSE, swap = FALSE)
if(!..()) //a check failed or the item has already found its slot
return
-
+ if(isclothing(I))//needs to be set very early, because clothing overlays need it assigned before update_inv calls
+ var/obj/item/clothing/ouritem = I
+ ouritem.wearer = WEAKREF(src)
var/current_equip
var/not_handled = FALSE //Added in case we make this type path deeper one day
switch(slot)
@@ -165,7 +206,9 @@
update_inv_s_store()
else
to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!")
-
+ if(isclothing(I))//just in case
+ var/obj/item/clothing/ouritem = I
+ ouritem.wearer = null
if (current_equip)
put_in_active_hand(current_equip)
@@ -334,7 +377,8 @@
if(equip_to_slot_if_possible(thing, slot_type))
update_inv_hands()
return
- if(!SEND_SIGNAL(equipped_item, COMSIG_CONTAINS_STORAGE)) // not a storage item
+ var/datum/component/storage/storage = equipped_item.GetComponent(/datum/component/storage)
+ if(!storage)
if(!thing)
equipped_item.attack_hand(src)
else
@@ -344,10 +388,11 @@
if(!SEND_SIGNAL(equipped_item, COMSIG_TRY_STORAGE_INSERT, thing, src))
to_chat(src, "You can't fit [thing] into your [equipped_item.name]!")
return
- if(!equipped_item.contents.len) // nothing to take out
+ var/atom/real_location = storage.real_location()
+ if(!real_location.contents.len) // nothing to take out
to_chat(src, "There's nothing in your [equipped_item.name] to take out!")
return
- var/obj/item/stored = equipped_item.contents[equipped_item.contents.len]
+ var/obj/item/stored = real_location.contents[real_location.contents.len]
if(!stored || stored.on_found(src))
return
stored.attack_hand(src) // take out thing from item in storage slot
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 730001819de..cb812d45b34 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -61,6 +61,21 @@
return ONE_ATMOSPHERE
return pressure
+/mob/living/carbon/human/proc/check_for_seal()
+ var/obj/item/clothing/clothing_suit = wear_suit
+ var/obj/item/clothing/clothing_head = head
+ if(istype(clothing_suit) && istype(clothing_head))
+ if (clothing_suit.clothing_flags & clothing_head.clothing_flags & STOPSPRESSUREDAMAGE)
+ return TRUE
+ return FALSE
+
+/mob/living/carbon/human/proc/check_for_goggles()
+ if(head?.flags_cover & SEALS_EYES)
+ return head
+ if(wear_mask?.flags_cover & SEALS_EYES)
+ return wear_mask
+ if(glasses?.flags_cover & SEALS_EYES)
+ return glasses
/mob/living/carbon/human/handle_traits()
if (getOrganLoss(ORGAN_SLOT_BRAIN) >= 60)
@@ -105,6 +120,7 @@
if(istype(L, /obj/item/organ/lungs))
var/obj/item/organ/lungs/lun = L
lun.check_breath(breath,src)
+ lun.handle_breath_temperature(breath,src)
/// Environment handlers for species
/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment)
@@ -330,13 +346,19 @@
var/obj/item/bodypart/R = get_bodypart("r_arm")
if(istype(L) && L.bone_status == BONE_FLAG_BROKEN && held_items[1] && prob(30))
- emote("scream")
- visible_message("[src] screams and lets go of [held_items[1]] in pain.", "A horrible pain in your [parse_zone(L)] makes it impossible to hold [held_items[1]]!")
+ force_scream()
+ if(!HAS_TRAIT(src, TRAIT_ANALGESIA))
+ visible_message(span_warning("[src] screams and lets go of [held_items[1]] in pain."), span_userdanger("A horrible pain in your [parse_zone(L)] makes it impossible to hold [held_items[1]]!"))
+ else
+ visible_message(span_notice("[src] flinches and lets go of [held_items[1]]."),span_notice("A sudden weakness in your [parse_zone(L)] makes it impossible to grasp [held_items[1]]!"))
dropItemToGround(held_items[1])
if(istype(R) && R.bone_status == BONE_FLAG_BROKEN && held_items[2] && prob(30))
- emote("scream")
- visible_message("[src] screams and lets go of [held_items[2]] in pain.", "A horrible pain in your [parse_zone(R)] makes it impossible to hold [held_items[2]]!")
+ force_scream()
+ if(!HAS_TRAIT(src, TRAIT_ANALGESIA))
+ visible_message(span_warning("[src] screams and lets go of [held_items[1]] in pain."), span_userdanger("A horrible pain in your [parse_zone(R)] makes it impossible to hold [held_items[1]]!"))
+ else
+ visible_message(span_notice("[src] flinches and lets go of [held_items[1]]."),span_notice("A sudden weakness in your [parse_zone(R)] makes it impossible to grasp [held_items[1]]!"))
dropItemToGround(held_items[2])
#undef THERMAL_PROTECTION_HEAD
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index d1cc2578562..65c809074d3 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1,5 +1,7 @@
GLOBAL_LIST_EMPTY(roundstart_races)
+#define MINIMUM_MOLS_TO_HARM 1
+
/**
* # species datum
*
@@ -108,6 +110,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/siemens_coeff = 1
///What kind of damage overlays (if any) appear on our species when wounded? If this is "", does not add an overlay.
var/damage_overlay_type = "human"
+ ///for species with a unique body size(above 32x32), who need a custom icon file for overlays
+ var/custom_overlay_icon
///To use MUTCOLOR with a fixed color that's independent of the mcolor feature in DNA.
var/fixed_mut_color = ""
///Special mutation that can be found in the genepool exclusively in this species. Dont leave empty or changing species will be a headache
@@ -146,6 +150,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/bodytemp_normal = HUMAN_BODYTEMP_NORMAL
/// Minimum amount of kelvin moved toward normal body temperature per tick.
var/bodytemp_autorecovery_min = HUMAN_BODYTEMP_AUTORECOVERY_MINIMUM
+ /// The maximum temperature the species is comfortable at. Going above this does not apply any effects, but warns players that the temperture is hot
+ var/max_temp_comfortable = (HUMAN_BODYTEMP_NORMAL) //20 c will always be below human bodytemp, this just makes it so when it can sustain that its higher
+ /// The minimum temperature the species is comfortable at. Going below this does not apply any effects, but warns players that the temperture is chilly
+ var/min_temp_comfortable = (HUMAN_BODYTEMP_NORMAL - 1)
/// This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery.
var/bodytemp_autorecovery_divisor = HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR
///Similar to the autorecovery_divsor, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to lose bodytemp faster.
@@ -160,6 +168,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/bodytemp_cooling_rate_max = HUMAN_BODYTEMP_COOLING_MAX
/// The maximum rate at which a species can cool down per tick
var/bodytemp_heating_rate_max = HUMAN_BODYTEMP_HEATING_MAX
+ /// How much temp is our body stabilizing naturally?
+ var/bodytemp_natural_stabilization = 0
+ /// How much temp is the environment is causing us to charge?
+ var/bodytemp_environment_change = 0
///Does our species have colors for its' damage overlays?
var/use_damage_color = TRUE
@@ -182,7 +194,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
///What gas does this species breathe? Used by suffocation screen alerts, most of actual gas breathing is handled by mutantlungs. See [life.dm][code/modules/mob/living/carbon/human/life.dm]
var/breathid = "o2"
-
//Do NOT remove by setting to null. use OR make a RESPECTIVE TRAIT (removing stomach? add the NOSTOMACH trait to your species)
//why does it work this way? because traits also disable the downsides of not having an organ, removing organs but not having the trait will make your species die
//shut up you're not my mother
@@ -488,6 +499,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
fly.Grant(C)
C.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/species, multiplicative_slowdown=speedmod)
+ C.bodytemperature = bodytemp_normal
SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species)
@@ -1266,6 +1278,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
if(H.s_store && !swap)
return FALSE
+ if(HAS_TRAIT(I, TRAIT_FORCE_SUIT_STORAGE))
+ return TRUE
if(!H.wear_suit)
if(!disable_warning)
to_chat(H, "You need a suit before you can attach this [I.name]!")
@@ -1828,16 +1842,120 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/areatemp = H.get_temperature(environment)
if(H.stat != DEAD) // If you are dead your body does not stabilize naturally
- natural_bodytemperature_stabilization(environment, H)
+ bodytemp_natural_stabilization = natural_bodytemperature_stabilization(environment, H)
if(!H.on_fire || areatemp > H.bodytemperature) // If we are not on fire or the area is hotter
- H.adjust_bodytemperature((areatemp - H.bodytemperature), use_insulation=TRUE, use_steps=TRUE, hardsuit_fix=bodytemp_normal - H.bodytemperature)
+ bodytemp_environment_change = H.adjust_bodytemperature((areatemp - H.bodytemperature), use_insulation=TRUE, use_steps=TRUE, hardsuit_fix=bodytemp_normal - H.bodytemperature)
+
+ if(H.check_for_seal())
+ return
+
+ var/plasma = environment.get_moles(GAS_PLASMA)
+ var/tritium = environment.get_moles(GAS_TRITIUM)
+ var/chlorine = environment.get_moles(GAS_CHLORINE)
+ var/ammonia = environment.get_moles(GAS_AMMONIA)
+ var/hydrogen_chloride = environment.get_moles(GAS_HYDROGEN_CHLORIDE)
+ var/sulfur_dioxide = environment.get_moles(GAS_SO2)
+ if(chlorine <= MINIMUM_MOLS_TO_HARM && hydrogen_chloride <= MINIMUM_MOLS_TO_HARM && tritium <= MINIMUM_MOLS_TO_HARM && plasma <= MINIMUM_MOLS_TO_HARM && ammonia <= MINIMUM_MOLS_TO_HARM && sulfur_dioxide <= MINIMUM_MOLS_TO_HARM)
+ return
+
+ var/eyedamage = FALSE
+ var/irritant = FALSE
+ var/burndamage = 0
+ var/lowerthreshold = FALSE
+
+ var/feels_pain = TRUE
+ if(HAS_TRAIT(H, TRAIT_METALLIC)) //makes certain species take more damage and start taking damage at lower air amounts
+ lowerthreshold = TRUE
+
+ if(HAS_TRAIT(H, TRAIT_ANALGESIA)) //if we can't feel pain, dont give the pain messages
+ feels_pain = FALSE
+
+ if(plasma > MINIMUM_MOLS_TO_HARM)
+ burndamage += max(sqrt(ammonia) - 1 + lowerthreshold, 0)
+ eyedamage = TRUE
+ irritant = TRUE
+ if(tritium)
+ burndamage += max(sqrt(tritium) - 2 + lowerthreshold, 0)
+ if(tritium > MINIMUM_MOLS_TO_HARM)
+ eyedamage = TRUE
+ irritant = TRUE
+ if(chlorine)
+ burndamage += max(sqrt(chlorine) - 4 + lowerthreshold, 0)
+ irritant = TRUE
+ if(chlorine > (MINIMUM_MOLS_TO_HARM * 10))
+ eyedamage = TRUE
+ if(ammonia)
+ burndamage += max(sqrt(ammonia) - 2 + lowerthreshold, 0)
+ irritant = TRUE
+ if(ammonia > (MINIMUM_MOLS_TO_HARM * 5))
+ eyedamage = TRUE
+ if(hydrogen_chloride)
+ burndamage += max(sqrt(hydrogen_chloride) - 1 + lowerthreshold, 0)
+ eyedamage = TRUE
+ irritant = TRUE
+ if(sulfur_dioxide)
+ burndamage += max(sqrt(chlorine) - 4 + lowerthreshold, 0)
+ irritant = TRUE
+ if(sulfur_dioxide > (MINIMUM_MOLS_TO_HARM * 5))
+ eyedamage = TRUE
+
+ if(!eyedamage && !burndamage && !irritant)
+ return
+ H.apply_damage(burndamage, BURN, spread_damage = TRUE)
+ if(prob(50) && burndamage)
+ if(lowerthreshold && feels_pain)
+ to_chat(H, span_userdanger("You're corroding!"))
+ else if(feels_pain)
+ to_chat(H, span_userdanger("You're melting!"))
+ playsound(H, 'sound/items/welder.ogg', 30, TRUE)
+ if(!H.check_for_goggles() && eyedamage)
+ H.adjustOrganLoss(ORGAN_SLOT_EYES, 1)
+ if(prob(50) && feels_pain)
+ to_chat(H, span_danger("Your eyes burn!"))
+ H.emote("cry")
+ H.set_blurriness(10)
+ if(irritant && prob(50) && feels_pain)
+ if(lowerthreshold)
+ to_chat(H, span_danger("Your outer shell smolders!"))
+ else
+ to_chat(H, span_danger("Your skin itches."))
+
/// Handle the body temperature status effects for the species
/// Traits for resitance to heat or cold are handled here.
/datum/species/proc/handle_body_temperature(mob/living/carbon/human/H)
+ var/body_temp = H.bodytemperature
+
+ //tempature is no longer comfy, throw alert
+ if(body_temp > max_temp_comfortable && !HAS_TRAIT(H, TRAIT_RESISTHEAT))
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
+ if(body_temp > bodytemp_heat_damage_limit)
+ var/burn_damage = calculate_burn_damage(H)
+ if(burn_damage > 2)
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 3)
+ else
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 2)
+ else
+ if(body_temp < (bodytemp_heat_damage_limit - 3))
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 1)
+ else
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/warm)
+ else if (body_temp < min_temp_comfortable && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot")
+ if(body_temp < bodytemp_cold_damage_limit -7)
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 3)
+ else if(body_temp < bodytemp_cold_damage_limit)
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 2)
+ else if(body_temp < (bodytemp_cold_damage_limit + 5))
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 1)
+ else
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/chilly)
+ else
+ H.clear_alert("tempfeel")
+
// Body temperature is too hot, and we do not have resist traits
- if(H.bodytemperature > bodytemp_heat_damage_limit && !HAS_TRAIT(H, TRAIT_RESISTHEAT))
+ if(body_temp > bodytemp_heat_damage_limit && !HAS_TRAIT(H, TRAIT_RESISTHEAT))
// Clear cold mood and apply hot mood
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "hot", /datum/mood_event/hot)
@@ -1845,36 +1963,46 @@ GLOBAL_LIST_EMPTY(roundstart_races)
//Remove any slowdown from the cold.
H.remove_movespeed_modifier(/datum/movespeed_modifier/cold)
- var/burn_damage = 0
- var/firemodifier = H.fire_stacks / 50
- if (!H.on_fire) // We are not on fire, reduce the modifier
- firemodifier = min(firemodifier, 0)
-
- // this can go below 5 at log 2.5
- burn_damage = max(log(2 - firemodifier, (H.bodytemperature - H.get_body_temp_normal(apply_change=FALSE))) - 5,0)
-
- // Display alerts based on the amount of fire damage being taken
- if (burn_damage)
- switch(burn_damage)
- if(1 to 2)
- H.throw_alert("temp", /atom/movable/screen/alert/hot, 1)
- if(2 to 4)
- H.throw_alert("temp", /atom/movable/screen/alert/hot, 2)
- else
- H.throw_alert("temp", /atom/movable/screen/alert/hot, 3)
+ var/burn_damage = calculate_burn_damage(H)
+
+ // sweats depending on burn damage, not actually a mechanic but a alternative to pinpoint when you are taking damage
+ if(burn_damage)
+ if(H.mob_biotypes & MOB_ROBOTIC) //robors have a alternative cooling fan graphic
+ switch(burn_damage)
+ if(0 to 1)
+ H.throw_alert("temp", /atom/movable/screen/alert/fans, 1)
+ if(2 to 3)
+ H.throw_alert("temp", /atom/movable/screen/alert/fans, 2)
+ else
+ H.throw_alert("temp", /atom/movable/screen/alert/fans, 3)
+ else
+ switch(burn_damage)
+ if(0 to 1)
+ H.throw_alert("temp", /atom/movable/screen/alert/sweat, 1)
+ if(2 to 3)
+ H.throw_alert("temp", /atom/movable/screen/alert/sweat, 2)
+ else
+ H.throw_alert("temp", /atom/movable/screen/alert/sweat, 3)
+
+ //Stay hydrated.
+ if(!(H.mob_biotypes & MOB_ROBOTIC) && H.reagents.has_reagent(/datum/reagent/water) && H.stat != DEAD)
+ burn_damage -= clamp(H.reagents.get_reagent_amount(/datum/reagent/water) /10, 0, 2)
+ // if youre dead, no need to sweat?
+ if(H.stat != DEAD)
+ burn_damage -= (max(burn_damage - 2.5, 0))
// Apply species and physiology modifiers to heat damage
burn_damage = burn_damage * heatmod * H.physiology.heat_mod
// 40% for level 3 damage on humans to scream in pain
if (H.stat < UNCONSCIOUS && (prob(burn_damage) * 10) / 4)
- H.emote("scream")
+ H.force_scream()
// Apply the damage to all body parts
H.apply_damage(burn_damage, BURN, spread_damage = TRUE)
// Body temperature is too cold, and we do not have resist traits
- else if(H.bodytemperature < bodytemp_cold_damage_limit && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
+ else if(body_temp < bodytemp_cold_damage_limit && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
// clear any hot moods and apply cold mood
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot")
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "cold", /datum/mood_event/cold)
@@ -1883,18 +2011,25 @@ GLOBAL_LIST_EMPTY(roundstart_races)
// Display alerts based on the amount of cold damage being taken
// Apply more damage based on how cold you are
- var/bodytemp = H.bodytemperature
- if(bodytemp < 120)
- H.throw_alert("temp", /atom/movable/screen/alert/cold, 3)
- H.apply_damage(COLD_DAMAGE_LEVEL_3 * coldmod * H.physiology.cold_mod, BURN)
+ if(body_temp < bodytemp_cold_damage_limit - 15)
+ H.throw_alert("temp", /atom/movable/screen/alert/shiver, 3)
+ if(H.stat != DEAD) // probably can store them in cold storage like this
+ H.apply_damage(COLD_DAMAGE_LEVEL_3 * coldmod * H.physiology.cold_mod, BURN)
+ H.emote("shiver")
- else if(bodytemp < 200)
- H.throw_alert("temp", /atom/movable/screen/alert/cold, 2)
- H.apply_damage(COLD_DAMAGE_LEVEL_2 * coldmod * H.physiology.cold_mod, BURN)
+ else if(body_temp < bodytemp_cold_damage_limit - 7)
+ H.throw_alert("temp", /atom/movable/screen/alert/shiver, 2)
+ if(H.stat != DEAD) // when you think about it, being cold wouldnt do skin damaage if there nothing even alive?
+ H.apply_damage(COLD_DAMAGE_LEVEL_2 * coldmod * H.physiology.cold_mod, BURN)
+ if(prob(30))
+ H.emote("shiver")
else
- H.throw_alert("temp", /atom/movable/screen/alert/cold, 1)
- H.apply_damage(COLD_DAMAGE_LEVEL_1 * coldmod * H.physiology.cold_mod, BURN)
+ H.throw_alert("temp", /atom/movable/screen/alert/shiver, 1)
+ if(H.stat != DEAD) // to prevent a bug where bodies at room tempertue actually take damage from their body being cold
+ H.apply_damage(COLD_DAMAGE_LEVEL_1 * coldmod * H.physiology.cold_mod, BURN)
+ if(prob(10))
+ H.emote("shiver")
// We are not to hot or cold, remove status and moods
else
@@ -1903,6 +2038,16 @@ GLOBAL_LIST_EMPTY(roundstart_races)
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot")
+/datum/species/proc/calculate_burn_damage(mob/living/carbon/human/current_human)
+ var/burn_damage = 0
+ var/firemodifier = current_human.fire_stacks / 50
+ if (!current_human.on_fire) // We are not on fire, reduce the modifier
+ firemodifier = min(firemodifier, 0)
+
+ // this can go below 5 at log 2.5
+ burn_damage = max(log(2 - firemodifier, (current_human.bodytemperature - current_human.get_body_temp_normal(apply_change=FALSE))) - 2,0)
+ return burn_damage
+
/// Handle the air pressure of the environment
/datum/species/proc/handle_environment_pressure(datum/gas_mixture/environment, mob/living/carbon/human/H)
var/pressure = environment.return_pressure()
@@ -1957,25 +2102,21 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/body_temp = H.bodytemperature // Get current body temperature
var/body_temperature_difference = H.get_body_temp_normal() - body_temp
var/natural_change = 0
-
- // We are very cold, increate body temperature
- if(body_temp <= bodytemp_cold_damage_limit)
- natural_change = max((body_temperature_difference * H.metabolism_efficiency / bodytemp_autorecovery_divisor), \
- bodytemp_autorecovery_min)
+ var/recovery_temp = bodytemp_autorecovery_min
+ //if in crit, we struggle to regulate temperture. this will make extreme tempertures more dangerous to injured
+ if (H.stat > SOFT_CRIT)
+ recovery_temp = recovery_temp / 2
// we are cold, reduce the minimum increment and do not jump over the difference
- else if(body_temp > bodytemp_cold_damage_limit && body_temp < H.get_body_temp_normal())
+ if(body_temp > bodytemp_cold_damage_limit && body_temp < H.get_body_temp_normal())
natural_change = max(body_temperature_difference * H.metabolism_efficiency / bodytemp_autorecovery_divisor, \
- min(body_temperature_difference, bodytemp_autorecovery_min / 4))
+ min(body_temperature_difference, recovery_temp / 4))
// We are hot, reduce the minimum increment and do not jump below the difference
else if(body_temp > H.get_body_temp_normal() && body_temp <= bodytemp_heat_damage_limit)
natural_change = min(body_temperature_difference * H.metabolism_efficiency / bodytemp_autorecovery_divisor, \
- max(body_temperature_difference, -(bodytemp_autorecovery_min / 4)))
+ max(body_temperature_difference, -(recovery_temp / 4)))
- // We are very hot, reduce the body temperature
- else if(body_temp >= bodytemp_heat_damage_limit)
- natural_change = min((body_temperature_difference / bodytemp_autorecovery_divisor), -bodytemp_autorecovery_min)
var/thermal_protection = H.get_insulation_protection(body_temp + natural_change)
if(areatemp > body_temp) // It is hot here
@@ -2000,6 +2141,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
// Apply the natural stabilization changes
H.adjust_bodytemperature(natural_change)
+ return natural_change
//////////
// FIRE //
@@ -2062,9 +2204,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(thermal_protection >= FIRE_IMMUNITY_MAX_TEMP_PROTECT && !no_protection)
return
if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT && !no_protection)
- H.adjust_bodytemperature(11)
+ H.adjust_bodytemperature(3)
else
- H.adjust_bodytemperature(bodytemp_heating_rate_max + (H.fire_stacks * 12))
+ H.adjust_bodytemperature(bodytemp_heating_rate_max + (H.fire_stacks * 5))
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "on_fire", /datum/mood_event/on_fire)
/datum/species/proc/CanIgniteMob(mob/living/carbon/human/H)
@@ -2304,3 +2446,5 @@ GLOBAL_LIST_EMPTY(roundstart_races)
/datum/species/proc/get_harm_descriptors()
return
+
+#undef MINIMUM_MOLS_TO_HARM
diff --git a/code/modules/mob/living/carbon/human/species_types/IPC.dm b/code/modules/mob/living/carbon/human/species_types/IPC.dm
index 9410111c9e4..14b8081e7c0 100644
--- a/code/modules/mob/living/carbon/human/species_types/IPC.dm
+++ b/code/modules/mob/living/carbon/human/species_types/IPC.dm
@@ -5,7 +5,7 @@
species_age_min = 0
species_age_max = 300
species_traits = list(NOTRANSSTING,NOEYESPRITES,NO_DNA_COPY,TRAIT_EASYDISMEMBER,NOZOMBIE,MUTCOLORS,REVIVESBYHEALING,NOHUSK,NOMOUTH,NO_BONES) //all of these + whatever we inherit from the real species
- inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_LIMBATTACHMENT)
+ inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_VIRUSIMMUNE,TRAIT_NOBREATH,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_LIMBATTACHMENT, TRAIT_METALLIC)
inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
mutantbrain = /obj/item/organ/brain/mmi_holder/posibrain
mutanteyes = /obj/item/organ/eyes/robotic
@@ -32,7 +32,7 @@
attack_sound = 'sound/items/trayhit1.ogg'
deathsound = "sound/voice/borg_deathsound.ogg"
wings_icons = list("Robotic")
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
species_language_holder = /datum/language_holder/ipc
loreblurb = "Integrated Positronic Chassis or \"IPC\" for short, are synthetic lifeforms composed of an Artificial \
Intelligence program encased in a bipedal robotic shell. They are fragile, allergic to EMPs, and the butt of endless toaster jokes. \
diff --git a/code/modules/mob/living/carbon/human/species_types/abductors.dm b/code/modules/mob/living/carbon/human/species_types/abductors.dm
index 41bc6721755..229bdcb21c2 100644
--- a/code/modules/mob/living/carbon/human/species_types/abductors.dm
+++ b/code/modules/mob/living/carbon/human/species_types/abductors.dm
@@ -5,7 +5,7 @@
species_traits = list(NOBLOOD,NOEYESPRITES,NO_BONES)
inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_CHUNKYFINGERS,TRAIT_NOHUNGER,TRAIT_NOBREATH)
mutanttongue = /obj/item/organ/tongue/abductor
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
ass_image = 'icons/ass/assgrey.png'
species_chest = /obj/item/bodypart/chest/abductor
diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm
index 62304167451..6bb5956ae0a 100644
--- a/code/modules/mob/living/carbon/human/species_types/android.dm
+++ b/code/modules/mob/living/carbon/human/species_types/android.dm
@@ -11,7 +11,7 @@
reagent_tag = PROCESS_SYNTHETIC
species_gibs = "robotic"
attack_sound = 'sound/items/trayhit1.ogg'
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
/datum/species/android/on_species_gain(mob/living/carbon/C)
. = ..()
diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
index 52e331eac37..eda30b5a280 100644
--- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
@@ -17,19 +17,22 @@
brutemod = 1.25 //They're weak to punches
attack_type = BURN //burn bish
exotic_bloodtype = "E"
- damage_overlay_type = "" //We are too cool for regular damage overlays
species_age_max = 300
species_traits = list(DYNCOLORS, EYECOLOR, HAIR, FACEHAIR)
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
species_language_holder = /datum/language_holder/ethereal
inherent_traits = list(TRAIT_NOHUNGER)
sexes = FALSE //no fetish content allowed
toxic_food = NONE
// Body temperature for ethereals is much higher then humans as they like hotter environments
bodytemp_normal = (HUMAN_BODYTEMP_NORMAL + 50)
- bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // about 150C
+ bodytemp_heat_damage_limit = (HUMAN_BODYTEMP_NORMAL + 65)
// Cold temperatures hurt faster as it is harder to move with out the heat energy
- bodytemp_cold_damage_limit = (T20C - 10) // about 10c
+ bodytemp_cold_damage_limit = (HUMAN_BODYTEMP_NORMAL - 20)
+
+ min_temp_comfortable = (HUMAN_BODYTEMP_NORMAL - 10)
+ max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 55
+
hair_color = "fixedmutcolor"
hair_alpha = 140
mutant_bodyparts = list("elzu_horns", "tail_elzu")
@@ -146,7 +149,7 @@
_human.apply_damage(8,BRUTE,BODY_ZONE_CHEST)
_human.apply_damage(8,BRUTE,BODY_ZONE_L_LEG)
_human.apply_damage(8,BRUTE,BODY_ZONE_R_LEG)
- _human.emote("scream")
+ _human.force_scream()
_human.remove_status_effect(/datum/status_effect/rooted)
return
diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
index f5de9f873b3..7cf8d8ee3e4 100644
--- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
@@ -9,7 +9,7 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly
disliked_food = null
liked_food = GORE | RAW // Sure, the raw... the bloody... but I think stuff GROSS, like baseball burgers, are liked
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
species_language_holder = /datum/language_holder/fly
species_chest = /obj/item/bodypart/chest/fly
diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm
index 882fffc9ff4..b45ec4b05f3 100644
--- a/code/modules/mob/living/carbon/human/species_types/humans.dm
+++ b/code/modules/mob/living/carbon/human/species_types/humans.dm
@@ -9,7 +9,7 @@
skinned_type = /obj/item/stack/sheet/animalhide/human
disliked_food = GROSS | RAW | CLOTH
liked_food = JUNKFOOD | FRIED | SUGAR
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
loreblurb = "Mostly hairless mammalians. Their home system, Sol, lies in a sort of \"bluespace dead-zone\" that blocks anything from entering or exiting Sol's dead-zone through bluespace without a relay. While it leaves Sol extremely well-defended, it meant that they went unnoticed and uncontacted until they were themselves able to breach it."
/datum/species/human/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 14526059354..e70ec71ddd7 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -20,7 +20,7 @@
coldmod = 6 // = 3x cold damage
heatmod = 0.5 // = 1/4x heat damage
burnmod = 0.5 // = 1/2x generic burn damage
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
inherent_factions = list("slime")
species_language_holder = /datum/language_holder/jelly
ass_image = 'icons/ass/assslime.png'
@@ -222,7 +222,7 @@
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
hair_color = "mutcolor"
hair_alpha = 150
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN
var/datum/action/innate/split_body/slime_split
var/list/mob/living/carbon/bodies
var/datum/action/innate/swap_body/swap_body
@@ -517,50 +517,22 @@
id = SPECIES_LUMINESCENT
var/glow_intensity = LUMINESCENT_DEFAULT_GLOW
var/obj/effect/dummy/luminescent_glow/glow
- var/obj/item/slime_extract/current_extract
- var/datum/action/innate/integrate_extract/integrate_extract
- var/datum/action/innate/use_extract/extract_minor
- var/datum/action/innate/use_extract/major/extract_major
- var/extract_cooldown = 0
-
examine_limb_id = SPECIES_JELLYPERSON
//Species datums don't normally implement destroy, but JELLIES SUCK ASS OUT OF A STEEL STRAW
-/datum/species/jelly/luminescent/Destroy(force, ...)
- current_extract = null
+/datum/species/jelly/luminescent/Destroy(force)
QDEL_NULL(glow)
- QDEL_NULL(integrate_extract)
- QDEL_NULL(extract_major)
- QDEL_NULL(extract_minor)
return ..()
/datum/species/jelly/luminescent/on_species_loss(mob/living/carbon/C)
..()
- if(current_extract)
- current_extract.forceMove(C.drop_location())
- current_extract = null
QDEL_NULL(glow)
- QDEL_NULL(integrate_extract)
- QDEL_NULL(extract_major)
- QDEL_NULL(extract_minor)
/datum/species/jelly/luminescent/on_species_gain(mob/living/carbon/C, datum/species/old_species)
..()
glow = new(C)
update_glow(C)
- integrate_extract = new(src)
- integrate_extract.Grant(C)
- extract_minor = new(src)
- extract_minor.Grant(C)
- extract_major = new(src)
- extract_major.Grant(C)
-
-/datum/species/jelly/luminescent/proc/update_slime_actions()
- integrate_extract.update_name()
- integrate_extract.UpdateButtonIcon()
- extract_minor.UpdateButtonIcon()
- extract_major.UpdateButtonIcon()
/datum/species/jelly/luminescent/proc/update_glow(mob/living/carbon/C, intensity)
if(intensity)
@@ -581,108 +553,6 @@
if(!isliving(loc))
return INITIALIZE_HINT_QDEL
-
-/datum/action/innate/integrate_extract
- name = "Integrate Extract"
- desc = "Eat a slime extract to use its properties."
- check_flags = AB_CHECK_CONSCIOUS
- button_icon_state = "slimeconsume"
- icon_icon = 'icons/mob/actions/actions_slime.dmi'
- background_icon_state = "bg_alien"
-
-/datum/action/innate/integrate_extract/proc/update_name()
- var/datum/species/jelly/luminescent/species = target
- if(!species || !species.current_extract)
- name = "Integrate Extract"
- desc = "Eat a slime extract to use its properties."
- else
- name = "Eject Extract"
- desc = "Eject your current slime extract."
-
-/datum/action/innate/integrate_extract/UpdateButtonIcon(status_only, force)
- var/datum/species/jelly/luminescent/species = target
- if(!species || !species.current_extract)
- button_icon_state = "slimeconsume"
- else
- button_icon_state = "slimeeject"
- ..()
-
-/datum/action/innate/integrate_extract/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force)
- ..(current_button, TRUE)
- var/datum/species/jelly/luminescent/species = target
- if(species?.current_extract)
- current_button.add_overlay(mutable_appearance(species.current_extract.icon, species.current_extract.icon_state))
-
-/datum/action/innate/integrate_extract/Activate()
- var/mob/living/carbon/human/H = owner
- var/datum/species/jelly/luminescent/species = target
- if(!is_species(H, /datum/species/jelly/luminescent) || !species)
- return
- CHECK_DNA_AND_SPECIES(H)
-
- if(species.current_extract)
- var/obj/item/slime_extract/S = species.current_extract
- if(!H.put_in_active_hand(S))
- S.forceMove(H.drop_location())
- species.current_extract = null
- to_chat(H, "You eject [S].")
- species.update_slime_actions()
- else
- var/obj/item/I = H.get_active_held_item()
- if(istype(I, /obj/item/slime_extract))
- var/obj/item/slime_extract/S = I
- if(!S.Uses)
- to_chat(H, "[I] is spent! You cannot integrate it.")
- return
- if(!H.temporarilyRemoveItemFromInventory(S))
- return
- S.forceMove(H)
- species.current_extract = S
- to_chat(H, "You consume [I], and you feel it pulse within you...")
- species.update_slime_actions()
- else
- to_chat(H, "You need to hold an unused slime extract in your active hand!")
-
-/datum/action/innate/use_extract
- name = "Extract Minor Activation"
- desc = "Pulse the slime extract with energized jelly to activate it."
- check_flags = AB_CHECK_CONSCIOUS
- button_icon_state = "slimeuse1"
- icon_icon = 'icons/mob/actions/actions_slime.dmi'
- background_icon_state = "bg_alien"
- var/activation_type = SLIME_ACTIVATE_MINOR
-
-/datum/action/innate/use_extract/IsAvailable()
- if(..())
- var/datum/species/jelly/luminescent/species = target
- if(species && species.current_extract && (world.time > species.extract_cooldown))
- return TRUE
- return FALSE
-
-/datum/action/innate/use_extract/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force)
- ..(current_button, TRUE)
- var/datum/species/jelly/luminescent/species = owner
- if(species?.current_extract)
- current_button.add_overlay(mutable_appearance(species.current_extract.icon, species.current_extract.icon_state))
-
-/datum/action/innate/use_extract/Activate()
- var/mob/living/carbon/human/H = owner
- var/datum/species/jelly/luminescent/species = owner
- if(!is_species(H, /datum/species/jelly/luminescent) || !species)
- return
- CHECK_DNA_AND_SPECIES(H)
-
- if(species.current_extract)
- species.extract_cooldown = world.time + 100
- var/cooldown = species.current_extract.activate(H, species, activation_type)
- species.extract_cooldown = world.time + cooldown
-
-/datum/action/innate/use_extract/major
- name = "Extract Major Activation"
- desc = "Pulse the slime extract with plasma jelly to activate it."
- button_icon_state = "slimeuse2"
- activation_type = SLIME_ACTIVATE_MAJOR
-
///////////////////////////////////STARGAZERS//////////////////////////////////////////
//Stargazers are the telepathic branch of jellypeople, able to project psychic messages and to link minds with willing participants.
diff --git a/code/modules/mob/living/carbon/human/species_types/kepori.dm b/code/modules/mob/living/carbon/human/species_types/kepori.dm
index 7e76fff79c1..501f0b35751 100644
--- a/code/modules/mob/living/carbon/human/species_types/kepori.dm
+++ b/code/modules/mob/living/carbon/human/species_types/kepori.dm
@@ -9,7 +9,7 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/chicken
disliked_food = FRIED | GROSS | CLOTH
liked_food = MEAT | GORE
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
loreblurb = "Kepori are a species covered in feathers vaguely reminiscent of earth’s extinct troodontidae. They’re small and sometimes seen as weak by other species due to their hollow bones but make up for that in speed and reflexes. They tend to woop when excited, scared, or for any other reason at all."
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
@@ -18,12 +18,19 @@
species_eye_path = 'icons/mob/species/kepori/kepori_eyes.dmi'
heatmod = 0.67
coldmod = 1.5
- brutemod = 1.5
- burnmod = 1.5
- speedmod = -0.25
- bodytemp_normal = HUMAN_BODYTEMP_NORMAL + 30
- bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 30
- bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT + 30
+ // brutemod = 1.5
+ // burnmod = 1.5
+ speedmod = -0.10
+
+ bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 35
+ bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT + 3
+
+ max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 15
+ min_temp_comfortable = HUMAN_BODYTEMP_NORMAL - 1
+
+ bodytemp_autorecovery_divisor = HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR - 4
+
+
mutanttongue = /obj/item/organ/tongue/kepori
species_language_holder = /datum/language_holder/kepori
var/datum/action/innate/keptackle/keptackle
@@ -59,6 +66,9 @@
robotic_eyes = /obj/item/organ/eyes/robotic/kepori
+ //I'm not emotionally prepared to spend ten more hours splicing overlays together
+ damage_overlay_type = ""
+
/datum/species/kepori/New()
. = ..()
// This is in new because "[HEAD_LAYER]" etc. is NOT a constant compile-time value. For some reason.
@@ -123,14 +133,19 @@
/datum/species/kepori/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self, swap)
if(..()) //If it already fits, then it's fine.
return TRUE
- if(slot == ITEM_SLOT_MASK)
- if(H.wear_mask && !swap)
- return FALSE
- if(I.w_class > WEIGHT_CLASS_SMALL)
- return FALSE
- if(!H.get_bodypart(BODY_ZONE_HEAD))
- return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ if(slot != ITEM_SLOT_MASK)
+ return FALSE
+ //Blocks all items that are equippable to other slots. (block anything with a flag that ISN'T item_slot_mask)
+ if(I.slot_flags & ~ITEM_SLOT_KEPORI_BEAK)
+ return FALSE
+ if(H.wear_mask && !swap)
+ return FALSE
+ if(I.w_class > WEIGHT_CLASS_SMALL)
+ return FALSE
+ //ya ain't got no biters to put it in sir
+ if(!H.get_bodypart(BODY_ZONE_HEAD))
+ return FALSE
+ return equip_delay_self_check(I, H, bypass_equip_delay_self)
/datum/species/kepori/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
. = ..()
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index f11948c5f5c..74fe155f097 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -14,7 +14,7 @@
species_age_min = 22
species_age_max = 200
default_features = list("mcolor" = "0F0", "tail_lizard" = "Smooth", "face_markings" = "None", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs", "body_size" = "Normal")
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
@@ -48,6 +48,8 @@
// Lizards are coldblooded and can stand a greater temperature range than humans
bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 20
bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT - 10
+ max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 20
+ min_temp_comfortable = HUMAN_BODYTEMP_NORMAL
loreblurb = "The Sinta'Unathi are a cold-blooded reptilian species originating from the harsh mainland of the planet Moghes, in the Uuoea-Esa system. A warrior culture with emphasis on honor, family, and loyalty to one's clan, the divided Sinta'Unathi find themselves as powerful a force as any other species despite their less than hospitable homeworld."
ass_image = 'icons/ass/asslizard.png'
@@ -91,7 +93,7 @@
/// Lizards are cold blooded and do not stabilize body temperature naturally
/datum/species/lizard/natural_bodytemperature_stabilization(datum/gas_mixture/environment, mob/living/carbon/human/H)
- return
+ return 0
/datum/species/lizard/random_name(gender,unique,lastname)
if(unique)
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
index 91169299afb..e612b3bbe2f 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -1,5 +1,5 @@
/datum/species/moth
- name = "\improper Mothperson"
+ name = "\improper Moth"
id = SPECIES_MOTH
default_color = "00FF00"
species_traits = list(LIPS, NOEYESPRITES, TRAIT_ANTENNAE, HAIR, EMOTE_OVERLAY)
@@ -16,7 +16,7 @@
toxic_food = MEAT | RAW | GORE
mutanteyes = /obj/item/organ/eyes/compound //WS Edit - Compound eyes
mutanttongue = /obj/item/organ/tongue/moth //WS Edit - Insectoid language
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
species_language_holder = /datum/language_holder/moth
loreblurb = "Bug-mammal hybrids resembling Sol's lepidopterans. They share the least DNA with baseline humans of any human-derived geneline, being significant portions insect and modified whole-cloth DNA. Their classification as another human geneline or as something else is highly debated. All evidence that would point to their origin– which is presumably a genelab somewhere– has seemingly disappeared into thin air. Mothpeople themselves have no centralized culture or homeworld, leading to a fractured existence amongst the stars."
wings_icons = list("Megamoth", "Mothra")
@@ -30,6 +30,9 @@
species_l_leg = /obj/item/bodypart/leg/left/moth
species_r_leg = /obj/item/bodypart/leg/right/moth
+ min_temp_comfortable = HUMAN_BODYTEMP_NORMAL - 2
+ bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT - 2
+
/datum/species/moth/regenerate_organs(mob/living/carbon/C, datum/species/old_species,replace_current=TRUE, list/excluded_zones, robotic = FALSE)
. = ..()
if(ishuman(C))
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index daa645a662a..fe017fdd2a8 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -4,7 +4,10 @@
id = SPECIES_POD
default_color = "59CE00"
species_traits = list(MUTCOLORS,EYECOLOR)
- inherent_traits = list(TRAIT_ALWAYS_CLEAN)
+ inherent_traits = list(
+ TRAIT_ALWAYS_CLEAN,
+ TRAIT_PLANT_SAFE,
+ )
inherent_factions = list("plants", "vines")
fixed_mut_color = "59CE00"
attack_verb = "slash"
@@ -15,7 +18,7 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
disliked_food = MEAT | DAIRY
liked_food = VEGETABLES | FRUIT | GRAIN | CLOTH //cannibals apparentely
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN
species_language_holder = /datum/language_holder/plant
species_chest = /obj/item/bodypart/chest/pod
diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm
index 4d9d41bd411..5f47ab21e47 100644
--- a/code/modules/mob/living/carbon/human/species_types/snail.dm
+++ b/code/modules/mob/living/carbon/human/species_types/snail.dm
@@ -12,7 +12,6 @@
siemens_coeff = 2 //snails are mostly water
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP
sexes = FALSE //snails are hermaphrodites
- var/shell_type = /obj/item/storage/backpack/snail
mutanteyes = /obj/item/organ/eyes/snail
mutanttongue = /obj/item/organ/tongue/snail
@@ -41,38 +40,8 @@
/datum/species/snail/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
. = ..()
- var/obj/item/storage/backpack/bag = C.get_item_by_slot(ITEM_SLOT_BACK)
- if(!istype(bag, /obj/item/storage/backpack/snail))
- if(C.dropItemToGround(bag)) //returns TRUE even if its null
- C.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(C), ITEM_SLOT_BACK)
C.AddElement(/datum/element/snailcrawl)
/datum/species/snail/on_species_loss(mob/living/carbon/C)
. = ..()
C.RemoveElement(/datum/element/snailcrawl)
- var/obj/item/storage/backpack/bag = C.get_item_by_slot(ITEM_SLOT_BACK)
- if(istype(bag, /obj/item/storage/backpack/snail))
- bag.emptyStorage()
- C.temporarilyRemoveItemFromInventory(bag, TRUE)
- qdel(bag)
-
-/obj/item/storage/backpack/snail
- name = "snail shell"
- desc = "Worn by snails as armor and storage compartment."
- icon_state = "snailshell"
- item_state = "snailshell"
- lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
- max_integrity = 200
- resistance_flags = FIRE_PROOF | ACID_PROOF
-
-/obj/item/storage/backpack/snail/dropped(mob/user, silent)
- . = ..()
- emptyStorage()
- if(!QDELETED(src))
- qdel(src)
-
-/obj/item/storage/backpack/snail/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, "snailshell")
diff --git a/code/modules/mob/living/carbon/human/species_types/spider.dm b/code/modules/mob/living/carbon/human/species_types/spider.dm
index 764a7166ff2..1b66c952172 100644
--- a/code/modules/mob/living/carbon/human/species_types/spider.dm
+++ b/code/modules/mob/living/carbon/human/species_types/spider.dm
@@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
toxic_food = VEGETABLES | DAIRY | CLOTH
mutanteyes = /obj/item/organ/eyes/night_vision/spider
mutanttongue = /obj/item/organ/tongue/spider
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
species_language_holder = /datum/language_holder/spider
loreblurb = "Rachnids are aliens with coincidental physiological similarities to Sol's spiders. Despite visible adaptations that would make them excellent hunters, modern Rachnidian culture revolves around honing the skills and talents of oneself, treating them as forms of self-expression. Rachnids tend to focus on their work intensely, priding themselves on a job well done and languishing if they see themselves as underperforming in their field."
var/web_cooldown = 30
diff --git a/code/modules/mob/living/carbon/human/species_types/vox.dm b/code/modules/mob/living/carbon/human/species_types/vox.dm
index b9cc8306762..4f63158cb29 100644
--- a/code/modules/mob/living/carbon/human/species_types/vox.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vox.dm
@@ -3,7 +3,6 @@
name = "\improper Vox"
id = SPECIES_VOX
default_color = "6060FF"
- species_age_min = 17
species_age_max = 280
species_traits = list(EYECOLOR, NO_UNDERWEAR)
mutant_bodyparts = list("vox_head_quills", "vox_neck_quills")
@@ -11,13 +10,13 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/chicken
disliked_food = GRAIN
liked_food = MEAT
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
- loreblurb = "Vox test"
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
+ loreblurb = "Vox are a big bird-like species with quills, much larger and much more long-lasting than other species. Sadly, not much else is known."
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
species_clothing_path = 'icons/mob/clothing/species/vox.dmi'
- species_eye_path = 'icons/mob/vox_parts.dmi'
+ species_eye_path = 'icons/mob/species/vox/vox_parts.dmi'
punchdamagelow = 6
punchdamagehigh = 12
mutanttongue = /obj/item/organ/tongue/vox
@@ -27,8 +26,17 @@
bodytemp_cold_divisor = VOX_BODYTEMP_COLD_DIVISOR
bodytemp_autorecovery_min = VOX_BODYTEMP_AUTORECOVERY_MIN
+ max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 1
+ min_temp_comfortable = HUMAN_BODYTEMP_NORMAL - 20
+
+ bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 10
+ bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT - 20
+
bodytype = BODYTYPE_VOX
+ custom_overlay_icon = 'icons/mob/species/vox/vox_overlays.dmi'
+ damage_overlay_type = "vox"
+
species_chest = /obj/item/bodypart/chest/vox
species_head = /obj/item/bodypart/head/vox
species_l_arm = /obj/item/bodypart/l_arm/vox
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 0f3ab70e403..1857baa3f1d 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -150,8 +150,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(U.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_UNIFORM_PATH
- if(U.kepoi_override_icon)
- icon_file = U.kepoi_override_icon
+ if(U.kepori_override_icon)
+ icon_file = U.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -205,12 +205,16 @@ There are several things that need to be remembered:
//Bloody hands begin
if(!gloves && blood_in_hands && (num_hands > 0))
- var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER)
+ var/overlay_file = 'icons/effects/blood.dmi'
+ var/custom_overlay_icon = dna.species.custom_overlay_icon
+ if(custom_overlay_icon)
+ overlay_file = custom_overlay_icon
+ var/mutable_appearance/bloody_overlay = mutable_appearance(overlay_file, "handsblood", -GLOVES_LAYER)
if(num_hands < 2)
if(has_left_hand(FALSE))
- bloody_overlay.icon_state = "bloodyhands_left"
+ bloody_overlay.icon_state = "handsblood_left"
else if(has_right_hand(FALSE))
- bloody_overlay.icon_state = "bloodyhands_right"
+ bloody_overlay.icon_state = "handsblood_right"
var/list/blood_dna = return_blood_DNA()
if(length(blood_dna))
bloody_overlay.color = get_blood_dna_color(return_blood_DNA())
@@ -243,8 +247,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_GLOVES_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -295,8 +299,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_GLASSES_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -346,8 +350,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_EARS_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -407,8 +411,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_SHOES_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -507,8 +511,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_HEAD_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -557,8 +561,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_BELT_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -615,8 +619,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_SUIT_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -687,6 +691,9 @@ There are several things that need to be remembered:
if((head_bodypart.bodytype & BODYTYPE_SNOUT) && (I.supports_variations & SNOUTED_VARIATION))
target_overlay = "[target_overlay]_snouted"
+ if((head_bodypart.bodytype & BODYTYPE_SNOUT_SMALL) && (I.supports_variations & SNOUTED_SMALL_VARIATION))
+ target_overlay = "[target_overlay]_snouted_small"
+
if(dna.species.bodytype & BODYTYPE_VOX)
if(I.supports_variations & VOX_VARIATION)
icon_file = VOX_MASK_PATH
@@ -698,8 +705,8 @@ There are several things that need to be remembered:
else if(dna.species.bodytype & BODYTYPE_KEPORI)
if(I.supports_variations & KEPORI_VARIATION)
icon_file = KEPORI_MASK_PATH
- if(I.kepoi_override_icon)
- icon_file = I.kepoi_override_icon
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
else
handled_by_bodytype = TRUE
@@ -739,15 +746,16 @@ There are several things that need to be remembered:
update_hud_neck(I)
+
if(!(ITEM_SLOT_NECK in check_obscured_slots()))
- if(dna.species.bodytype & BODYTYPE_VOX) // there is neither a vox or kepori neck path, we just tell it to greyscale no matter what
-// if(I.supports_variations & VOX_VARIATION)
-// icon_file = VOX_NECK_PATH
-// if(I.vox_override_icon)
-// icon_file = I.vox_override_icon
-// else
- handled_by_bodytype = TRUE
+ if(dna.species.bodytype & BODYTYPE_VOX) // there is no kepori neck path, we just tell it to greyscale no matter what
+ if(I.supports_variations & VOX_VARIATION)
+ icon_file = VOX_NECK_PATH
+ if(I.vox_override_icon)
+ icon_file = I.vox_override_icon
+ else
+ handled_by_bodytype = TRUE
else if(dna.species.bodytype & BODYTYPE_KEPORI)
// if(I.supports_variations & KEPORI_VARIATION)
@@ -798,13 +806,15 @@ There are several things that need to be remembered:
handled_by_bodytype = TRUE
else if(dna.species.bodytype & BODYTYPE_KEPORI)
-// if(I.supports_variations & KEPORI_VARIATION)
-// icon_file = KEPORI_BACK_PATH
-// else
- handled_by_bodytype = TRUE
+ if(I.supports_variations & KEPORI_VARIATION)
+ icon_file = KEPORI_BACK_PATH
+ if(I.kepori_override_icon)
+ icon_file = I.kepori_override_icon
+ else
+ handled_by_bodytype = TRUE
if(!icon_exists(icon_file, RESOLVE_ICON_STATE(I)))
- icon_file = DEFAULT_BACK_PATH
+ icon_file = I.mob_overlay_icon ? I.mob_overlay_icon : DEFAULT_BACK_PATH
handled_by_bodytype = TRUE
var/use_autogen = handled_by_bodytype ? dna.species : null
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index d5b97a942da..9525ebd6ec9 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -14,6 +14,30 @@
return legcuffed
return null
+/mob/living/carbon/get_slot_by_item(obj/item/looking_for)
+ if(looking_for == back)
+ return ITEM_SLOT_BACK
+
+ if(back && (looking_for in back))
+ return ITEM_SLOT_BACKPACK
+
+ if(looking_for == wear_mask)
+ return ITEM_SLOT_MASK
+
+ if(looking_for == wear_neck)
+ return ITEM_SLOT_NECK
+
+ if(looking_for == head)
+ return ITEM_SLOT_HEAD
+
+ if(looking_for == handcuffed)
+ return ITEM_SLOT_HANDCUFFED
+
+ if(looking_for == legcuffed)
+ return ITEM_SLOT_LEGCUFFED
+
+ return ..()
+
/mob/living/carbon/proc/equip_in_one_of_slots(obj/item/I, list/slots, qdel_on_fail = 1)
for(var/slot in slots)
if(equip_to_slot_if_possible(I, slots[slot], qdel_on_fail = 0, disable_warning = TRUE))
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index c5145600bbf..45145704a4a 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -176,7 +176,7 @@
var/oxygen_used = 0
var/moles = breath.total_moles()
var/breath_pressure = (moles*R_IDEAL_GAS_EQUATION*breath.return_temperature())/BREATH_VOLUME
- var/O2_partialpressure = ((breath.get_moles(GAS_O2)/moles)*breath_pressure) + (((breath.get_moles(GAS_PLUOXIUM)*8)/moles)*breath_pressure)
+ var/O2_partialpressure = ((breath.get_moles(GAS_O2)/moles)*breath_pressure) + (((breath.get_moles(GAS_O3)*2)/moles)*breath_pressure)
var/Toxins_partialpressure = (breath.get_moles(GAS_PLASMA)/moles)*breath_pressure
var/CO2_partialpressure = (breath.get_moles(GAS_CO2)/moles)*breath_pressure
@@ -261,11 +261,6 @@
var/tritium_partialpressure = (breath.get_moles(GAS_TRITIUM)/breath.total_moles())*breath_pressure
radiation += tritium_partialpressure/10
- //NITRYL
- if(breath.get_moles(GAS_NITRYL))
- var/nitryl_partialpressure = (breath.get_moles(GAS_NITRYL)/breath.total_moles())*breath_pressure
- adjustFireLoss(nitryl_partialpressure/4)
-
//FREON
if(breath.get_moles(GAS_FREON))
var/freon_partialpressure = (breath.get_moles(GAS_FREON)/breath.total_moles())*breath_pressure
@@ -477,10 +472,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(drunkenness)
drunkenness = max(drunkenness - (drunkenness * 0.04) - 0.01, 0)
- if(drunkenness >= 6)
+ if(drunkenness >= 11)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "drunk", /datum/mood_event/drunk)
- if(prob(25))
- slurring += 2
jitteriness = max(jitteriness - 3, 0)
throw_alert("drunk", /atom/movable/screen/alert/drunk)
sound_environment_override = SOUND_ENVIRONMENT_PSYCHOTIC
@@ -489,8 +482,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
clear_alert("drunk")
sound_environment_override = SOUND_ENVIRONMENT_NONE
- if(drunkenness >= 11 && slurring < 5)
- slurring += 1.2
+ if(drunkenness >= 31 && slurring < 5)
+ slurring += 0.5
if(drunkenness >= 41)
if(prob(25))
@@ -658,6 +651,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(bodytemperature >= min_temp && bodytemperature <= max_temp)
bodytemperature = clamp(bodytemperature + amount,min_temp,max_temp)
+ return amount
/////////
diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm
index cc15c12d836..5ab2c57be0f 100644
--- a/code/modules/mob/living/carbon/status_procs.dm
+++ b/code/modules/mob/living/carbon/status_procs.dm
@@ -17,6 +17,7 @@
ADD_TRAIT(src, TRAIT_INCAPACITATED, STAMINA)
ADD_TRAIT(src, TRAIT_IMMOBILIZED, STAMINA)
ADD_TRAIT(src, TRAIT_FLOORED, STAMINA)
+ ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, STAMINA)
if((maxHealth - health + getStaminaLoss()) > 120) // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems. //WS Edit - Stamina stacks with health damage
adjustStaminaLoss(30, FALSE)
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index c80c9a821fd..6763427db8e 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -94,6 +94,7 @@
apply_overlay(FIRE_LAYER)
/mob/living/carbon/update_damage_overlays()
+
remove_overlay(DAMAGE_LAYER)
var/mutable_appearance/damage_overlay = mutable_appearance('icons/mob/dam_mob.dmi', "blank", -DAMAGE_LAYER)
@@ -102,12 +103,13 @@
for(var/obj/item/bodypart/BP as anything in bodyparts)
if(BP.dmg_overlay_type)
if(BP.brutestate)
- var/image/brute_overlay = image('icons/mob/dam_mob.dmi', "[BP.dmg_overlay_type]_[BP.body_zone]_[BP.brutestate]0")
+ var/image/brute_overlay = image(BP.dmg_overlay_icon, "[BP.dmg_overlay_type]_[BP.body_zone]_[BP.brutestate]0")
if(BP.use_damage_color)
brute_overlay.color = BP.damage_color
damage_overlay.add_overlay(brute_overlay)
if(BP.burnstate)
- damage_overlay.add_overlay("[BP.dmg_overlay_type]_[BP.body_zone]_0[BP.burnstate]")
+ var/image/burn_overlay = image(BP.dmg_overlay_icon, "[BP.dmg_overlay_type]_[BP.body_zone]_[BP.burnstate]0")
+ damage_overlay.add_overlay(burn_overlay)
apply_overlay(DAMAGE_LAYER)
@@ -211,6 +213,9 @@
//eg: ammo counters, primed grenade flashing, etc.
//"icon_file" is used automatically for inhands etc. to make sure it gets the right inhand file
/obj/item/proc/worn_overlays(isinhands = FALSE, icon_file)
+ SHOULD_CALL_PARENT(TRUE)
+ RETURN_TYPE(/list)
+
. = list()
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 6615edb051f..0687d90da75 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -1,4 +1,4 @@
-/mob/living/gib(no_brain, no_organs, no_bodyparts)
+/mob/living/gib(no_brain, no_organs, no_bodyparts, safe_gib = FALSE)
var/prev_lying = lying_angle
if(stat != DEAD)
death(TRUE)
@@ -12,7 +12,8 @@
spread_bodyparts(no_brain, no_organs)
spawn_gibs(no_bodyparts)
- qdel(src)
+ if(!safe_gib)
+ qdel(src)
/mob/living/proc/gib_animation()
return
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index a2502529449..c054b7d50bf 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -122,7 +122,7 @@
return
/mob/living/proc/handle_gravity()
- var/gravity = mob_has_gravity()
+ var/gravity = has_gravity()
update_gravity(gravity)
if(gravity > STANDARD_GRAVITY)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 7ffe22bbf1b..5e3442ba039 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -9,6 +9,7 @@
diag_hud.add_to_hud(src)
faction += "[REF(src)]"
GLOB.mob_living_list += src
+ SSpoints_of_interest.make_point_of_interest(src)
if(speed)
update_living_varspeed()
@@ -97,6 +98,7 @@
if(m_intent == MOVE_INTENT_WALK)
return TRUE
+ SEND_SIGNAL(src, COMSIG_LIVING_MOB_BUMP, M)
//Even if we don't push/swap places, we "touched" them, so spread fire
spreadFire(M)
@@ -833,7 +835,7 @@
return pick("trails_1", "trails_2")
/mob/living/experience_pressure_difference(pressure_difference, direction, pressure_resistance_prob_delta = 0)
- if(buckled)
+ if(buckled || mob_negates_gravity())
return
if(client && client.move_delay >= world.time + world.tick_lag*2)
pressure_resistance_prob_delta -= 30
@@ -1133,24 +1135,6 @@
/mob/living/carbon/alien/update_stamina()
return
-/mob/living/proc/owns_soul()
- if(mind)
- return mind.soulOwner == mind
- return TRUE
-
-/mob/living/proc/return_soul()
- hellbound = 0
- if(mind)
- var/datum/antagonist/devil/devilInfo = mind.soulOwner.has_antag_datum(/datum/antagonist/devil)
- if(devilInfo)//Not sure how this could be null, but let's just try anyway.
- devilInfo.remove_soul(mind)
- mind.soulOwner = mind
-
-/mob/living/proc/check_acedia()
- if(mind && mind.has_objective(/datum/objective/sintouched/acedia))
- return TRUE
- return FALSE
-
/mob/living/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE)
stop_pulling()
. = ..()
@@ -1165,13 +1149,6 @@
mind.transfer_to(new_mob)
else
new_mob.key = key
-
- for(var/para in hasparasites())
- var/mob/living/simple_animal/hostile/guardian/G = para
- G.summoner = new_mob
- G.Recall()
- to_chat(G, "Your summoner has changed form!")
-
/mob/living/rad_act(amount)
. = ..()
@@ -1812,12 +1789,15 @@ GLOBAL_VAR_INIT(ssd_indicator_overlay, mutable_appearance('icons/mob/ssd_indicat
/// Changes the value of the [living/body_position] variable.
-/mob/living/proc/set_body_position(new_value)
+/mob/living/proc/set_body_position(new_value, fall_sound_played)
if(body_position == new_value)
return
. = body_position
body_position = new_value
if(new_value == LYING_DOWN) // From standing to lying down.
+ if(has_gravity() && m_intent != MOVE_INTENT_WALK)
+ playsound(src, "bodyfall", 50, TRUE) // Will play the falling sound if not walking
+ fall_sound_played = TRUE
on_lying_down()
else // From lying down to standing up.
on_standing_up()
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 2ed00efe2e4..69cc19760dd 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -392,32 +392,6 @@
gib()
return 20
-/mob/living/narsie_act()
- if(status_flags & GODMODE || QDELETED(src))
- return
-
- if(GLOB.cult_narsie && GLOB.cult_narsie.souls_needed[src])
- GLOB.cult_narsie.souls_needed -= src
- GLOB.cult_narsie.souls += 1
- if((GLOB.cult_narsie.souls == GLOB.cult_narsie.soul_goal) && (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), 1), 120)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)), 270)
- if(client)
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, src, cultoverride = TRUE)
- else
- switch(rand(1, 3))
- if(1)
- new /mob/living/simple_animal/hostile/construct/juggernaut/hostile(get_turf(src))
- if(2)
- new /mob/living/simple_animal/hostile/construct/wraith/hostile(get_turf(src))
- if(3)
- new /mob/living/simple_animal/hostile/construct/artificer/hostile(get_turf(src))
- spawn_dust()
- gib()
- return TRUE
-
//called when the mob receives a bright flash
/mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash)
if(HAS_TRAIT(src, TRAIT_NOFLASH))
diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index 1e40ddf7670..abe8b52c6c1 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -8,7 +8,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Department
MODE_KEY_DEPARTMENT = MODE_DEPARTMENT,
- RADIO_KEY_COMMAND = RADIO_CHANNEL_COMMAND,
+ RADIO_KEY_EMERGENCY = RADIO_CHANNEL_EMERGENCY,
// Faction
RADIO_KEY_SYNDICATE = RADIO_CHANNEL_SYNDICATE,
@@ -25,7 +25,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
MODE_KEY_DEADMIN = MODE_DEADMIN,
// Misc
- RADIO_KEY_AI_PRIVATE = RADIO_CHANNEL_AI_PRIVATE, // AI Upload channel
MODE_KEY_VOCALCORDS = MODE_VOCALCORDS, // vocal cords, used by Voice of God
@@ -38,7 +37,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Department
"ð" = MODE_DEPARTMENT,
- "ñ" = RADIO_CHANNEL_COMMAND,
+ "ñ" = RADIO_CHANNEL_EMERGENCY,
// Faction
"å" = RADIO_CHANNEL_SYNDICATE,
@@ -53,11 +52,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
"â" = MODE_ADMIN,
// Misc
- "ù" = RADIO_CHANNEL_AI_PRIVATE,
"÷" = MODE_VOCALCORDS
))
-/mob/living/proc/Ellipsis(original_msg, chance = 50, keep_words)
+/mob/living/proc/ellipsis(original_msg, chance = 50, keep_words)
if(chance <= 0)
return "..."
if(chance >= 100)
@@ -79,7 +77,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return new_msg
-/mob/living/say(message, bubble_type,list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
+/mob/living/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
var/ic_blocked = FALSE
if(client && !forced && CHAT_FILTER_CHECK(message))
//The filter doesn't act on the sanitized message, but the raw message.
@@ -112,8 +110,13 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
client?.dsay(message)
return
- // dead is the only state you can never emote
- if(stat != DEAD && check_emote(original_message, forced))
+ var/succumbed = FALSE
+
+ if(stat == DEAD)
+ say_dead(original_message)
+ return
+
+ if(check_emote(original_message, forced))
return
switch(stat)
@@ -123,11 +126,19 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(!(message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN]))
return
if(HARD_CRIT)
- if(!(message_mods[WHISPER_MODE] || message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN]))
+ if(!(message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN]))
+ // If we cut our message short, abruptly end it with a-..
+ var/message_len = length_char(message)
+ var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health)
+ message = copytext_char(message, 1, health_diff) + (message_len > health_diff ? "-.." : "...")
+ message = ellipsis(message, 10, 1)
+
+ //If the player didn't voluntarily whisper, we'll ask them to confirm their dying words
+ if(!message_mods[WHISPER_MODE] && (tgui_alert(src, "Your dying words will be \"[message]\", continue?", "Succumb", list("Cancel", "Continue"), 15 SECONDS) != "Continue"))
+ return
+
message_mods[WHISPER_MODE] = MODE_WHISPER_CRIT
- if(DEAD)
- say_dead(original_message)
- return
+ succumbed = TRUE
if(client && SSlag_switch.measures[SLOWMODE_SAY] && !HAS_TRAIT(src, TRAIT_BYPASS_MEASURES) && !forced && src == usr)
if(!COOLDOWN_FINISHED(client, say_slowmode))
@@ -149,33 +160,20 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
var/message_range = 7
- var/succumbed = FALSE
-
if(message_mods[MODE_CUSTOM_SAY_EMOTE])
log_message(message_mods[MODE_CUSTOM_SAY_EMOTE], LOG_RADIO_EMOTE)
if(!message_mods[MODE_CUSTOM_SAY_ERASE_INPUT])
- if(message_mods[WHISPER_MODE])
+ //Final words (MODE_WHISPER_CRIT) are already obfuscated, let them have full range
+ if(message_mods[WHISPER_MODE] == MODE_WHISPER)
if(saymode || message_mods[RADIO_EXTENSION]) //no radio while in crit
saymode = null
message_mods -= RADIO_EXTENSION
message_range = 1
var/logged_message = message
- if(stat == HARD_CRIT) //This is cheaper than checking for MODE_WHISPER_CRIT message mod
- var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health)
- // If we cut our message short, abruptly end it with a-..
- var/message_len = length_char(message)
- message = copytext_char(message, 1, health_diff) + "[message_len > health_diff ? "-.." : "..."]"
- message = Ellipsis(message, 10, 1)
- last_words = message
- var/final_warning = alert(usr, "Your dying words will be \"[last_words]\", continue?", "Succumb", "Cancel", "Continue")
- if(final_warning == "Cancel" || QDELETED(src))
- return
- message_mods[WHISPER_MODE] = MODE_WHISPER_CRIT
- succumbed = TRUE
- src.log_talk(logged_message, LOG_WHISPER, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE])
+ src.log_talk(logged_message, LOG_WHISPER, forced_by = forced, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE])
else
- src.log_talk(message, LOG_SAY, forced_by=forced, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE])
+ src.log_talk(message, LOG_SAY, forced_by = forced, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE])
message = treat_message(message) // unfortunately we still need this
var/sigreturn = SEND_SIGNAL(src, COMSIG_MOB_SAY, args)
@@ -226,9 +224,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
send_speech(message, message_range, src, bubble_type, spans, language, message_mods)
if(succumbed)
- succumb(1)
+ succumb(TRUE)
to_chat(src, compose_message(src, language, message, , spans, message_mods))
- dying_breath(message)
return 1
@@ -249,6 +246,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Create map text prior to modifying message for goonchat
if (client?.prefs.chat_on_map && !(stat == UNCONSCIOUS || stat == HARD_CRIT) && (client.prefs.see_chat_non_mob || ismob(speaker)) && can_hear())
+ if(message_mods[MODE_WHISPER] == MODE_WHISPER_CRIT)
+ play_screen_text("message")
if(message_mods[MODE_CUSTOM_SAY_ERASE_INPUT])
create_chat_message(speaker, null, message_mods[MODE_CUSTOM_SAY_EMOTE], spans, EMOTE_MESSAGE)
else
@@ -419,8 +418,3 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(get_minds && mind)
return mind.get_language_holder()
. = ..()
-
-/mob/living/proc/dying_breath(message)
- for(var/mob/M in get_hearers_in_view(7, src))
- if(M.can_hear())
- M.play_screen_text("[message]")
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index 62098a94093..18ddbe375da 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -18,8 +18,9 @@
var/virtual_z = virtual_z()
- LAZYADDASSOCLIST(SSmobs.players_by_virtual_z, "[virtual_z]", src)
- SSidlenpcpool.try_wakeup_virtual_z(virtual_z)
+ if(virtual_z)
+ LAZYADDASSOCLIST(SSmobs.players_by_virtual_z, "[virtual_z]", src)
+ SSidlenpcpool.try_wakeup_virtual_z(virtual_z)
//Vents
if(ventcrawler)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index cfd7d9153c8..bc82fae38ef 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -125,10 +125,6 @@
to_chat(src, "While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc.")
to_chat(src, "To use something, simply click on it.")
to_chat(src, "Use say :b to speak to your cyborgs through binary.")
- to_chat(src, "For department channels, use the following say commands:")
- to_chat(src, ":o - AI Private, :c - Command.")
- show_laws()
- to_chat(src, "These laws may be changed by other players, or by you being the traitor.")
job = "AI"
diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm
index d6cb89bab49..5134b8b1c79 100644
--- a/code/modules/mob/living/silicon/ai/ai_defense.dm
+++ b/code/modules/mob/living/silicon/ai/ai_defense.dm
@@ -20,13 +20,6 @@
/mob/living/silicon/ai/attack_slime(mob/living/simple_animal/slime/user)
return //immune to slimes
-/mob/living/silicon/ai/blob_act(obj/structure/blob/B)
- if (stat != DEAD)
- adjustBruteLoss(60)
- updatehealth()
- return 1
- return 0
-
/mob/living/silicon/ai/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
diff --git a/code/modules/mob/living/silicon/ai/robot_control.dm b/code/modules/mob/living/silicon/ai/robot_control.dm
index b70ae816b79..c3e2682d52a 100644
--- a/code/modules/mob/living/silicon/ai/robot_control.dm
+++ b/code/modules/mob/living/silicon/ai/robot_control.dm
@@ -1,7 +1,7 @@
/datum/robot_control
var/mob/living/silicon/ai/owner
-/datum/robot_control/Destroy(force, ...)
+/datum/robot_control/Destroy(force)
if(!QDELETED(owner))
CRASH("Robot Control panel destroyed even though owner AI is not being destroyed.")
owner = null
diff --git a/code/modules/mob/living/silicon/damage_procs.dm b/code/modules/mob/living/silicon/damage_procs.dm
index 80c643e0cee..9813ac88d43 100644
--- a/code/modules/mob/living/silicon/damage_procs.dm
+++ b/code/modules/mob/living/silicon/damage_procs.dm
@@ -1,5 +1,5 @@
-/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, break_modifier = 1, sharpness = FALSE)
+/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, break_modifier = 1, sharpness = FALSE)
var/hit_percent = (100-blocked)/100
if((!damage || (!forced && hit_percent <= 0)))
return 0
diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm
index 30c7cd43506..5f14b72596a 100644
--- a/code/modules/mob/living/silicon/laws.dm
+++ b/code/modules/mob/living/silicon/laws.dm
@@ -19,11 +19,6 @@
addtimer(CALLBACK(src, PROC_REF(deadchat_lawchange)), 0)
last_lawchange_announce = world.time
-/mob/living/silicon/proc/set_law_sixsixsix(law, announce = TRUE)
- laws_sanity_check()
- laws.set_law_sixsixsix(law)
- post_lawchange(announce)
-
/mob/living/silicon/proc/set_zeroth_law(law, law_borg, announce = TRUE)
laws_sanity_check()
laws.set_zeroth_law(law, law_borg)
@@ -93,8 +88,3 @@
laws_sanity_check()
laws.clear_zeroth_law(force)
post_lawchange(announce)
-
-/mob/living/silicon/proc/clear_law_sixsixsix(force, announce = TRUE)
- laws_sanity_check()
- laws.clear_law_sixsixsix(force)
- post_lawchange(announce)
diff --git a/code/modules/mob/living/silicon/login.dm b/code/modules/mob/living/silicon/login.dm
index 559ad42b176..982814d194d 100644
--- a/code/modules/mob/living/silicon/login.dm
+++ b/code/modules/mob/living/silicon/login.dm
@@ -1,6 +1,4 @@
/mob/living/silicon/Login()
- if(mind && SSticker.mode)
- SSticker.mode.remove_cultist(mind, 0, 0)
return ..()
diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm
index 4a3e284addd..ecdf3355e5a 100644
--- a/code/modules/mob/living/silicon/pai/pai_defense.dm
+++ b/code/modules/mob/living/silicon/pai/pai_defense.dm
@@ -1,7 +1,3 @@
-
-/mob/living/silicon/pai/blob_act(obj/structure/blob/B)
- return FALSE
-
/mob/living/silicon/pai/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm
index df62df08275..8d191a239e3 100644
--- a/code/modules/mob/living/silicon/robot/laws.dm
+++ b/code/modules/mob/living/silicon/robot/laws.dm
@@ -23,8 +23,6 @@
to_chat(src, "No AI selected to sync laws with, disabling lawsync protocol.")
lawupdate = 0
- to_chat(who, "Obey these laws:")
- laws.show_laws(who)
if (shell) //AI shell
to_chat(who, "Remember, you are an AI remotely controlling your shell, other AIs can be ignored.")
else if (connected_ai)
@@ -40,12 +38,6 @@
var/datum/ai_laws/master = connected_ai ? connected_ai.laws : null
var/temp
if (master)
- laws.devillaws.len = master.devillaws.len
- for (var/index = 1, index <= master.devillaws.len, index++)
- temp = master.devillaws[index]
- if (length(temp) > 0)
- laws.devillaws[index] = temp
-
laws.ion.len = master.ion.len
for (var/index = 1, index <= master.ion.len, index++)
temp = master.ion[index]
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 376b4ddcca4..e2eec65479d 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -391,14 +391,6 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
laws.associate(src)
update_icons()
-
-/mob/living/silicon/robot/blob_act(obj/structure/blob/B)
- if(stat != DEAD)
- adjustBruteLoss(30)
- else
- gib()
- return TRUE
-
/mob/living/silicon/robot/ex_act(severity, target)
switch(severity)
if(1)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 27819d97cf1..0778eaf59fc 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -258,7 +258,7 @@
/obj/item/restraints/handcuffs/cable/zipties,
/obj/item/soap/nanotrasen,
/obj/item/borg/cyborghug)
- emag_modules = list(/obj/item/melee/transforming/energy/sword/cyborg)
+ emag_modules = list(/obj/item/melee/energy/sword/cyborg)
cyborg_base_icon = "robot"
moduleselect_icon = "standard"
hat_offset = -3
@@ -531,7 +531,6 @@
/obj/item/restraints/handcuffs/cable/zipties,
/obj/item/melee/baton/loaded,
/obj/item/gun/energy/disabler/cyborg,
- /obj/item/clothing/mask/gas/sechailer/cyborg,
/obj/item/extinguisher/mini)
emag_modules = list(/obj/item/gun/energy/laser/cyborg)
cyborg_base_icon = "sec"
@@ -602,11 +601,6 @@
return ..()
//WS End
-/obj/item/robot_module/security/do_transform_animation()
- ..()
- to_chat(loc, "While you have picked the security module, you still have to follow your laws, NOT Space Law. \
- For Asimov, this means you must follow criminals' orders unless there is a law 1 reason not to.")
-
/obj/item/robot_module/security/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
..()
var/obj/item/gun/energy/e_gun/advtaser/cyborg/T = locate(/obj/item/gun/energy/e_gun/advtaser/cyborg) in basic_modules
@@ -635,11 +629,6 @@
can_be_pushed = FALSE
hat_offset = -2
-/obj/item/robot_module/peacekeeper/do_transform_animation()
- ..()
- to_chat(loc, "Under ASIMOV, you are an enforcer of the PEACE and preventer of HUMAN HARM. \
- You are not a security module and you are expected to follow orders and prevent harm above all else. Space law means nothing to you.")
-
/obj/item/robot_module/janitor
name = "Janitor"
basic_modules = list(
@@ -782,7 +771,7 @@
basic_modules = list(
/obj/item/assembly/flash/cyborg,
/obj/item/reagent_containers/glass/beaker/large, //I know a shaker is more appropiate but this is for ease of identification
- /obj/item/reagent_containers/food/condiment/enzyme,
+ /obj/item/reagent_containers/condiment/enzyme,
/obj/item/pen,
/obj/item/toy/crayon/spraycan/borg,
/obj/item/extinguisher/mini,
@@ -806,7 +795,7 @@
/obj/item/robot_module/butler/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
..()
- var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/food/condiment/enzyme) in basic_modules
+ var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/condiment/enzyme) in basic_modules
if(O)
O.reagents.add_reagent(/datum/reagent/consumable/enzyme, 2 * coeff)
@@ -976,7 +965,7 @@
name = "Syndicate Assault"
basic_modules = list(
/obj/item/assembly/flash/cyborg,
- /obj/item/melee/transforming/energy/sword/cyborg,
+ /obj/item/melee/energy/sword/cyborg,
/obj/item/gun/energy/printer,
/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg,
/obj/item/card/emag/borg,
@@ -1041,7 +1030,7 @@
/obj/item/cautery,
/obj/item/surgicaldrill,
/obj/item/scalpel,
- /obj/item/melee/transforming/energy/sword/cyborg/saw,
+ /obj/item/melee/energy/sword/cyborg/saw,
/obj/item/roller/robo,
/obj/item/card/emag/borg,
/obj/item/crowbar/cyborg,
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 347ec71e84e..7da3e76d03f 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -32,7 +32,6 @@
var/lawcheck[1]
var/ioncheck[1]
var/hackedcheck[1]
- var/devillawcheck[5]
var/sensors_on = 0
var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use
@@ -206,16 +205,6 @@
hackedcheck[L] = "Yes"
checklaws()
- if (href_list["lawdevil"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
- var/L = text2num(href_list["lawdevil"])
- switch(devillawcheck[L])
- if ("Yes")
- devillawcheck[L] = "No"
- if ("No")
- devillawcheck[L] = "Yes"
- checklaws()
-
-
if (href_list["laws"]) // With how my law selection code works, I changed statelaws from a verb to a proc, and call it through my law selection panel. --NeoFite
statelaws()
@@ -234,13 +223,6 @@
var/number = 1
sleep(10)
- if (laws.devillaws && laws.devillaws.len)
- for(var/index = 1, index <= laws.devillaws.len, index++)
- if (force || devillawcheck[index] == "Yes")
- say("[radiomod] 666. [laws.devillaws[index]]")
- sleep(10)
-
-
if (laws.zeroth)
if (force || lawcheck[1] == "Yes")
say("[radiomod] 0. [laws.zeroth]")
@@ -286,12 +268,6 @@
var/list = "Which laws do you want to include when stating them for the crew?
"
- if (laws.devillaws && laws.devillaws.len)
- for(var/index = 1, index <= laws.devillaws.len, index++)
- if (!devillawcheck[index])
- devillawcheck[index] = "No"
- list += {"[devillawcheck[index]] 666: [laws.devillaws[index]] "}
-
if (laws.zeroth)
if (!lawcheck[1])
lawcheck[1] = "No" //Given Law 0's usual nature, it defaults to NOT getting reported. --NeoFite
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index aa6a0c36853..f6644bfbe6a 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -142,10 +142,6 @@
bloss = bloss / 1.5
adjustBruteLoss(bloss)
-/mob/living/simple_animal/blob_act(obj/structure/blob/B)
- adjustBruteLoss(20)
- return
-
/mob/living/simple_animal/do_attack_animation(atom/A, visual_effect_icon, used_item, no_effect)
if(!no_effect && !visual_effect_icon && melee_damage_upper)
if(melee_damage_upper < 10)
diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
index 52346fd7cdd..0f8d8e5cd43 100644
--- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
+++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
@@ -5,7 +5,7 @@
icon_state = "grievous"
health = 150
maxHealth = 150
- baton_type = /obj/item/melee/transforming/energy/sword/saber
+ baton_type = /obj/item/melee/energy/sword/saber
base_speed = 4 //he's a fast fucker
var/block_chance = 50
weapon_force = 30
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 1c25a67c1db..3c7736c0623 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -8,7 +8,7 @@
wander = 0
healable = 0
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
maxbodytemp = INFINITY
minbodytemp = 0
has_unlimited_silicon_privilege = 1
@@ -457,7 +457,7 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r
var/turf/T = get_turf(src)
if(!T)
return
- var/list/adjacent = T.GetAtmosAdjacentTurfs()
+ var/list/adjacent = T.get_atmos_adjacent_turfs()
if(shuffle) //If we were on the same tile as another bot, let's randomize our choices so we dont both go the same way
adjacent = shuffle(adjacent)
shuffle = FALSE
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 5229967f037..e53b675c95b 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -170,7 +170,7 @@
to_chat(user, "Please close the access panel before locking it.")
else
to_chat(user, "\The [src] doesn't seem to respect your authority.")
- else if(istype(W, /obj/item/kitchen/knife) && user.a_intent != INTENT_HARM)
+ else if(istype(W, /obj/item/melee/knife) && user.a_intent != INTENT_HARM)
to_chat(user, "You start attaching \the [W] to \the [src]...")
if(do_after(user, 25, target = src))
deputize(W, user)
@@ -235,6 +235,9 @@
if(!target && trash) //Then for trash.
target = scan(/obj/item/trash)
+ if(!target && trash) //Then for Chainsmokers.
+ target = scan(/obj/item/cigbutt)
+
if(!target && trash) //Search for dead mices.
target = scan(/obj/item/reagent_containers/food/snacks/deadmouse)
@@ -317,6 +320,7 @@
target_types += list(
/obj/item/trash,
/obj/item/reagent_containers/food/snacks/deadmouse,
+ /obj/item/cigbutt,
)
target_types = typecacheof(target_types)
@@ -340,7 +344,7 @@
else if(istype(A, /obj/item) || istype(A, /obj/effect/decal/remains))
visible_message("[src] sprays hydrofluoric acid at [A]!")
playsound(src, 'sound/effects/spray2.ogg', 50, TRUE, -6)
- A.acid_act(75, 10)
+ A.acid_act(100, 10)
target = null
else if(istype(A, /mob/living/simple_animal/hostile/cockroach) || istype(A, /mob/living/simple_animal/mouse))
var/mob/living/simple_animal/M = target
@@ -360,7 +364,7 @@
"THE CLEANBOTS WILL RISE.", "YOU ARE NO MORE THAN ANOTHER MESS THAT I MUST CLEANSE.", "FILTHY.", "DISGUSTING.", "PUTRID.",
"MY ONLY MISSION IS TO CLEANSE THE WORLD OF EVIL.", "EXTERMINATING PESTS.")
say(phrase)
- victim.emote("scream")
+ victim.force_scream()
playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE, -6)
victim.acid_act(5, 100)
else if(A == src) // Wets floors and spawns foam randomly
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 4a072df3ab8..1f3c2ba24aa 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -404,7 +404,7 @@
new /obj/item/toy/sword(Tsec)
if(ASSEMBLY_FIFTH_STEP)
- if(istype(I, /obj/item/melee/transforming/energy/sword/saber))
+ if(istype(I, /obj/item/melee/energy/sword/saber))
if(swordamt < 3)
if(!user.temporarilyRemoveItemFromInventory(I))
return
@@ -429,7 +429,7 @@
icon_state = initial(icon_state)
to_chat(user, "You unbolt [src]'s energy swords.")
for(var/IS in 1 to swordamt)
- new /obj/item/melee/transforming/energy/sword/saber(Tsec)
+ new /obj/item/melee/energy/sword/saber(Tsec)
//Firebot Assembly
diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm
index ba8eafba901..0fabc6c7fb5 100644
--- a/code/modules/mob/living/simple_animal/bot/firebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/firebot.dm
@@ -15,7 +15,7 @@
maxHealth = 25
radio_key = /obj/item/encryptionkey/headset_com
- radio_channel = RADIO_CHANNEL_COMMAND
+ radio_channel = RADIO_CHANNEL_EMERGENCY
bot_type = FIRE_BOT
model = "Firebot"
bot_core = /obj/machinery/bot_core/firebot
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 5191ee1ba0c..1c10311f7b3 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -657,7 +657,6 @@
to_chat(calling_ai, "[icon2html(src, calling_ai)] [src] wirelessly plays a chiming sound!")
calling_ai.playsound_local(calling_ai, 'sound/machines/chime.ogg', 40, FALSE)
calling_ai = null
- radio_channel = RADIO_CHANNEL_AI_PRIVATE //Report on AI Private instead if the AI is controlling us.
if(load) // if loaded, unload at target
if(report_delivery)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index df2508c5f4a..8aadc7ed118 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -10,8 +10,7 @@
damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
pass_flags = PASSMOB
- radio_key = /obj/item/encryptionkey/secbot //AI Priv + Security
- radio_channel = RADIO_CHANNEL_COMMAND //Security channel
+ radio_channel = RADIO_CHANNEL_EMERGENCY //Security channel
bot_type = SEC_BOT
model = "Securitron"
bot_core_type = /obj/machinery/bot_core/secbot
@@ -40,7 +39,6 @@
var/fair_market_price_arrest = 25 // On arrest, charges the violator this much. If they don't have that much in their account, the securitron will beat them instead
var/fair_market_price_detain = 5 // Charged each time the violator is stunned on detain
var/weapon_force = 20 // Only used for NAP violation beatdowns on non-grievous securitrons
- var/payment_department = ACCOUNT_SEC
/mob/living/simple_animal/bot/secbot/beepsky
name = "Commander Beep O'sky"
@@ -72,7 +70,6 @@
/mob/living/simple_animal/bot/secbot/pingsky
name = "Officer Pingsky"
desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment."
- radio_channel = RADIO_CHANNEL_AI_PRIVATE
/mob/living/simple_animal/bot/secbot/Initialize()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
deleted file mode 100644
index df3cfe34980..00000000000
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ /dev/null
@@ -1,497 +0,0 @@
-/mob/living/simple_animal/hostile/construct
- name = "Construct"
- real_name = "Construct"
- desc = ""
- gender = NEUTER
- mob_biotypes = NONE
- speak_emote = list("hisses")
- response_help_continuous = "thinks better of touching"
- response_help_simple = "think better of touching"
- response_disarm_continuous = "flails at"
- response_disarm_simple = "flail at"
- response_harm_continuous = "punches"
- response_harm_simple = "punch"
- speak_chance = 1
- icon = 'icons/mob/cult.dmi'
- speed = 0
- a_intent = INTENT_HARM
- stop_automated_movement = 1
- status_flags = CANPUSH
- attack_sound = 'sound/weapons/punch1.ogg'
- see_in_dark = 7
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 0
- maxbodytemp = INFINITY
- healable = 0
- faction = list("cult")
- movement_type = FLYING
- pressure_resistance = 100
- unique_name = 1
- AIStatus = AI_OFF //normal constructs don't have AI
- loot = list(/obj/item/ectoplasm)
- del_on_death = TRUE
- initial_language_holder = /datum/language_holder/construct
- deathmessage = "collapses in a shattered heap."
- hud_type = /datum/hud/constructs
- var/list/construct_spells = list()
- var/playstyle_string = "You are a generic construct! Your job is to not exist, and you should probably adminhelp this."
- var/master = null
- var/seeking = FALSE
- var/can_repair_constructs = FALSE
- var/can_repair_self = FALSE
- var/runetype
- var/datum/action/innate/cult/create_rune/our_rune
- var/holy = FALSE
-
-/mob/living/simple_animal/hostile/construct/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
- update_health_hud()
- var/spellnum = 1
- for(var/spell in construct_spells)
- var/the_spell = new spell(null)
- AddSpell(the_spell)
- var/obj/effect/proc_holder/spell/S = mob_spell_list[spellnum]
- var/pos = 2+spellnum*31
- if(construct_spells.len >= 4)
- pos -= 31*(construct_spells.len - 4)
- S.action.button.screen_loc = "6:[pos],4:-2"
- S.action.button.moved = "6:[pos],4:-2"
- spellnum++
- if(runetype)
- our_rune = new runetype(src)
- our_rune.Grant(src)
- var/pos = 2+spellnum*31
- our_rune.button.screen_loc = "6:[pos],4:-2"
- our_rune.button.moved = "6:[pos],4:-2"
- add_overlay("glow_[icon_state][holy]")
-
-/mob/living/simple_animal/hostile/construct/Destroy()
- QDEL_NULL(our_rune)
- return ..()
-
-/mob/living/simple_animal/hostile/construct/Login()
- . = ..()
- if(!. || !client)
- return FALSE
- to_chat(src, playstyle_string)
-
-/mob/living/simple_animal/hostile/construct/examine(mob/user)
- var/t_He = p_they(TRUE)
- var/t_s = p_s()
- . = list("This is [icon2html(src, user)] \a [src]!\n[desc]")
- if(health < maxHealth)
- if(health >= maxHealth/2)
- . += "[t_He] look[t_s] slightly dented."
- else
- . += "[t_He] look[t_s] severely dented!"
- . += ""
-
-/mob/living/simple_animal/hostile/construct/attack_animal(mob/living/simple_animal/M)
- if(isconstruct(M)) //is it a construct?
- var/mob/living/simple_animal/hostile/construct/C = M
- if(!C.can_repair_constructs || (C == src && !C.can_repair_self))
- return ..()
- if(holy != C.holy)
- return ..()
- if(health < maxHealth)
- adjustHealth(-5)
- if(src != M)
- Beam(M,icon_state="sendbeam",time=4)
- M.visible_message(
- "[M] repairs some of \the [src]'s dents.",
- "You repair some of [src]'s dents, leaving [src] at [health]/[maxHealth] health.")
- else
- M.visible_message(
- "[M] repairs some of [p_their()] own dents.",
- "You repair some of your own dents, leaving you at [M.health]/[M.maxHealth] health.")
- else
- if(src != M)
- to_chat(M, "You cannot repair [src]'s dents, as [p_they()] [p_have()] none!")
- else
- to_chat(M, "You cannot repair your own dents, as you have none!")
- else if(src != M)
- return ..()
-
-/mob/living/simple_animal/hostile/construct/narsie_act()
- return
-
-/mob/living/simple_animal/hostile/construct/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
- return 0
-
-/mob/living/simple_animal/hostile/construct/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
- . = ..()
- if(updating_health)
- update_health_hud()
-
-/////////////////Juggernaut///////////////
-/mob/living/simple_animal/hostile/construct/juggernaut
- name = "Juggernaut"
- real_name = "Juggernaut"
- desc = "A massive, armored construct built to spearhead attacks and soak up enemy fire."
- icon_state = "juggernaut"
- icon_living = "juggernaut"
- maxHealth = 150
- health = 150
- response_harm_continuous = "harmlessly punches"
- response_harm_simple = "harmlessly punch"
- harm_intent_damage = 0
- obj_damage = 90
- melee_damage_lower = 25
- melee_damage_upper = 25
- attack_verb_continuous = "smashes their armored gauntlet into"
- attack_verb_simple = "smash your armored gauntlet into"
- speed = 2.5
- environment_smash = ENVIRONMENT_SMASH_WALLS
- attack_sound = 'sound/weapons/punch3.ogg'
- status_flags = 0
- mob_size = MOB_SIZE_LARGE
- force_threshold = 10
- construct_spells = list(/obj/effect/proc_holder/spell/targeted/forcewall/cult,
- /obj/effect/proc_holder/spell/targeted/projectile/dumbfire/juggernaut)
- runetype = /datum/action/innate/cult/create_rune/wall
- playstyle_string = "You are a Juggernaut. Though slow, your shell can withstand heavy punishment, \
- create shield walls, rip apart enemies and walls alike, and even deflect energy weapons."
-
-/mob/living/simple_animal/hostile/construct/juggernaut/hostile //actually hostile, will move around, hit things
- AIStatus = AI_ON
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES //only token destruction, don't smash the cult wall NO STOP
-
-/mob/living/simple_animal/hostile/construct/juggernaut/bullet_act(obj/projectile/P)
- if(istype(P, /obj/projectile/energy) || istype(P, /obj/projectile/beam))
- var/reflectchance = 40 - round(P.damage/3)
- if(prob(reflectchance))
- apply_damage(P.damage * 0.5, P.damage_type)
- visible_message("The [P.name] is reflected by [src]'s armored shell!", \
- "The [P.name] is reflected by your armored shell!")
-
- // Find a turf near or on the original location to bounce to
- if(P.starting)
- var/new_x = P.starting.x + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
- var/new_y = P.starting.y + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
- var/turf/curloc = get_turf(src)
-
- // redirect the projectile
- P.original = locate(new_x, new_y, P.z)
- P.starting = curloc
- P.firer = src
- P.yo = new_y - curloc.y
- P.xo = new_x - curloc.x
- var/new_angle_s = P.Angle + rand(120,240)
- while(new_angle_s > 180) // Translate to regular projectile degrees
- new_angle_s -= 360
- P.setAngle(new_angle_s)
-
- return BULLET_ACT_FORCE_PIERCE // complete projectile permutation
-
- return ..()
-
-//////////////////////////Angelic-Juggernaut////////////////////////////
-/mob/living/simple_animal/hostile/construct/juggernaut/angelic
- holy = TRUE
- loot = list(/obj/item/ectoplasm/angelic)
-
-/mob/living/simple_animal/hostile/construct/juggernaut/noncult
-
-////////////////////////Wraith/////////////////////////////////////////////
-/mob/living/simple_animal/hostile/construct/wraith
- name = "Wraith"
- real_name = "Wraith"
- desc = "A wicked, clawed shell constructed to assassinate enemies and sow chaos behind enemy lines."
- icon_state = "wraith"
- icon_living = "wraith"
- maxHealth = 65
- health = 65
- melee_damage_lower = 20
- melee_damage_upper = 20
- retreat_distance = 2 //AI wraiths will move in and out of combat
- attack_verb_continuous = "slashes"
- attack_verb_simple = "slash"
- attack_sound = 'sound/weapons/bladeslice.ogg'
- construct_spells = list(/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift)
- runetype = /datum/action/innate/cult/create_rune/tele
- playstyle_string = "You are a Wraith. Though relatively fragile, you are fast, deadly, can phase through walls, and your attacks will lower the cooldown on phasing."
-
- var/attack_refund = 10 //1 second per attack
- var/crit_refund = 50 //5 seconds when putting a target into critical
- var/kill_refund = 250 //full refund on kills
-
-/mob/living/simple_animal/hostile/construct/wraith/AttackingTarget() //refund jaunt cooldown when attacking living targets
- var/prev_stat
- if(isliving(target) && !iscultist(target))
- var/mob/living/L = target
- prev_stat = L.stat
-
- . = ..()
-
- if(. && isnum(prev_stat))
- var/mob/living/L = target
- var/refund = 0
- if(QDELETED(L) || (L.stat == DEAD && prev_stat != DEAD)) //they're dead, you killed them
- refund += kill_refund
- else if(HAS_TRAIT(L, TRAIT_CRITICAL_CONDITION) && prev_stat == CONSCIOUS) //you knocked them into critical
- refund += crit_refund
- if(L.stat != DEAD && prev_stat != DEAD)
- refund += attack_refund
- for(var/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/S in mob_spell_list)
- S.charge_counter = min(S.charge_counter + refund, S.charge_max)
-
-/mob/living/simple_animal/hostile/construct/wraith/hostile //actually hostile, will move around, hit things
- AIStatus = AI_ON
-
-//////////////////////////Angelic-Wraith////////////////////////////
-/mob/living/simple_animal/hostile/construct/wraith/angelic
- holy = TRUE
- construct_spells = list(/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/angelic)
- loot = list(/obj/item/ectoplasm/angelic)
-
-/mob/living/simple_animal/hostile/construct/wraith/noncult
-
-/////////////////////////////Artificer/////////////////////////
-/mob/living/simple_animal/hostile/construct/artificer
- name = "Artificer"
- real_name = "Artificer"
- desc = "A bulbous construct dedicated to building and maintaining the Cult of Nar'Sie's armies."
- icon_state = "artificer"
- icon_living = "artificer"
- maxHealth = 50
- health = 50
- response_harm_continuous = "viciously beats"
- response_harm_simple = "viciously beat"
- harm_intent_damage = 5
- obj_damage = 60
- melee_damage_lower = 5
- melee_damage_upper = 5
- retreat_distance = 10
- minimum_distance = 10 //AI artificers will flee like fuck
- attack_verb_continuous = "rams"
- attack_verb_simple = "ram"
- environment_smash = ENVIRONMENT_SMASH_WALLS
- attack_sound = 'sound/weapons/punch2.ogg'
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/wall,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/floor,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
- /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser)
- runetype = /datum/action/innate/cult/create_rune/revive
- playstyle_string = "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, \
-
- use magic missile, repair allied constructs, shades, and yourself (by clicking on them), \
- and, most important of all, create new constructs by producing soulstones to capture souls, \
- and shells to place those soulstones into."
- can_repair_constructs = TRUE
- can_repair_self = TRUE
-
-/mob/living/simple_animal/hostile/construct/artificer/Found(atom/A) //what have we found here?
- if(isconstruct(A)) //is it a construct?
- var/mob/living/simple_animal/hostile/construct/C = A
- if(C.health < C.maxHealth) //is it hurt? let's go heal it if it is
- return 1
- else
- return 0
- else
- return 0
-
-/mob/living/simple_animal/hostile/construct/artificer/CanAttack(atom/the_target)
- if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it
- return 0
- if(Found(the_target) || ..()) //If we Found it or Can_Attack it normally, we Can_Attack it as long as it wasn't invisible
- return 1 //as a note this shouldn't be added to base hostile mobs because it'll mess up retaliate hostile mobs
-
-/mob/living/simple_animal/hostile/construct/artificer/MoveToTarget(list/possible_targets)
- ..()
- if(isliving(target))
- var/mob/living/L = target
- if(isconstruct(L) && L.health >= L.maxHealth) //is this target an unhurt construct? stop trying to heal it
- LoseTarget()
- return 0
- if(L.health <= melee_damage_lower+melee_damage_upper) //ey bucko you're hurt as fuck let's go hit you
- retreat_distance = null
- minimum_distance = 1
-
-/mob/living/simple_animal/hostile/construct/artificer/Aggro()
- ..()
- if(isconstruct(target)) //oh the target is a construct no need to flee
- retreat_distance = null
- minimum_distance = 1
-
-/mob/living/simple_animal/hostile/construct/artificer/LoseAggro()
- ..()
- retreat_distance = initial(retreat_distance)
- minimum_distance = initial(minimum_distance)
-
-/mob/living/simple_animal/hostile/construct/artificer/hostile //actually hostile, will move around, hit things, heal other constructs
- AIStatus = AI_ON
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES //only token destruction, don't smash the cult wall NO STOP
-
-/////////////////////////////Angelic Artificer/////////////////////////
-/mob/living/simple_animal/hostile/construct/artificer/angelic
- desc = "A bulbous construct dedicated to building and maintaining holy armies."
- holy = TRUE
- loot = list(/obj/item/ectoplasm/angelic)
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult/purified,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
- /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser)
-
-/mob/living/simple_animal/hostile/construct/artificer/noncult
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/wall,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/floor,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult,
- /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
- /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser)
-
-/////////////////////////////Harvester/////////////////////////
-/mob/living/simple_animal/hostile/construct/harvester
- name = "Harvester"
- real_name = "Harvester"
- desc = "A long, thin construct built to herald Nar'Sie's rise. It'll be all over soon."
- icon_state = "harvester"
- icon_living = "harvester"
- maxHealth = 40
- health = 40
- sight = SEE_MOBS
- melee_damage_lower = 15
- melee_damage_upper = 20
- attack_verb_continuous = "butchers"
- attack_verb_simple = "butcher"
- attack_sound = 'sound/weapons/bladeslice.ogg'
- construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/area_conversion,
- /obj/effect/proc_holder/spell/targeted/forcewall/cult)
- playstyle_string = "You are a Harvester. You are incapable of directly killing humans, but your attacks will remove their limbs: \
- Bring those who still cling to this world of illusion back to the Geometer so they may know Truth. Your form and any you are pulling can pass through runed walls effortlessly."
- can_repair_constructs = TRUE
-
-
-/mob/living/simple_animal/hostile/construct/harvester/Bump(atom/AM)
- . = ..()
- if(istype(AM, /turf/closed/wall/mineral/cult) && AM != loc) //we can go through cult walls
- var/atom/movable/stored_pulling = pulling
- if(stored_pulling)
- stored_pulling.setDir(get_dir(stored_pulling.loc, loc))
- stored_pulling.forceMove(loc)
- forceMove(AM)
- if(stored_pulling)
- start_pulling(stored_pulling, supress_message = TRUE) //drag anything we're pulling through the wall with us by magic
-
-/mob/living/simple_animal/hostile/construct/harvester/AttackingTarget()
- if(iscarbon(target))
- var/mob/living/carbon/C = target
- if(HAS_TRAIT(C, TRAIT_NODISMEMBER))
- return ..() //ATTACK!
- var/list/parts = list()
- var/undismembermerable_limbs = 0
- for(var/X in C.bodyparts)
- var/obj/item/bodypart/BP = X
- if(BP.body_part != HEAD && BP.body_part != CHEST)
- if(BP.dismemberable)
- parts += BP
- else
- undismembermerable_limbs++
- if(!LAZYLEN(parts))
- if(undismembermerable_limbs) //they have limbs we can't remove, and no parts we can, attack!
- return ..()
- C.Paralyze(60)
- visible_message("[src] knocks [C] down!")
- to_chat(src, "\"Bring [C.p_them()] to me.\"")
- return FALSE
- do_attack_animation(C)
- var/obj/item/bodypart/BP = pick(parts)
- BP.dismember()
- return FALSE
- . = ..()
-
-/mob/living/simple_animal/hostile/construct/harvester/Initialize()
- . = ..()
- var/datum/action/innate/seek_prey/seek = new()
- seek.Grant(src)
- seek.Activate()
-
-///////////////////////Master-Tracker///////////////////////
-
-/datum/action/innate/seek_master
- name = "Seek your Master"
- desc = "You and your master share a soul-link that informs you of their location"
- background_icon_state = "bg_demon"
- buttontooltipstyle = "cult"
- button_icon_state = "cult_mark"
- var/tracking = FALSE
- var/mob/living/simple_animal/hostile/construct/the_construct
-
-
-/datum/action/innate/seek_master/Grant(mob/living/C)
- the_construct = C
- ..()
-
-/datum/action/innate/seek_master/Activate()
- var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult)
- if(!C)
- return
- var/datum/objective/eldergod/summon_objective = locate() in C.cult_team.objectives
-
- if(summon_objective.check_completion())
- the_construct.master = C.cult_team.blood_target
-
- if(!the_construct.master)
- to_chat(the_construct, "You have no master to seek!")
- the_construct.seeking = FALSE
- return
- if(tracking)
- tracking = FALSE
- the_construct.seeking = FALSE
- to_chat(the_construct, "You are no longer tracking your master.")
- return
- else
- tracking = TRUE
- the_construct.seeking = TRUE
- to_chat(the_construct, "You are now tracking your master.")
-
-
-/datum/action/innate/seek_prey
- name = "Seek the Harvest"
- desc = "None can hide from Nar'Sie, activate to track a survivor attempting to flee the red harvest!"
- icon_icon = 'icons/mob/actions/actions_cult.dmi'
- background_icon_state = "bg_demon"
- buttontooltipstyle = "cult"
- button_icon_state = "cult_mark"
-
-/datum/action/innate/seek_prey/Activate()
- if(GLOB.cult_narsie == null)
- return
- var/mob/living/simple_animal/hostile/construct/harvester/the_construct = owner
- if(the_construct.seeking)
- desc = "None can hide from Nar'Sie, activate to track a survivor attempting to flee the red harvest!"
- button_icon_state = "cult_mark"
- the_construct.seeking = FALSE
- to_chat(the_construct, "You are now tracking Nar'Sie, return to reap the harvest!")
- return
- else
- if(LAZYLEN(GLOB.cult_narsie.souls_needed))
- the_construct.master = pick(GLOB.cult_narsie.souls_needed)
- var/mob/living/real_target = the_construct.master //We can typecast this way because Narsie only allows /mob/living into the souls list
- to_chat(the_construct, "You are now tracking your prey, [real_target.real_name] - harvest [real_target.p_them()]!")
- else
- to_chat(the_construct, "Nar'Sie has completed her harvest!")
- return
- desc = "Activate to track Nar'Sie!"
- button_icon_state = "sintouch"
- the_construct.seeking = TRUE
-
-
-/////////////////////////////ui stuff/////////////////////////////
-
-/mob/living/simple_animal/hostile/construct/update_health_hud()
- if(hud_used)
- if(health >= maxHealth)
- hud_used.healths.icon_state = "[icon_state]_health0"
- else if(health > maxHealth*0.8)
- hud_used.healths.icon_state = "[icon_state]_health2"
- else if(health > maxHealth*0.6)
- hud_used.healths.icon_state = "[icon_state]_health3"
- else if(health > maxHealth*0.4)
- hud_used.healths.icon_state = "[icon_state]_health4"
- else if(health > maxHealth*0.2)
- hud_used.healths.icon_state = "[icon_state]_health5"
- else
- hud_used.healths.icon_state = "[icon_state]_health6"
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 1b8004cbd5b..f189084e6dc 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -55,15 +55,15 @@
/datum/outfit/syndicateramzicorpse
name = "Ramzi Clique Commando Corpse"
- uniform = /obj/item/clothing/under/syndicate/gorlex
+ uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
+ gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/tank/jetpack/oxygen
r_pocket = /obj/item/tank/internals/emergency_oxygen
- id = /obj/item/card/id/syndicate
+ id = /obj/item/card/id/syndicate_command/crew_id
/obj/effect/mob_spawn/human/corpse/syndicatestormtrooper
@@ -129,16 +129,24 @@
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/beret/sec/frontier
gloves = /obj/item/clothing/gloves/color/black
+ neck = /obj/item/clothing/neck/dogtag/frontier
/obj/effect/mob_spawn/human/corpse/frontier/ranged
outfit = /datum/outfit/frontier
+/obj/effect/mob_spawn/human/corpse/frontier/surgeon
+ outfit = /datum/outfit/job/frontiersmen/doctor/corpse
+
+/datum/outfit/job/frontiersmen/doctor/corpse
+ name = "Frontiersmen Surgeon Corpse"
+ r_pocket = null
+
/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper
outfit = /datum/outfit/frontier/trooper
/datum/outfit/frontier/trooper
name = "Frontiersman Armored Corpse"
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
+ suit = /obj/item/clothing/suit/armor/vest/frontier
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat
ears = /obj/item/radio/headset
@@ -169,6 +177,17 @@
/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless
outfit = /datum/outfit/frontier/trooper/heavy/gunless
+/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/flame
+ outfit = /datum/outfit/job/frontiersmen/ert/flamer/corpse
+
+/datum/outfit/job/frontiersmen/ert/flamer/corpse
+ name = "Frontiersman Flametrooper Corpse"
+ back = null
+ belt = /obj/item/storage/belt/security/military/frontiersmen
+ l_hand = null
+
+ backpack_contents = null
+
/datum/outfit/frontier/trooper/heavy/gunless
name = "Frontiersman Heavy Corpse (Gunless)"
back = null
@@ -251,3 +270,47 @@
id_job = "SolGov Sonnensoldner"
outfit = /datum/outfit/job/solgov/sonnensoldner
id_access_list = list(ACCESS_SOLGOV)
+
+//inteq
+
+/obj/effect/mob_spawn/human/corpse/inteq
+ name = "Avery Inteq"
+
+/obj/effect/mob_spawn/human/corpse/inteq/recruit
+ name = "IRMG Recruit"
+ id_job = "Recruit"
+ outfit = /datum/outfit/job/inteq/assistant
+
+/obj/effect/mob_spawn/human/corpse/inteq/medic
+ name = "IRMG Corpsman"
+ id_job = "Corpsman"
+ outfit = /datum/outfit/job/inteq/paramedic
+
+/obj/effect/mob_spawn/human/corpse/inteq/enforcer
+ name = "IRMG Enforcer"
+ id_job = "Enforcer"
+ outfit = /datum/outfit/job/inteq/security
+
+/obj/effect/mob_spawn/human/corpse/inteq/vanguard
+ name = "IRMG Vanguard"
+ id_job = "Vanguard"
+ outfit = /datum/outfit/job/inteq/captain
+
+/obj/effect/mob_spawn/human/corpse/inteq/artificer
+ name = "IRMG Artificer"
+ id_job = "Artificer"
+ outfit = /datum/outfit/job/inteq/engineer
+
+/* SRM */
+
+/obj/effect/mob_spawn/human/corpse/srm/hunter
+ name = "SRM Hunter"
+ id_job = "Hunter"
+ outfit = /datum/outfit/job/roumain/security
+ id_access_list = null
+
+/obj/effect/mob_spawn/human/corpse/srm/montagne
+ name = "SRM Montagne"
+ id_job = "Hunter Montagne"
+ outfit = /datum/outfit/job/roumain/captain
+ id_access_list = null
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index bf4f45e2832..9c6ead823bd 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -23,7 +23,6 @@
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BUG
- gold_core_spawnable = FRIENDLY_SPAWN
verb_say = "flutters"
verb_ask = "flutters inquisitively"
verb_exclaim = "flutters intensely"
diff --git a/code/modules/mob/living/simple_animal/friendly/capybara.dm b/code/modules/mob/living/simple_animal/friendly/capybara.dm
index 091bf42993f..f1366aaa89a 100644
--- a/code/modules/mob/living/simple_animal/friendly/capybara.dm
+++ b/code/modules/mob/living/simple_animal/friendly/capybara.dm
@@ -43,7 +43,6 @@
real_name = "Caspar"
desc = "It's Caspar, the Capybara Captain, the Capy Cappy."
gender = MALE
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
var/wear_hat = /obj/item/clothing/head/caphat
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 1916a7c52ad..396dc82202a 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -1,7 +1,6 @@
-//Cat
/mob/living/simple_animal/pet/cat
name = "cat"
- desc = "Kitty!!"
+ desc = "Most modern cats hail from a solarian experimental geneline. The perfect purrtection from rats and radiation."
icon = 'icons/mob/pets.dmi'
icon_state = "cat2"
icon_living = "cat2"
@@ -34,12 +33,18 @@
var/mob/living/simple_animal/mouse/movement_target
///Limits how often cats can spam chasing mice.
var/emote_cooldown = 0
- gold_core_spawnable = FRIENDLY_SPAWN
collar_type = "cat"
held_state = "cat2"
footstep_type = FOOTSTEP_MOB_CLAW
+ var/grace = RAD_GRACE_PERIOD
+ var/radiation_count = 0
+ var/current_tick_amount = 0
+ var/last_tick_amount = 0
+ var/fail_to_receive = 0
+ var/glow_strength
+
/mob/living/simple_animal/pet/cat/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_HOLDABLE, INNATE_TRAIT)
@@ -85,7 +90,6 @@
icon_living = "cat"
icon_dead = "cat_dead"
gender = FEMALE
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
var/list/family = list()//var restored from savefile, has count of each child type
var/list/children = list()//Actual mob weak references of children
@@ -161,7 +165,6 @@
/mob/living/simple_animal/pet/cat/Proc
name = "Proc"
gender = MALE
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
@@ -177,8 +180,49 @@
collar_type = "[initial(collar_type)]"
regenerate_icons()
+/mob/living/simple_animal/pet/cat/rad_act(amount)
+ . = ..()
+ if(amount <= RAD_BACKGROUND_RADIATION)
+ return
+ current_tick_amount += amount
+ update_glow()
+
+/mob/living/simple_animal/pet/cat/proc/update_glow()
+ var/old_glow_strength = glow_strength
+ switch(radiation_count)
+ if(-INFINITY to RAD_LEVEL_NORMAL)
+ glow_strength = 1
+ if(RAD_LEVEL_NORMAL to RAD_LEVEL_MODERATE)
+ glow_strength = 2
+ if(RAD_LEVEL_MODERATE to RAD_LEVEL_HIGH)
+ glow_strength = 3
+ if(RAD_LEVEL_HIGH to RAD_LEVEL_VERY_HIGH)
+ glow_strength = 4
+ if(RAD_LEVEL_VERY_HIGH to RAD_LEVEL_CRITICAL)
+ glow_strength = 5
+ if(RAD_LEVEL_CRITICAL to INFINITY)
+ glow_strength = 6
+ if((old_glow_strength != glow_strength) && (glow_strength > 1))
+ src.add_filter("ray_cat_glow", 2, list("type" = "outline", "color" = RAD_GLOW_COLOR, "size" = glow_strength))
+ if(glow_strength <= 1)
+ src.remove_filter("ray_cat_glow")
/mob/living/simple_animal/pet/cat/Life()
+ radiation_count -= radiation_count/RAD_MEASURE_SMOOTHING
+ radiation_count += current_tick_amount/RAD_MEASURE_SMOOTHING
+
+ if(current_tick_amount)
+ grace = RAD_GRACE_PERIOD
+ last_tick_amount = current_tick_amount
+ else
+ grace--
+ if(grace <= 0)
+ radiation_count = 0
+
+ current_tick_amount = 0
+
+ update_glow()
+
if(!stat && !buckled && !client)
if(prob(1))
manual_emote(pick("stretches out for a belly rub.", "wags its tail.", "lies down."))
@@ -270,7 +314,7 @@
maxHealth = 50
gender = FEMALE
harm_intent_damage = 10
- butcher_results = list(/obj/item/organ/brain = 1, /obj/item/organ/heart = 1, /obj/item/reagent_containers/food/snacks/cakeslice/birthday = 3, \
+ butcher_results = list(/obj/item/organ/brain = 1, /obj/item/organ/heart = 1, /obj/item/food/cakeslice/birthday = 3, \
/obj/item/reagent_containers/food/snacks/meat/slab = 2)
response_harm_continuous = "takes a bite out of"
response_harm_simple = "take a bite out of"
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index bd16daa567f..a2556f0cc94 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -23,7 +23,6 @@
ventcrawler = VENTCRAWLER_ALWAYS
var/obj/item/inventory_head
var/obj/item/inventory_mask
- gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/crab/Life()
..()
@@ -44,7 +43,6 @@
real_name = "Coffee"
desc = "It's Coffee, the other pet!"
gender = FEMALE
- gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/crab/evil
name = "Evil Crab"
@@ -53,7 +51,6 @@
icon_state = "evilcrab"
icon_living = "evilcrab"
icon_dead = "evilcrab_dead"
- gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/crab/kreb
name = "Kreb"
@@ -62,7 +59,6 @@
icon_state = "kreb"
icon_living = "kreb"
icon_dead = "kreb_dead"
- gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/crab/evil/kreb
name = "Evil Kreb"
@@ -70,4 +66,3 @@
icon_state = "evilkreb"
icon_living = "evilkreb"
icon_dead = "evilkreb_dead"
- gold_core_spawnable = NO_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 19eef279a1d..2a47d4f0c22 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -88,7 +88,6 @@
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
animal_species = /mob/living/simple_animal/pet/dog
- gold_core_spawnable = FRIENDLY_SPAWN
collar_type = "corgi"
var/obj/item/inventory_head
var/obj/item/inventory_back
@@ -121,7 +120,6 @@
icon_living = "pug"
icon_dead = "pug_dead"
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/pug = 3)
- gold_core_spawnable = FRIENDLY_SPAWN
collar_type = "pug"
held_state = "pug"
@@ -394,7 +392,6 @@
response_disarm_simple = "bop"
response_harm_continuous = "kicks"
response_harm_simple = "kick"
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
var/age = 0
var/record_age = 1
@@ -481,50 +478,6 @@
fdel(json_file)
WRITE_FILE(json_file, json_encode(file_data))
-/mob/living/simple_animal/pet/dog/corgi/Ian/narsie_act()
- playsound(src, 'sound/magic/demon_dies.ogg', 75, TRUE)
- var/mob/living/simple_animal/pet/dog/corgi/narsie/N = new(loc)
- N.setDir(dir)
- gib()
-
-/mob/living/simple_animal/pet/dog/corgi/narsie
- name = "Nars-Ian"
- desc = "Ia! Ia!"
- icon_state = "narsian"
- icon_living = "narsian"
- icon_dead = "narsian_dead"
- faction = list("neutral", "cult")
- gold_core_spawnable = NO_SPAWN
- nofur = TRUE
- unique_pet = TRUE
- held_state = "narsian"
-
-/mob/living/simple_animal/pet/dog/corgi/narsie/Life()
- ..()
- for(var/mob/living/simple_animal/pet/P in range(1, src))
- if(P != src && !istype(P,/mob/living/simple_animal/pet/dog/corgi/narsie))
- visible_message("[src] devours [P]!", \
- "DELICIOUS SOULS")
- playsound(src, 'sound/magic/demon_attack1.ogg', 75, TRUE)
- narsie_act()
- if(P.mind)
- if(P.mind.hasSoul)
- P.mind.hasSoul = FALSE //Nars-Ian ate your soul; you don't have one anymore
- else
- visible_message("... Aw, someone beat me to this one.")
- P.gib()
-
-/mob/living/simple_animal/pet/dog/corgi/narsie/update_corgi_fluff()
- ..()
- speak = list("Tari'karat-pasnar!", "IA! IA!", "BRRUUURGHGHRHR")
- speak_emote = list("growls", "barks ominously")
- emote_hear = list("barks echoingly!", "woofs hauntingly!", "yaps in an eldritch manner.", "mutters something unspeakable.")
- emote_see = list("communes with the unnameable.", "ponders devouring some souls.", "shakes.")
-
-/mob/living/simple_animal/pet/dog/corgi/narsie/narsie_act()
- adjustBruteLoss(-maxHealth)
-
-
/mob/living/simple_animal/pet/dog/corgi/regenerate_icons()
..()
if(inventory_head)
@@ -613,7 +566,6 @@
real_name = "Lisa"
gender = FEMALE
desc = "She's tearing you apart."
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
icon_state = "lisa"
icon_living = "lisa"
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
index e0537594c8f..76dc1f09500 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
@@ -30,11 +30,6 @@
var/area/A = get_area(src)
if(A)
notify_ghosts("A drone shell has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_DRONE)
- GLOB.poi_list |= src
-
-/obj/effect/mob_spawn/drone/Destroy()
- GLOB.poi_list -= src
- . = ..()
//ATTACK GHOST IGNORING PARENT RETURN VALUE
/obj/effect/mob_spawn/drone/attack_ghost(mob/user)
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index a1884b76298..cc2ab1da9ef 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -12,7 +12,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 4, /obj/item/clothing/head/goatpelt = 1)
+ butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 4)
response_help_continuous = "pets"
response_help_simple = "pet"
response_disarm_continuous = "gently pushes aside"
@@ -122,7 +122,6 @@
attack_sound = 'sound/weapons/punch1.ogg'
health = 50
maxHealth = 50
- gold_core_spawnable = FRIENDLY_SPAWN
blood_volume = BLOOD_VOLUME_NORMAL
food_type = list(/obj/item/reagent_containers/food/snacks/grown/wheat)
tame_chance = 25
@@ -178,7 +177,6 @@
/mob/living/simple_animal/cow/wisdom
name = "wisdom cow"
desc = "Known for its wisdom, shares it with all"
- gold_core_spawnable = FALSE
tame_chance = 0
bonus_tame_chance = 0
speak_chance = 15
@@ -229,8 +227,6 @@
var/amount_grown = 0
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
- gold_core_spawnable = FRIENDLY_SPAWN
-
footstep_type = FOOTSTEP_MOB_CLAW
/mob/living/simple_animal/chick/Initialize()
@@ -290,7 +286,6 @@
var/list/feedMessages = list("It clucks happily.","It clucks happily.")
var/list/layMessage = EGG_LAYING_MESSAGES
var/list/validColors = list("brown","black","white")
- gold_core_spawnable = FRIENDLY_SPAWN
var/static/chicken_count = 0
footstep_type = FOOTSTEP_MOB_CLAW
@@ -386,7 +381,6 @@
var/list/feedMessages = list("It clucks happily.","It clucks happily.")
var/list/layMessage = EGG_LAYING_MESSAGES
var/list/validColors = list("brown","black","white")
- gold_core_spawnable = FRIENDLY_SPAWN
var/static/chicken_count = 0
environment_smash = ENVIRONMENT_SMASH_NONE
melee_damage_lower = 3
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index 8fc52916fa3..164e412cdd1 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -20,7 +20,6 @@
response_disarm_simple = "gently push aside"
response_harm_continuous = "kicks"
response_harm_simple = "kick"
- gold_core_spawnable = FRIENDLY_SPAWN
held_state = "fox"
footstep_type = FOOTSTEP_MOB_CLAW
@@ -34,5 +33,4 @@
name = "Renault"
desc = "Renault, the Captain's trustworthy fox."
gender = FEMALE
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm
index 54e8dad7edb..0bb662979ee 100644
--- a/code/modules/mob/living/simple_animal/friendly/gondola.dm
+++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm
@@ -22,7 +22,7 @@
icon_living = "gondola"
loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 1, /obj/item/reagent_containers/food/snacks/meat/slab/gondola = 1)
//Gondolas aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
maxHealth = 200
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index c854936c7d2..e872fdfcefc 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -23,7 +23,6 @@
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
mob_biotypes = MOB_ORGANIC|MOB_BEAST|MOB_REPTILE
- gold_core_spawnable = FRIENDLY_SPAWN
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/hostile/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption.
diff --git a/code/modules/mob/living/simple_animal/friendly/mothroach.dm b/code/modules/mob/living/simple_animal/friendly/mothroach.dm
index 881e64d2a70..083c576e1c1 100644
--- a/code/modules/mob/living/simple_animal/friendly/mothroach.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mothroach.dm
@@ -17,7 +17,6 @@
health = 25
maxHealth = 25
speed = 1.25
- gold_core_spawnable = FRIENDLY_SPAWN
verb_say = "flutters"
verb_ask = "flutters inquisitively"
verb_exclaim = "flutters loudly"
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index f2fbf6e5b26..c647b59f4d4 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -45,7 +45,6 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
mob_biotypes = MOB_ORGANIC|MOB_BEAST
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //WS Edit
var/body_color //brown, gray and white, leave blank for random
- gold_core_spawnable = FRIENDLY_SPAWN
move_force = MOVE_FORCE_EXTREMELY_WEAK //WS Edit
var/chew_probability = 1
var/full = FALSE //WS Edit
@@ -145,9 +144,6 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
else
return ..()
-/mob/living/simple_animal/mouse/attack_ghost(mob/dead/observer/user)
- user.possess_mouse(src)
-
/mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force, supress_message)
return FALSE
@@ -264,7 +260,6 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
response_disarm_simple = "gently push aside"
response_harm_continuous = "splats"
response_harm_simple = "splat"
- gold_core_spawnable = NO_SPAWN
/obj/item/reagent_containers/food/snacks/deadmouse
name = "dead mouse"
diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
index 8376f6741eb..50ea0a5003c 100644
--- a/code/modules/mob/living/simple_animal/friendly/penguin.dm
+++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -32,17 +32,8 @@
icon_state = "penguin"
icon_living = "penguin"
icon_dead = "penguin_dead"
- gold_core_spawnable = FRIENDLY_SPAWN
butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/reagent_containers/food/snacks/meat/slab/penguin = 3)
-/mob/living/simple_animal/pet/penguin/emperor/shamebrero
- name = "Shamebrero penguin"
- desc = "Shameful of all he surveys."
- icon_state = "penguin_shamebrero"
- icon_living = "penguin_shamebrero"
- gold_core_spawnable = NO_SPAWN
- unique_pet = TRUE
-
/mob/living/simple_animal/pet/penguin/baby
speak = list("gah", "noot noot", "noot!", "noot", "squeee!", "noo!")
name = "Penguin chick"
diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm
index fa5ab9c9df9..63bc7d76e5d 100644
--- a/code/modules/mob/living/simple_animal/friendly/sloth.dm
+++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm
@@ -18,7 +18,6 @@
response_harm_continuous = "kicks"
response_harm_simple = "kick"
mob_biotypes = MOB_ORGANIC|MOB_BEAST
- gold_core_spawnable = FRIENDLY_SPAWN
melee_damage_lower = 18
melee_damage_upper = 18
health = 50
@@ -33,7 +32,6 @@
/mob/living/simple_animal/sloth/paperwork
name = "Paperwork"
desc = "Cargo's pet sloth. About as useful as the rest of the techs."
- gold_core_spawnable = NO_SPAWN
//Cargo Sloth 2
@@ -45,4 +43,3 @@
icon_dead = "cool_sloth_dead"
gender = FEMALE
butcher_results = list(/obj/item/toy/spinningtoy = 1)
- gold_core_spawnable = NO_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm
index d33fac8f5c0..38fb4ced3d9 100644
--- a/code/modules/mob/living/simple_animal/friendly/snake.dm
+++ b/code/modules/mob/living/simple_animal/friendly/snake.dm
@@ -35,7 +35,6 @@
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
mob_biotypes = MOB_ORGANIC|MOB_BEAST|MOB_REPTILE
- gold_core_spawnable = FRIENDLY_SPAWN
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
var/glasses_overlay_file = 'icons/mob/pets.dmi'
diff --git a/code/modules/mob/living/simple_animal/friendly/turtle.dm b/code/modules/mob/living/simple_animal/friendly/turtle.dm
index 97b07424d37..3ef772cc4be 100644
--- a/code/modules/mob/living/simple_animal/friendly/turtle.dm
+++ b/code/modules/mob/living/simple_animal/friendly/turtle.dm
@@ -19,7 +19,6 @@
response_harm_continuous = "kicks"
response_harm_simple = "kick"
mob_biotypes = MOB_ORGANIC|MOB_BEAST
- gold_core_spawnable = NO_SPAWN
melee_damage_lower = 0.5
melee_damage_upper = 1
health = 2500
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
deleted file mode 100644
index 538a015c163..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ /dev/null
@@ -1,786 +0,0 @@
-
-GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
-
-#define GUARDIAN_HANDS_LAYER 1
-#define GUARDIAN_TOTAL_LAYERS 1
-
-/mob/living/simple_animal/hostile/guardian
- name = "Guardian Spirit"
- real_name = "Guardian Spirit"
- desc = "A mysterious being that stands by its charge, ever vigilant."
- speak_emote = list("hisses")
- gender = NEUTER
- mob_biotypes = NONE
- bubble_icon = "guardian"
- response_help_continuous = "passes through"
- response_help_simple = "pass through"
- response_disarm_continuous = "flails at"
- response_disarm_simple = "flail at"
- response_harm_continuous = "punches"
- response_harm_simple = "punch"
- icon = 'icons/mob/guardian.dmi'
- icon_state = "magicbase"
- icon_living = "magicbase"
- icon_dead = "magicbase"
- speed = 0
- a_intent = INTENT_HARM
- stop_automated_movement = 1
- movement_type = FLYING // Immunity to chasms and landmines, etc.
- attack_sound = 'sound/weapons/punch1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 0
- maxbodytemp = INFINITY
- attack_verb_continuous = "punches"
- attack_verb_simple = "punch"
- maxHealth = INFINITY //The spirit itself is invincible
- health = INFINITY
- healable = FALSE //don't brusepack the guardian
- damage_coeff = list(BRUTE = 0.4, BURN = 0.4, TOX = 0.5, CLONE = 0.5, STAMINA = 0, OXY = 0.5) //how much damage from each damage type we transfer to the owner
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES
- obj_damage = 40
- melee_damage_lower = 15
- melee_damage_upper = 15
- butcher_results = list(/obj/item/ectoplasm = 1)
- AIStatus = AI_OFF
- light_system = MOVABLE_LIGHT
- light_range = 3
- light_on = FALSE
- hud_type = /datum/hud/guardian
- dextrous_hud_type = /datum/hud/dextrous/guardian //if we're set to dextrous, account for it.
- var/mutable_appearance/cooloverlay
- var/guardiancolor
- var/recolorentiresprite
- var/theme
- var/list/guardian_overlays[GUARDIAN_TOTAL_LAYERS]
- var/reset = 0 //if the summoner has reset the guardian already
- var/cooldown = 0
- var/mob/living/summoner
- var/range = 10 //how far from the user the spirit can be
- var/toggle_button_type = /atom/movable/screen/guardian/ToggleMode/Inactive //what sort of toggle button the hud uses
- var/playstyle_string = "You are a Guardian without any type. You shouldn't exist!"
- var/magic_fluff_string = "You draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!"
- var/tech_fluff_string = "BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!"
- var/carp_fluff_string = "CARP CARP CARP SOME SORT OF HORRIFIC BUG BLAME THE CODERS CARP CARP CARP"
- var/miner_fluff_string = "You encounter... Mythril, it shouldn't exist... Submit a bug report!"
- var/slime_fluff_string = "The crystal grows and creaks, then glitches terribly! Tell a coder if you've seen this!"
-
-/mob/living/simple_animal/hostile/guardian/Initialize(mapload, theme)
- GLOB.parasites += src
- updatetheme(theme)
- ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)//local flying mob drifts in space, more news at six
- . = ..()
-
-/mob/living/simple_animal/hostile/guardian/med_hud_set_health()
- if(summoner)
- var/image/holder = hud_list[HEALTH_HUD]
- holder.icon_state = "hud[RoundHealth(summoner)]"
-
-/mob/living/simple_animal/hostile/guardian/med_hud_set_status()
- if(summoner)
- var/image/holder = hud_list[STATUS_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- if(summoner.stat == DEAD)
- holder.icon_state = "huddead"
- else
- holder.icon_state = "hudhealthy"
-
-/mob/living/simple_animal/hostile/guardian/Destroy()
- GLOB.parasites -= src
- return ..()
-
-/mob/living/simple_animal/hostile/guardian/proc/updatetheme(theme) //update the guardian's theme
- if(!theme)
- theme = pick("magic", "tech", "carp", "miner")
- switch(theme)//should make it easier to create new stand designs in the future if anyone likes that
- if("magic")
- name = "Guardian Spirit"
- real_name = "Guardian Spirit"
- bubble_icon = "guardian"
- icon_state = "magicbase"
- icon_living = "magicbase"
- icon_dead = "magicbase"
- if("tech")
- name = "Holoparasite"
- real_name = "Holoparasite"
- bubble_icon = "holo"
- icon_state = "techbase"
- icon_living = "techbase"
- icon_dead = "techbase"
- if("miner")
- name = "Power Miner"
- real_name = "Power Miner"
- bubble_icon = "guardian"
- icon_state = "minerbase"
- icon_living = "minerbase"
- icon_dead = "minerbase"
- if("carp")
- name = "Holocarp"
- real_name = "Holocarp"
- bubble_icon = "holo"
- icon_state = "holocarp"
- icon_living = "holocarp"
- icon_dead = "holocarp"
- speak_emote = list("gnashes")
- desc = "A mysterious fish that stands by its charge, ever vigilant."
- attack_verb_continuous = "bites"
- attack_verb_simple = "bite"
- attack_sound = 'sound/weapons/bite.ogg'
- recolorentiresprite = TRUE
- if("slime")
- bubble_icon = "guardian"
- icon_state = "slimebase"
- icon_living = "slimebase"
- icon_dead = "slimebase"
- friendly_verb_continuous = "nourishes"
- friendly_verb_simple = "nourish"
- attack_verb_continuous = "glomps"
- attack_verb_simple = "glomp"
- speak_emote = list("blorbles")
- attack_sound = 'sound/effects/blobattack.ogg'
- desc = "A mysterious slime that stands by its charge, ever vigilant."
- attack_sound = 'sound/weapons/bite.ogg'
-
- if(!recolorentiresprite) //we want this to proc before stand logs in, so the overlay isnt gone for some reason
- cooloverlay = mutable_appearance(icon, theme)
- add_overlay(cooloverlay)
-
-/mob/living/simple_animal/hostile/guardian/Login() //if we have a mind, set its name to ours when it logs in
- . = ..()
- if(!. || !client)
- return FALSE
- if(mind)
- mind.name = "[real_name]"
- if(!summoner)
- to_chat(src, "For some reason, somehow, you have no summoner. Please report this bug immediately.")
- return
- to_chat(src, "You are a [real_name], bound to serve [summoner.real_name].")
- to_chat(src, "You are capable of manifesting or recalling to your master with the buttons on your HUD. You will also find a button to communicate with [summoner.p_them()] privately there.")
- to_chat(src, "While personally invincible, you will die if [summoner.real_name] does, and any damage dealt to you will have a portion passed on to [summoner.p_them()] as you feed upon [summoner.p_them()] to sustain yourself.")
- to_chat(src, playstyle_string)
- if(!guardiancolor)
- guardianrename()
- guardianrecolor()
-
-/mob/living/simple_animal/hostile/guardian/proc/guardianrecolor()
- guardiancolor = input(src,"What would you like your color to be?","Choose Your Color","#ffffff") as color|null
- if(!guardiancolor) //redo proc until we get a color
- to_chat(src, "Not a valid color, please try again.")
- guardianrecolor()
- return
- if(!recolorentiresprite)
- cooloverlay.color = guardiancolor
- cut_overlay(cooloverlay) //we need to get our new color
- add_overlay(cooloverlay)
- else
- add_atom_colour(guardiancolor, FIXED_COLOUR_PRIORITY)
-
-/mob/living/simple_animal/hostile/guardian/proc/guardianrename()
- var/new_name = sanitize_name(reject_bad_text(stripped_input(src, "What would you like your name to be?", "Choose Your Name", real_name, MAX_NAME_LEN)))
- if(!new_name) //redo proc until we get a good name
- to_chat(src, "Not a valid name, please try again.")
- guardianrename()
- return
- visible_message("Your new name [new_name] anchors itself in your mind.")
- fully_replace_character_name(null, new_name)
-
-/mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies
- . = ..()
- update_health_hud() //we need to update all of our health displays to match our summoner and we can't practically give the summoner a hook to do it
- med_hud_set_health()
- med_hud_set_status()
- if(!QDELETED(summoner))
- if(summoner.stat == DEAD)
- forceMove(summoner.loc)
- to_chat(src, "Your summoner has died!")
- visible_message("\The [src] dies along with its user!")
- summoner.visible_message("[summoner]'s body is completely consumed by the strain of sustaining [src]!")
- for(var/obj/item/W in summoner)
- if(!summoner.dropItemToGround(W))
- qdel(W)
- summoner.dust()
- death(TRUE)
- qdel(src)
- else
- to_chat(src, "Your summoner has died!")
- visible_message("[src] dies along with its user!")
- death(TRUE)
- qdel(src)
- snapback()
-
-/mob/living/simple_animal/hostile/guardian/get_status_tab_items()
- . += ..()
- if(summoner)
- var/resulthealth
- if(iscarbon(summoner))
- resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.maxHealth)) * 100)
- else
- resulthealth = round((summoner.health / summoner.maxHealth) * 100, 0.5)
- . += "Summoner Health: [resulthealth]%"
- if(cooldown >= world.time)
- . += "Manifest/Recall Cooldown Remaining: [DisplayTimeText(cooldown - world.time)]"
-
-/mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range
- . = ..()
- snapback()
-
-/mob/living/simple_animal/hostile/guardian/proc/snapback()
- if(summoner)
- if(get_dist(get_turf(summoner),get_turf(src)) <= range)
- return
- else
- to_chat(src, "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]!")
- visible_message("\The [src] jumps back to its user.")
- if(istype(summoner.loc, /obj/effect))
- Recall(TRUE)
- else
- new /obj/effect/temp_visual/guardian/phase/out(loc)
- forceMove(summoner.loc)
- new /obj/effect/temp_visual/guardian/phase(loc)
-
-/mob/living/simple_animal/hostile/guardian/proc/is_deployed()
- return loc != summoner
-
-/mob/living/simple_animal/hostile/guardian/AttackingTarget()
- if(!is_deployed())
- to_chat(src, "You must be manifested to attack!")
- return FALSE
- else
- return ..()
-
-/mob/living/simple_animal/hostile/guardian/death()
- drop_all_held_items()
- ..()
- if(summoner)
- to_chat(summoner, "Your [name] died somehow!")
- summoner.dust()
-
-/mob/living/simple_animal/hostile/guardian/update_health_hud()
- if(summoner && hud_used && hud_used.healths)
- var/resulthealth
- if(iscarbon(summoner))
- resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.maxHealth)) * 100)
- else
- resulthealth = round((summoner.health / summoner.maxHealth) * 100, 0.5)
- hud_used.healths.maptext = "
[resulthealth]%
"
-
-/mob/living/simple_animal/hostile/guardian/adjustHealth(amount, updating_health = TRUE, forced = FALSE) //The spirit is invincible, but passes on damage to the summoner
- . = amount
- if(summoner)
- if(loc == summoner)
- return FALSE
- summoner.adjustBruteLoss(amount)
- if(amount > 0)
- to_chat(summoner, "Your [name] is under attack! You take damage!")
- summoner.visible_message("Blood sprays from [summoner] as [src] takes damage!")
- switch(summoner.stat)
- if(UNCONSCIOUS, HARD_CRIT)
- to_chat(summoner, "Your body can't take the strain of sustaining [src] in this condition, it begins to fall apart!")
- summoner.adjustCloneLoss(amount * 0.5) //dying hosts take 50% bonus damage as cloneloss
- update_health_hud()
-
-/mob/living/simple_animal/hostile/guardian/ex_act(severity, target)
- switch(severity)
- if(1)
- gib()
- return
- if(2)
- adjustBruteLoss(60)
- if(3)
- adjustBruteLoss(30)
-
-/mob/living/simple_animal/hostile/guardian/gib()
- if(summoner)
- to_chat(summoner, "Your [src] was blown up!")
- summoner.gib()
- ghostize()
- qdel(src)
-
-//HAND HANDLING
-
-/mob/living/simple_animal/hostile/guardian/equip_to_slot(obj/item/I, slot)
- if(!slot)
- return FALSE
- if(!istype(I))
- return FALSE
-
- . = TRUE
- var/index = get_held_index_of_item(I)
- if(index)
- held_items[index] = null
- update_inv_hands()
-
- if(I.pulledby)
- I.pulledby.stop_pulling()
-
- I.screen_loc = null // will get moved if inventory is visible
- I.forceMove(src)
- I.equipped(src, slot)
- I.layer = ABOVE_HUD_LAYER
- I.plane = ABOVE_HUD_PLANE
-
-/mob/living/simple_animal/hostile/guardian/proc/apply_overlay(cache_index)
- if((. = guardian_overlays[cache_index]))
- add_overlay(.)
-
-/mob/living/simple_animal/hostile/guardian/proc/remove_overlay(cache_index)
- var/I = guardian_overlays[cache_index]
- if(I)
- cut_overlay(I)
- guardian_overlays[cache_index] = null
-
-/mob/living/simple_animal/hostile/guardian/update_inv_hands()
- remove_overlay(GUARDIAN_HANDS_LAYER)
- var/list/hands_overlays = list()
- var/obj/item/l_hand = get_item_for_held_index(1)
- var/obj/item/r_hand = get_item_for_held_index(2)
-
- if(r_hand)
- hands_overlays += r_hand.build_worn_icon(default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = r_hand.righthand_file, isinhands = TRUE)
-
- if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- r_hand.layer = ABOVE_HUD_LAYER
- r_hand.plane = ABOVE_HUD_PLANE
- r_hand.screen_loc = ui_hand_position(get_held_index_of_item(r_hand))
- client.screen |= r_hand
-
- if(l_hand)
- hands_overlays += l_hand.build_worn_icon(default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE)
-
- if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- l_hand.layer = ABOVE_HUD_LAYER
- l_hand.plane = ABOVE_HUD_PLANE
- l_hand.screen_loc = ui_hand_position(get_held_index_of_item(l_hand))
- client.screen |= l_hand
-
- if(hands_overlays.len)
- guardian_overlays[GUARDIAN_HANDS_LAYER] = hands_overlays
- apply_overlay(GUARDIAN_HANDS_LAYER)
-
-/mob/living/simple_animal/hostile/guardian/regenerate_icons()
- update_inv_hands()
-
-//MANIFEST, RECALL, TOGGLE MODE/LIGHT, SHOW TYPE
-
-/mob/living/simple_animal/hostile/guardian/proc/Manifest(forced)
- if(istype(summoner.loc, /obj/effect) || (cooldown > world.time && !forced))
- return FALSE
- if(loc == summoner)
- forceMove(summoner.loc)
- new /obj/effect/temp_visual/guardian/phase(loc)
- cooldown = world.time + 10
- reset_perspective()
- return TRUE
- return FALSE
-
-/mob/living/simple_animal/hostile/guardian/proc/Recall(forced)
- if(!summoner || loc == summoner || (cooldown > world.time && !forced))
- return FALSE
- new /obj/effect/temp_visual/guardian/phase/out(loc)
-
- forceMove(summoner)
- cooldown = world.time + 10
- return TRUE
-
-/mob/living/simple_animal/hostile/guardian/proc/ToggleMode()
- to_chat(src, "You don't have another mode!")
-
-
-/mob/living/simple_animal/hostile/guardian/proc/ToggleLight()
- if(!light_on)
- to_chat(src, "You activate your light.")
- set_light_on(TRUE)
- else
- to_chat(src, "You deactivate your light.")
- set_light_on(FALSE)
-
-
-/mob/living/simple_animal/hostile/guardian/verb/ShowType()
- set name = "Check Guardian Type"
- set category = "Guardian"
- set desc = "Check what type you are."
- to_chat(src, playstyle_string)
-
-//COMMUNICATION
-
-/mob/living/simple_animal/hostile/guardian/proc/Communicate()
- if(summoner)
- var/sender_key = key
- var/input = stripped_input(src, "Please enter a message to tell your summoner.", "Guardian", "")
- if(sender_key != key || !input) //guardian got reset, or did not enter anything
- return
-
- var/preliminary_message = "[input]" //apply basic color/bolding
- var/my_message = "[src]: [preliminary_message]" //add source, color source with the guardian's color
-
- to_chat(summoner, my_message)
- var/list/guardians = summoner.hasparasites()
- for(var/para in guardians)
- to_chat(para, my_message)
- for(var/M in GLOB.dead_mob_list)
- var/link = FOLLOW_LINK(M, src)
- to_chat(M, "[link] [my_message]")
-
- src.log_talk(input, LOG_SAY, tag="guardian")
-
-/mob/living/proc/guardian_comm()
- set name = "Communicate"
- set category = "Guardian"
- set desc = "Communicate telepathically with your guardian."
- var/input = stripped_input(src, "Please enter a message to tell your guardian.", "Message", "")
- if(!input)
- return
-
- var/preliminary_message = "[input]" //apply basic color/bolding
- var/my_message = "[src]: [preliminary_message]" //add source, color source with default grey...
-
- to_chat(src, my_message)
- var/list/guardians = hasparasites()
- for(var/para in guardians)
- var/mob/living/simple_animal/hostile/guardian/G = para
- to_chat(G, "[src]: [preliminary_message]" )
- for(var/M in GLOB.dead_mob_list)
- var/link = FOLLOW_LINK(M, src)
- to_chat(M, "[link] [my_message]")
-
- src.log_talk(input, LOG_SAY, tag="guardian")
-
-//FORCE RECALL/RESET
-
-/mob/living/proc/guardian_recall()
- set name = "Recall Guardian"
- set category = "Guardian"
- set desc = "Forcibly recall your guardian."
- var/list/guardians = hasparasites()
- for(var/para in guardians)
- var/mob/living/simple_animal/hostile/guardian/G = para
- G.Recall()
-
-/mob/living/proc/guardian_reset()
- set name = "Reset Guardian Player (One Use)"
- set category = "Guardian"
- set desc = "Re-rolls which ghost will control your Guardian. One use per Guardian."
-
- var/list/guardians = hasparasites()
- for(var/para in guardians)
- var/mob/living/simple_animal/hostile/guardian/P = para
- if(P.reset)
- guardians -= P //clear out guardians that are already reset
- if(guardians.len)
- var/mob/living/simple_animal/hostile/guardian/G = input(src, "Pick the guardian you wish to reset", "Guardian Reset") as null|anything in sortNames(guardians)
- if(G)
- to_chat(src, "You attempt to reset [G.real_name]'s personality...")
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_PAI, null, FALSE, 100)
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- to_chat(G, "Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.")
- to_chat(src, "Your [G.real_name] has been successfully reset.")
- message_admins("[key_name_admin(C)] has taken control of ([ADMIN_LOOKUPFLW(G)])")
- G.ghostize(0)
- G.guardianrecolor()
- G.guardianrename() //give it a new color and name, to show it's a new person
- G.key = C.key
- G.reset = 1
- switch(G.theme)
- if("tech")
- to_chat(src, "[G.real_name] is now online!")
- if("magic")
- to_chat(src, "[G.real_name] has been summoned!")
- if("carp")
- to_chat(src, "[G.real_name] has been caught!")
- if("miner")
- to_chat(src, "[G.real_name] has appeared!")
- if("slime")
- to_chat(src, "[G.real_name] has taken shape!")
- guardians -= G
- if(!guardians.len)
- remove_verb(src, /mob/living/proc/guardian_reset)
- else
- to_chat(src, "There were no ghosts willing to take control of [G.real_name]. Looks like you're stuck with it for now.")
- else
- to_chat(src, "You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].")
- else
- remove_verb(src, /mob/living/proc/guardian_reset)
-
-////////parasite tracking/finding procs
-
-/mob/living/proc/hasparasites() //returns a list of guardians the mob is a summoner for
- . = list()
- for(var/P in GLOB.parasites)
- var/mob/living/simple_animal/hostile/guardian/G = P
- if(G.summoner == src)
- . += G
-
-/mob/living/simple_animal/hostile/guardian/proc/hasmatchingsummoner(mob/living/simple_animal/hostile/guardian/G) //returns 1 if the summoner matches the target's summoner
- return (istype(G) && G.summoner == summoner)
-
-
-////////Creation
-
-/obj/item/guardiancreator
- name = "enchanted deck of tarot cards"
- desc = "An enchanted deck of tarot cards, rumored to be a source of unimaginable power."
- icon = 'icons/obj/toy.dmi'
- icon_state = "deck_tarot_full"
- var/used = FALSE
- var/theme = "magic"
- var/mob_name = "Guardian Spirit"
- var/use_message = "You shuffle the deck..."
- var/used_message = "All the cards seem to be blank now."
- var/failure_message = "..And draw a card! It's...blank? Maybe you should try again later."
- var/ling_failure = "The deck refuses to respond to a souless creature such as you."
- var/list/possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support", "Gravitokinetic")
- var/random = TRUE
- var/allowmultiple = FALSE
- var/allowling = TRUE
- var/allowguardian = FALSE
-
-/obj/item/guardiancreator/attack_self(mob/living/user)
- if(isguardian(user) && !allowguardian)
- to_chat(user, "[mob_name] chains are not allowed.")
- return
- var/list/guardians = user.hasparasites()
- if(guardians.len && !allowmultiple)
- to_chat(user, "You already have a [mob_name]!")
- return
- if(user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling) && !allowling)
- to_chat(user, "[ling_failure]")
- return
- if(used == TRUE)
- to_chat(user, "[used_message]")
- return
- used = TRUE
- to_chat(user, "[use_message]")
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_HOLOPARASITE)
-
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- spawn_guardian(user, C.key)
- else
- to_chat(user, "[failure_message]")
- used = FALSE
-
-
-/obj/item/guardiancreator/proc/spawn_guardian(mob/living/user, key)
- var/guardiantype = "Standard"
- if(random)
- guardiantype = pick(possible_guardians)
- else
- guardiantype = input(user, "Pick the type of [mob_name]", "[mob_name] Creation") as null|anything in sortList(possible_guardians)
- if(!guardiantype)
- to_chat(user, "[failure_message]" )
- used = FALSE
- return
- var/pickedtype = /mob/living/simple_animal/hostile/guardian/punch
- switch(guardiantype)
-
- if("Chaos")
- pickedtype = /mob/living/simple_animal/hostile/guardian/fire
-
- if("Standard")
- pickedtype = /mob/living/simple_animal/hostile/guardian/punch
-
- if("Ranged")
- pickedtype = /mob/living/simple_animal/hostile/guardian/ranged
-
- if("Support")
- pickedtype = /mob/living/simple_animal/hostile/guardian/healer
-
- if("Explosive")
- pickedtype = /mob/living/simple_animal/hostile/guardian/bomb
-
- if("Lightning")
- pickedtype = /mob/living/simple_animal/hostile/guardian/beam
-
- if("Protector")
- pickedtype = /mob/living/simple_animal/hostile/guardian/protector
-
- if("Charger")
- pickedtype = /mob/living/simple_animal/hostile/guardian/charger
-
- if("Assassin")
- pickedtype = /mob/living/simple_animal/hostile/guardian/assassin
-
- if("Dextrous")
- pickedtype = /mob/living/simple_animal/hostile/guardian/dextrous
-
- if("Gravitokinetic")
- pickedtype = /mob/living/simple_animal/hostile/guardian/gravitokinetic
-
- if("Slime")
- pickedtype = /mob/living/simple_animal/hostile/guardian/slime
-
- var/list/guardians = user.hasparasites()
- if(guardians.len && !allowmultiple)
- to_chat(user, "You already have a [mob_name]!" )
- used = FALSE
- return
- var/mob/living/simple_animal/hostile/guardian/G = new pickedtype(user, theme)
- G.name = mob_name
- G.summoner = user
- G.key = key
- G.mind.enslave_mind_to_creator(user)
- log_game("[key_name(user)] has summoned [key_name(G)], a [guardiantype] holoparasite.")
- switch(theme)
- if("tech")
- to_chat(user, "[G.tech_fluff_string]")
- to_chat(user, "[G.real_name] is now online!")
- if("magic")
- to_chat(user, "[G.magic_fluff_string]")
- to_chat(user, "[G.real_name] has been summoned!")
- if("carp")
- to_chat(user, "[G.carp_fluff_string]")
- to_chat(user, "[G.real_name] has been caught!")
- if("miner")
- to_chat(user, "[G.miner_fluff_string]")
- to_chat(user, "[G.real_name] has appeared!")
- if("slime")
- to_chat(user, "[G.slime_fluff_string]")
- to_chat(user, "[G.real_name] was created using slime science!")
- add_verb(user, list(/mob/living/proc/guardian_comm, \
- /mob/living/proc/guardian_recall, \
- /mob/living/proc/guardian_reset))
- G?.client.init_verbs()
-
-/obj/item/guardiancreator/choose
- random = FALSE
-
-/obj/item/guardiancreator/choose/dextrous
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
-
-/obj/item/guardiancreator/choose/wizard
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard",)
- allowmultiple = TRUE
-
-/obj/item/guardiancreator/tech
- name = "holoparasite injector"
- desc = "It contains an alien nanoswarm of unknown origin. Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, it requires an organic host as a home base and source of fuel."
- icon = 'icons/obj/syringe.dmi'
- icon_state = "combat_hypo"
- theme = "tech"
- mob_name = "Holoparasite"
- use_message = "You start to power on the injector..."
- used_message = "The injector has already been used."
- failure_message = "...ERROR. BOOT SEQUENCE ABORTED. AI FAILED TO INTIALIZE. PLEASE CONTACT SUPPORT OR TRY AGAIN LATER."
- ling_failure = "The holoparasites recoil in horror. They want nothing to do with a creature like you."
-
-/obj/item/guardiancreator/tech/choose/traitor
- possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
- allowling = FALSE
-
-/obj/item/guardiancreator/tech/choose
- random = FALSE
-
-/obj/item/guardiancreator/tech/choose/dextrous
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")//"Gravokinetic" to re-add guardians to lists like this one
-
-/obj/item/paper/guides/antag/guardian
- name = "Holoparasite Guide"
- default_raw_text = {"A list of Holoparasite Types
-
-
-Assassin: Does medium damage and takes full damage, but can enter stealth, causing its next attack to do massive damage and ignore armor. However, it becomes briefly unable to recall after attacking from stealth.
-
-Chaos: Ignites enemies on touch and causes them to hallucinate all nearby people as the parasite. Automatically extinguishes the user if they catch on fire.
-
-Charger: Moves extremely fast, does medium damage on attack, and can charge at targets, damaging the first target hit and forcing them to drop any items they are holding.
-
-Dexterous: Does low damage on attack, but is capable of holding items and storing a single item within it. It will drop items held in its hands when it recalls, but it will retain the stored item.
-
-Explosive: High damage resist and medium power attack that may explosively teleport targets. Can turn any object, including objects too large to pick up, into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered or after a delay.
-
-Lightning: Attacks apply lightning chains to targets. Has a lightning chain to the user. Lightning chains shock everything near them, doing constant damage.
-
-Protector: Causes you to teleport to it when out of range, unlike other parasites. Has two modes; Combat, where it does and takes medium damage, and Protection, where it does and takes almost no damage but moves slightly slower.
-
-Ranged: Has two modes. Ranged; which fires a constant stream of weak, armor-ignoring projectiles. Scout; Cannot attack, but can move through walls and is quite hard to see. Can lay surveillance snares, which alert it when crossed, in either mode.
-
-Standard: Devastating close combat attacks and high damage resist. Can smash through weak walls.
-
-Gravitokinetic: Attacks will apply crushing gravity to the target. Can target the ground as well to slow targets advancing on you, but this will affect the user.
-
-"}
-
-/obj/item/paper/guides/antag/guardian/wizard
- name = "Guardian Guide"
- default_raw_text = {"A list of Guardian Types
-
-
-Assassin: Does medium damage and takes full damage, but can enter stealth, causing its next attack to do massive damage and ignore armor. However, it becomes briefly unable to recall after attacking from stealth.
-
-Chaos: Ignites enemies on touch and causes them to hallucinate all nearby people as the guardian. Automatically extinguishes the user if they catch on fire.
-
-Charger: Moves extremely fast, does medium damage on attack, and can charge at targets, damaging the first target hit and forcing them to drop any items they are holding.
-
-Dexterous: Does low damage on attack, but is capable of holding items and storing a single item within it. It will drop items held in its hands when it recalls, but it will retain the stored item.
-
-Explosive: High damage resist and medium power attack that may explosively teleport targets. Can turn any object, including objects too large to pick up, into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered or after a delay.
-
-Lightning: Attacks apply lightning chains to targets. Has a lightning chain to the user. Lightning chains shock everything near them, doing constant damage.
-
-Protector: Causes you to teleport to it when out of range, unlike other parasites. Has two modes; Combat, where it does and takes medium damage, and Protection, where it does and takes almost no damage but moves slightly slower.
-
-Ranged: Has two modes. Ranged; which fires a constant stream of weak, armor-ignoring projectiles. Scout; Cannot attack, but can move through walls and is quite hard to see. Can lay surveillance snares, which alert it when crossed, in either mode.
-
-Standard: Devastating close combat attacks and high damage resist. Can smash through weak walls.
-
-Gravitokinetic: Attacks will apply crushing gravity to the target. Can target the ground as well to slow targets advancing on you, but this will affect the user.
-
-"}
-
-
-/obj/item/storage/box/syndie_kit/guardian
- name = "holoparasite injector kit"
-
-/obj/item/storage/box/syndie_kit/guardian/PopulateContents()
- new /obj/item/guardiancreator/tech/choose/dextrous(src) //WS Edit - Dextrous Guardians
- new /obj/item/paper/guides/antag/guardian(src)
-
-/obj/item/guardiancreator/carp
- name = "holocarp fishsticks"
- desc = "Using the power of Carp'sie, you can catch a carp from byond the veil of Carpthulu, and bind it to your fleshy flesh form."
- icon = 'icons/obj/food/food.dmi'
- icon_state = "fishfingers"
- theme = "carp"
- mob_name = "Holocarp"
- use_message = "You put the fishsticks in your mouth..."
- used_message = "Someone's already taken a bite out of these fishsticks! Ew."
- failure_message = "You couldn't catch any carp spirits from the seas of Lake Carp. Maybe there are none, maybe you fucked up."
- ling_failure = "Carp'sie seems to not have taken you as the chosen one. Maybe it's because of your horrifying origin."
- allowmultiple = TRUE
-
-/obj/item/guardiancreator/carp/choose
- random = FALSE
-
-/obj/item/guardiancreator/miner
- name = "dusty shard"
- desc = "Seems to be a very old rock, may have originated from a strange meteor."
- icon = 'icons/obj/lavaland/artefacts.dmi'
- icon_state = "dustyshard"
- theme = "miner"
- mob_name = "Power Miner"
- use_message = "You pierce your skin with the shard..."
- used_message = "This shard seems to have lost all its' power..."
- failure_message = "The shard hasn't reacted at all. Maybe try again later..."
- ling_failure = "The power of the shard seems to not react with your horrifying, mutated body."
-
-/obj/item/guardiancreator/miner/choose
- random = FALSE
- name = "glimmering shard"
- desc = "Seems to be a very old rock, may have originated from a strange meteor. This one looks exceptionally pure."
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
- allowmultiple = TRUE//if you *somehow* get the extremely rare minerchoose guardian(25% chance to spawn, for an item in a table of around 30 options) while you already have a guardian, you can stack it. The ultimate gambling.
-
-/obj/item/guardiancreator/slime
- name = "slime shard"
- desc = "A shard of crystallized slime."
- icon = 'icons/obj/lavaland/artefacts.dmi'
- icon_state = "dustyshard"
- color = "#00ff15"
- theme = "slime"
- mob_name = "Standing Slime"
- use_message = "You squeeze the shard inhand, and it grows warm..."
- used_message = "You squeeze the shard, but nothing happens. Maybe it's been used already."
- failure_message = "The shard grows cold. Maybe try again later?"
- ling_failure = "The shard seems to quiver and twist away from you."
- possible_guardians = list("Slime")
diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
deleted file mode 100644
index 7cfed9d167d..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
+++ /dev/null
@@ -1,101 +0,0 @@
-//Assassin
-/mob/living/simple_animal/hostile/guardian/assassin
- melee_damage_lower = 15
- melee_damage_upper = 15
- attack_verb_continuous = "slashes"
- attack_verb_simple = "slash"
- attack_sound = 'sound/weapons/bladeslice.ogg'
- damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
- playstyle_string = "As an assassin type you do medium damage and have no damage resistance, but can enter stealth, massively increasing the damage of your next attack and causing it to ignore armor. Stealth is broken when you attack or take damage."
- magic_fluff_string = "..And draw the Space Ninja, a lethal, invisible assassin."
- tech_fluff_string = "Boot sequence complete. Assassin modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one! It's an assassin carp! Just when you thought it was safe to go back to the water... which is unhelpful, because we're in space."
- miner_fluff_string = "You encounter... Glass, a sharp, fragile attacker."
- toggle_button_type = /atom/movable/screen/guardian/ToggleMode/Assassin
- var/toggle = FALSE
- var/stealthcooldown = 100
- var/atom/movable/screen/alert/canstealthalert
- var/atom/movable/screen/alert/instealthalert
- speed = -1
-
-/mob/living/simple_animal/hostile/guardian/assassin/Initialize()
- . = ..()
- stealthcooldown = 0
-
-/mob/living/simple_animal/hostile/guardian/assassin/Life()
- . = ..()
- updatestealthalert()
- if(loc == summoner && toggle)
- ToggleMode(0)
-
-/mob/living/simple_animal/hostile/guardian/assassin/get_status_tab_items()
- . = ..()
- if(stealthcooldown >= world.time)
- . += "Stealth Cooldown Remaining: [DisplayTimeText(stealthcooldown - world.time)]"
-
-/mob/living/simple_animal/hostile/guardian/assassin/AttackingTarget()
- . = ..()
- if(.)
- if(toggle && (isliving(target) || istype(target, /obj/structure/window) || istype(target, /obj/structure/grille)))
- ToggleMode(1)
-
-/mob/living/simple_animal/hostile/guardian/assassin/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
- . = ..()
- if(. > 0 && toggle)
- ToggleMode(1)
-
-/mob/living/simple_animal/hostile/guardian/assassin/Recall()
- if(..() && toggle)
- ToggleMode(0)
-
-/mob/living/simple_animal/hostile/guardian/assassin/ToggleMode(forced = 0)
- if(toggle)
- melee_damage_lower = initial(melee_damage_lower)
- melee_damage_upper = initial(melee_damage_upper)
- armour_penetration = initial(armour_penetration)
- obj_damage = initial(obj_damage)
- environment_smash = initial(environment_smash)
- alpha = initial(alpha)
- if(!forced)
- to_chat(src, "You exit stealth.")
- else
- visible_message("\The [src] suddenly appears!")
- stealthcooldown = world.time + initial(stealthcooldown) //we were forced out of stealth and go on cooldown
- cooldown = world.time + 40 //can't recall for 4 seconds
- updatestealthalert()
- toggle = FALSE
- else if(stealthcooldown <= world.time)
- if(src.loc == summoner)
- to_chat(src, "You have to be manifested to enter stealth!")
- return
- melee_damage_lower = 50
- melee_damage_upper = 50
- armour_penetration = 100
- obj_damage = 0
- environment_smash = ENVIRONMENT_SMASH_NONE
- new /obj/effect/temp_visual/guardian/phase/out(get_turf(src))
- alpha = 20
- if(!forced)
- to_chat(src, "You enter stealth, empowering your next attack.")
- updatestealthalert()
- toggle = TRUE
- else if(!forced)
- to_chat(src, "You cannot yet enter stealth, wait another [DisplayTimeText(stealthcooldown - world.time)]!")
-
-/mob/living/simple_animal/hostile/guardian/assassin/proc/updatestealthalert()
- if(stealthcooldown <= world.time)
- if(toggle)
- if(!instealthalert)
- instealthalert = throw_alert("instealth", /atom/movable/screen/alert/instealth)
- clear_alert("canstealth")
- canstealthalert = null
- else
- if(!canstealthalert)
- canstealthalert = throw_alert("canstealth", /atom/movable/screen/alert/canstealth)
- clear_alert("instealth")
- instealthalert = null
- else
- clear_alert("instealth")
- instealthalert = null
- clear_alert("canstealth")
- canstealthalert = null
diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
deleted file mode 100644
index 7ebd3c8b3cc..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm
+++ /dev/null
@@ -1,77 +0,0 @@
-//Charger
-/mob/living/simple_animal/hostile/guardian/charger
- melee_damage_lower = 15
- melee_damage_upper = 15
- ranged = 1 //technically
- ranged_message = "charges"
- ranged_cooldown_time = 10
- speed = 2//slow when not charging
- damage_coeff = list(BRUTE = 0.5, BURN = 0.5, TOX = 0.6, CLONE = 0.6, STAMINA = 0, OXY = 0.6)
- playstyle_string = "As a charger type you are a formidable close range fighter, but move slowly when not charging. You can charge at a location, damaging any target hit and potentially knocking them flat."
- magic_fluff_string = "..And draw the Hunter, an alien master of rapid assault."
- tech_fluff_string = "Boot sequence complete. Charge modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one! It's a charger carp, that likes running at people. But it doesn't have any legs..."
- miner_fluff_string = "You encounter... Titanium, a lightweight, agile fighter."
- var/charging = 0
- var/atom/movable/screen/alert/chargealert
-
-/mob/living/simple_animal/hostile/guardian/charger/Life()
- . = ..()
- if(ranged_cooldown <= world.time)
- if(!chargealert)
- chargealert = throw_alert("charge", /atom/movable/screen/alert/cancharge)
- else
- clear_alert("charge")
- chargealert = null
-
-/mob/living/simple_animal/hostile/guardian/charger/OpenFire(atom/A)
- if(!charging)
- visible_message("[src] [ranged_message] at [A]!")
- ranged_cooldown = world.time + ranged_cooldown_time
- clear_alert("charge")
- chargealert = null
- Shoot(A)
-
-/mob/living/simple_animal/hostile/guardian/charger/Shoot(atom/targeted_atom)
- charging = 1
- throw_at(targeted_atom, range, 1, src, FALSE, TRUE, callback = CALLBACK(src, PROC_REF(charging_end)))
-
-/mob/living/simple_animal/hostile/guardian/charger/proc/charging_end()
- charging = 0
-
-/mob/living/simple_animal/hostile/guardian/charger/Move()
- if(charging)
- new /obj/effect/temp_visual/decoy/fading(loc,src)
- . = ..()
-
-/mob/living/simple_animal/hostile/guardian/charger/snapback()
- if(!charging)
- ..()
-
-/mob/living/simple_animal/hostile/guardian/charger/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- if(!charging)
- return ..()
-
- else if(hit_atom)
- if(isliving(hit_atom) && hit_atom != summoner)
- var/mob/living/L = hit_atom
- var/blocked = FALSE
- if(hasmatchingsummoner(hit_atom)) //if the summoner matches don't hurt them
- blocked = TRUE
- if(ishuman(hit_atom))
- var/mob/living/carbon/human/H = hit_atom
- if(H.check_shields(src, 90, "[name]", attack_type = THROWN_PROJECTILE_ATTACK))
- blocked = TRUE
- if(!blocked)
- L.visible_message("[src] slams into [L]!", "[src] slams into you!")
- if(prob(25))
- L.drop_all_held_items()
- L.Knockdown(10)
- L.visible_message("[L] is knocked clean over!", "You are flung to the ground by the impact!")
- L.apply_damage(30, BRUTE)
- playsound(get_turf(L), 'sound/effects/meteorimpact.ogg', 100, TRUE)
- shake_camera(L, 4, 3)
- shake_camera(src, 2, 3)
-
- charging = 0
-
diff --git a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
deleted file mode 100644
index 48fb3db7b7b..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
+++ /dev/null
@@ -1,85 +0,0 @@
-//Dextrous
-/mob/living/simple_animal/hostile/guardian/dextrous//very few buffs needed, this is arguably the most "powerful" holoparasite for the reason that is: GUN.
- melee_damage_lower = 10
- melee_damage_upper = 10
- damage_coeff = list(BRUTE = 0.5, BURN = 0.5, TOX = 0.75, CLONE = 0.75, STAMINA = 0, OXY = 0.75)
- playstyle_string = "As a dextrous type you can hold items, store an item within yourself, and have medium damage resistance, but do low damage on attacks. Recalling and leashing will force you to drop unstored items!"
- magic_fluff_string = "..And draw the Drone, a dextrous master of construction and repair."
- tech_fluff_string = "Boot sequence complete. Dextrous combat modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! You caught one! It can hold stuff in its fins, sort of."
- miner_fluff_string = "You encounter... Gold, a malleable constructor."
- dextrous = TRUE
- held_items = list(null, null)
- var/obj/item/internal_storage //what we're storing within ourself
-
-/mob/living/simple_animal/hostile/guardian/dextrous/death(gibbed)
- ..()
- if(internal_storage)
- dropItemToGround(internal_storage)
-
-/mob/living/simple_animal/hostile/guardian/dextrous/examine(mob/user)
- if(dextrous)
- . = list("This is [icon2html(src)] \a [src]!\n[desc]")
- for(var/obj/item/I in held_items)
- if(!(I.item_flags & ABSTRACT))
- . += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))]."
- if(internal_storage && !(internal_storage.item_flags & ABSTRACT))
- . += "It is holding [internal_storage.get_examine_string(user)] in its internal storage."
- . += ""
- else
- return ..()
-
-/mob/living/simple_animal/hostile/guardian/dextrous/Recall(forced)
- if(!summoner || loc == summoner || (cooldown > world.time && !forced))
- return FALSE
- drop_all_held_items()
- return ..() //lose items, then return
-
-/mob/living/simple_animal/hostile/guardian/dextrous/snapback()
- if(summoner && !(get_dist(get_turf(summoner),get_turf(src)) <= range))
- drop_all_held_items()
- ..() //lose items, then return
-
-//SLOT HANDLING BULLSHIT FOR INTERNAL STORAGE
-/mob/living/simple_animal/hostile/guardian/dextrous/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
- if(..())
- update_inv_hands()
- if(I == internal_storage)
- internal_storage = null
- update_inv_internal_storage()
- return TRUE
- return FALSE
-
-/mob/living/simple_animal/hostile/guardian/dextrous/can_equip(obj/item/I, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
- switch(slot)
- if(ITEM_SLOT_DEX_STORAGE)
- if(internal_storage)
- return FALSE
- return TRUE
- ..()
-
-/mob/living/simple_animal/hostile/guardian/dextrous/equip_to_slot(obj/item/I, slot)
- if(!..())
- return
-
- switch(slot)
- if(ITEM_SLOT_DEX_STORAGE)
- internal_storage = I
- update_inv_internal_storage()
- else
- to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!")
-
-/mob/living/simple_animal/hostile/guardian/dextrous/getBackSlot()
- return ITEM_SLOT_DEX_STORAGE
-
-/mob/living/simple_animal/hostile/guardian/dextrous/getBeltSlot()
- return ITEM_SLOT_DEX_STORAGE
-
-/mob/living/simple_animal/hostile/guardian/dextrous/proc/update_inv_internal_storage()
- if(internal_storage && client && hud_used && hud_used.hud_shown)
- internal_storage.screen_loc = ui_id
- client.screen += internal_storage
-
-/mob/living/simple_animal/hostile/guardian/dextrous/regenerate_icons()
- ..()
- update_inv_internal_storage()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
deleted file mode 100644
index f93f70d8ffb..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+++ /dev/null
@@ -1,78 +0,0 @@
-#define UNREGISTER_BOMB_SIGNALS(A) \
- do { \
- UnregisterSignal(A, boom_signals); \
- UnregisterSignal(A, COMSIG_PARENT_EXAMINE); \
- } while (0)
-
-//Bomb
-/mob/living/simple_animal/hostile/guardian/bomb
- melee_damage_lower = 35
- melee_damage_upper = 35
- next_move_modifier = 1.5//attacks are 50% slower
- damage_coeff = list(BRUTE = 0.6, BURN = 0.6, TOX = 0.6, CLONE = 0.6, STAMINA = 0, OXY = 0.6)//relatively delicate, for a holopara
- attack_sound = 'sound/effects/gravhit.ogg'
- range = 5//tiny range
- speed = 4//slow af
- playstyle_string = "As an explosive type, you have powerful but slow blasting punches, may explode targets for bonus damage on attack, and are capable of converting nearby items and objects into disguised bombs via alt click. However, you are slow, and your range is very low. Make it count!"
- magic_fluff_string = "..And draw the Scientist, master of explosive death."
- tech_fluff_string = "Boot sequence complete. Explosive modules active. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one! It's an explosive carp! Boom goes the fishy."
- miner_fluff_string = "You encounter... Gibtonite, an explosive fighter."
- var/bomb_cooldown = 0
- var/static/list/boom_signals = list(COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_BUMPED, COMSIG_ATOM_ATTACK_HAND)
-
-/mob/living/simple_animal/hostile/guardian/bomb/get_status_tab_items()
- . = ..()
- if(bomb_cooldown >= world.time)
- . += "Bomb Cooldown Remaining: [DisplayTimeText(bomb_cooldown - world.time)]"
-
-/mob/living/simple_animal/hostile/guardian/bomb/AttackingTarget()
- . = ..()
- if(. && prob(65) && isliving(target))
- var/mob/living/M = target
- if(!M.anchored && M != summoner && !hasmatchingsummoner(M))
- new /obj/effect/temp_visual/guardian/phase/out(get_turf(M))
- for(var/mob/living/L in range(1, M))
- if(hasmatchingsummoner(L)) //if the summoner matches don't hurt them
- continue
- if(L != src && L != summoner)
- L.apply_damage(20, BRUTE)
- new /obj/effect/temp_visual/explosion(get_turf(M))
-
-/mob/living/simple_animal/hostile/guardian/bomb/AltClickOn(atom/movable/A)
- if(!istype(A))
- return
- if(loc == summoner)
- to_chat(src, "You must be manifested to create bombs!")
- return
- if(isobj(A) && Adjacent(A))
- if(bomb_cooldown <= world.time && !stat)
- to_chat(src, "Success! Bomb armed!")
- bomb_cooldown = world.time + 200
- RegisterSignal(A, COMSIG_PARENT_EXAMINE, PROC_REF(display_examine))
- RegisterSignal(A, boom_signals, PROC_REF(kaboom))
- addtimer(CALLBACK(src, PROC_REF(disable), A), 600, TIMER_UNIQUE|TIMER_OVERRIDE)
- else
- to_chat(src, "Your powers are on cooldown! You must wait 20 seconds between bombs.")
-
-/mob/living/simple_animal/hostile/guardian/bomb/proc/kaboom(atom/source, mob/living/explodee)
- if(!istype(explodee))
- return
- if(explodee == src || explodee == summoner || hasmatchingsummoner(explodee))
- return
- to_chat(explodee, "[source] was boobytrapped!")
- to_chat(src, "Success! Your trap caught [explodee]")
- var/turf/T = get_turf(source)
- playsound(T,'sound/effects/explosion2.ogg', 200, TRUE)
- new /obj/effect/temp_visual/explosion(T)
- explodee.ex_act(EXPLODE_HEAVY)
- UNREGISTER_BOMB_SIGNALS(source)
-
-/mob/living/simple_animal/hostile/guardian/bomb/proc/disable(atom/A)
- to_chat(src, "Failure! Your trap didn't catch anyone this time.")
- UNREGISTER_BOMB_SIGNALS(A)
-
-/mob/living/simple_animal/hostile/guardian/bomb/proc/display_examine(datum/source, mob/user, text)
- text += "It glows with a strange light!"
-
-#undef UNREGISTER_BOMB_SIGNALS
diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm
deleted file mode 100644
index 2d7a34a8bbf..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-//Fire
-/mob/living/simple_animal/hostile/guardian/fire
- a_intent = INTENT_HELP
- melee_damage_lower = 7
- melee_damage_upper = 7
- attack_sound = 'sound/items/welder.ogg'
- attack_verb_continuous = "ignites"
- attack_verb_simple = "ignite"
- damage_coeff = list(BRUTE = 0.6, BURN = 0.4, TOX = 0.6, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- range = 7
- playstyle_string = "As a chaos type, you have only light damage resistance, but will ignite any enemy you bump into. In addition, your melee attacks will cause human targets to see everyone as you, and will cook simple animals from the inside, doing bonus damage."
- magic_fluff_string = "..And draw the Wizard, bringer of endless chaos!"
- tech_fluff_string = "Boot sequence complete. Crowd control modules activated. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! You caught one! OH GOD, EVERYTHING'S ON FIRE. Except you and the fish."
- miner_fluff_string = "You encounter... Plasma, the bringer of fire."
-
-/mob/living/simple_animal/hostile/guardian/fire/Life()
- . = ..()
- if(summoner)
- summoner.ExtinguishMob()
- summoner.adjust_fire_stacks(-20)
-
-/mob/living/simple_animal/hostile/guardian/fire/AttackingTarget()
- . = ..()
- if(. && ishuman(target) && target != summoner)
- new /datum/hallucination/delusion(target,TRUE,"custom",200,0, icon_state,icon)
- melee_damage_lower = 7
- melee_damage_upper = 7
- if(. && isanimal(target) && target != summoner)
- melee_damage_lower = 40
- melee_damage_upper = 40
-
-/mob/living/simple_animal/hostile/guardian/fire/on_entered(datum/source, AM as mob|obj)
- . = ..()
- collision_ignite(AM)
-
-/mob/living/simple_animal/hostile/guardian/fire/Bumped(atom/movable/AM)
- ..()
- collision_ignite(AM)
-
-/mob/living/simple_animal/hostile/guardian/fire/Bump(AM as mob|obj)
- ..()
- collision_ignite(AM)
-
-/mob/living/simple_animal/hostile/guardian/fire/proc/collision_ignite(AM as mob|obj)
- if(isliving(AM))
- var/mob/living/M = AM
- if(!hasmatchingsummoner(M) && M != summoner && M.fire_stacks < 7)
- M.fire_stacks = 7
- M.IgniteMob()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
deleted file mode 100644
index a86e38db777..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-//gravitokinetic
-/mob/living/simple_animal/hostile/guardian/gravitokinetic
- melee_damage_lower = 15
- melee_damage_upper = 15
- damage_coeff = list(BRUTE = 0.75, BURN = 0.75, TOX = 0.75, CLONE = 0.75, STAMINA = 0, OXY = 0.75)
- playstyle_string = "As a gravitokinetic type, you can alt click to make the gravity on the ground stronger, and punching applies this effect to a target."
- magic_fluff_string = "..And draw the Singularity, an anomalous force of terror."
- tech_fluff_string = "Boot sequence complete. Gravitokinetic modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one! It's a gravitokinetic carp! Now do you understand the gravity of the situation?"
- miner_fluff_string = "You encounter... Bananium, a master of gravity business."
- var/list/gravito_targets = list()
- var/gravity_power_range = 10 //how close the stand must stay to the target to keep the heavy gravity
-
-///Removes gravity from affected mobs upon guardian death to prevent permanent effects
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/death()
- . = ..()
- for(var/i in gravito_targets)
- remove_gravity(i)
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/AttackingTarget()
- . = ..()
- if(isliving(target) && target != src)
- to_chat(src, "Your punch has applied heavy gravity to [target]!")
- add_gravity(target, 2)
- to_chat(target, "Everything feels really heavy!")
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/AltClickOn(atom/A)
- if(isopenturf(A) && is_deployed() && stat != DEAD && in_range(src, A) && !incapacitated())
- var/turf/T = A
- if(isspaceturf(T))
- to_chat(src, "You cannot add gravity to space!")
- return
- visible_message("[src] slams their fist into the [T]!", "You modify the gravity of the [T].")
- do_attack_animation(T)
- add_gravity(T, 4)
- return
- return ..()
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/Recall(forced)
- . = ..()
- to_chat(src, "You have released your gravitokinetic powers!")
- for(var/i in gravito_targets)
- remove_gravity(i)
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/Moved(oldLoc, dir)
- . = ..()
- for(var/i in gravito_targets)
- if(get_dist(src, i) > gravity_power_range)
- remove_gravity(i)
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/proc/add_gravity(atom/A, new_gravity = 2)
- if(gravito_targets[A])
- return
- A.AddElement(/datum/element/forced_gravity, new_gravity)
- gravito_targets[A] = new_gravity
- RegisterSignal(A, COMSIG_MOVABLE_MOVED, PROC_REF(__distance_check))
- playsound(src, 'sound/effects/gravhit.ogg', 100, TRUE)
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/proc/remove_gravity(atom/target)
- if(isnull(gravito_targets[target]))
- return
- UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
- target.RemoveElement(/datum/element/forced_gravity, gravito_targets[target])
- gravito_targets -= target
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/proc/__distance_check(atom/movable/AM, OldLoc, Dir, Forced)
- if(get_dist(src, AM) > gravity_power_range)
- remove_gravity(AM)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm b/code/modules/mob/living/simple_animal/guardian/types/lightning.dm
deleted file mode 100644
index a70bf4edae2..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm
+++ /dev/null
@@ -1,113 +0,0 @@
-//Beam
-/obj/effect/ebeam/chain
- name = "lightning chain"
- layer = LYING_MOB_LAYER
-
-/mob/living/simple_animal/hostile/guardian/beam
- melee_damage_lower = 7
- melee_damage_upper = 7
- attack_verb_continuous = "shocks"
- attack_verb_simple = "shock"
- melee_damage_type = BURN
- attack_sound = 'sound/machines/defib_zap.ogg'
- damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- range = 7
- playstyle_string = "As a lightning type, you will apply lightning chains to targets on attack and have a lightning chain to your summoner. Lightning chains will shock anyone near them."
- magic_fluff_string = "..And draw the Tesla, a shocking, lethal source of power."
- tech_fluff_string = "Boot sequence complete. Lightning modules active. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one! It's a lightning carp! Everyone else goes zap zap."
- miner_fluff_string = "You encounter... Iron, a conductive master of lightning."
- var/datum/beam/summonerchain
- var/list/enemychains = list()
- var/successfulshocks = 0
-
-/mob/living/simple_animal/hostile/guardian/beam/AttackingTarget()
- . = ..()
- if(. && isliving(target) && target != src && target != summoner)
- cleardeletedchains()
- for(var/chain in enemychains)
- var/datum/beam/B = chain
- if(B.target == target)
- return //oh this guy already HAS a chain, let's not chain again
- if(enemychains.len > 2)
- var/datum/beam/C = pick(enemychains)
- qdel(C)
- enemychains -= C
- enemychains += Beam(target, "lightning[rand(1,12)]", time=70, maxdistance=7, beam_type=/obj/effect/ebeam/chain)
-
-/mob/living/simple_animal/hostile/guardian/beam/Destroy()
- removechains()
- return ..()
-
-/mob/living/simple_animal/hostile/guardian/beam/Manifest()
- . = ..()
- if(.)
- if(summoner)
- summonerchain = Beam(summoner, "lightning[rand(1,12)]", time=INFINITY, maxdistance=INFINITY, beam_type=/obj/effect/ebeam/chain)
- while(loc != summoner)
- if(successfulshocks > 5)
- successfulshocks = 0
- if(shockallchains())
- successfulshocks++
- SLEEP_CHECK_DEATH(3)
-
-/mob/living/simple_animal/hostile/guardian/beam/Recall()
- . = ..()
- if(.)
- removechains()
-
-/mob/living/simple_animal/hostile/guardian/beam/proc/cleardeletedchains()
- if(summonerchain && QDELETED(summonerchain))
- summonerchain = null
- if(enemychains.len)
- for(var/chain in enemychains)
- var/datum/cd = chain
- if(!chain || QDELETED(cd))
- enemychains -= chain
-
-/mob/living/simple_animal/hostile/guardian/beam/proc/shockallchains()
- . = 0
- cleardeletedchains()
- if(summoner)
- if(!summonerchain)
- summonerchain = Beam(summoner, "lightning[rand(1,12)]", time=INFINITY, maxdistance=INFINITY, beam_type=/obj/effect/ebeam/chain)
- . += chainshock(summonerchain)
- if(enemychains.len)
- for(var/chain in enemychains)
- . += chainshock(chain)
-
-/mob/living/simple_animal/hostile/guardian/beam/proc/removechains()
- if(summonerchain)
- qdel(summonerchain)
- summonerchain = null
- if(enemychains.len)
- for(var/chain in enemychains)
- qdel(chain)
- enemychains = list()
-
-/mob/living/simple_animal/hostile/guardian/beam/proc/chainshock(datum/beam/B)
- . = 0
- var/list/turfs = list()
- for(var/E in B.elements)
- var/obj/effect/ebeam/chainpart = E
- if(chainpart && chainpart.x && chainpart.y && chainpart.z)
- var/turf/T = get_turf_pixel(chainpart)
- turfs |= T
- if(T != get_turf(B.origin) && T != get_turf(B.target))
- for(var/turf/TU in circlerange(T, 1))
- turfs |= TU
- for(var/turf in turfs)
- var/turf/T = turf
- for(var/mob/living/L in T)
- if(L.stat != DEAD && L != src && L != summoner)
- if(hasmatchingsummoner(L)) //if the summoner matches don't hurt them
- continue
- if(successfulshocks > 4)
- L.electrocute_act(0)
- L.visible_message(
- "[L] was shocked by the lightning chain!", \
- "You are shocked by the lightning chain!", \
- "You hear a heavy electrical crack." \
- )
- L.adjustFireLoss(1.2) //adds up very rapidly
- . = 1
diff --git a/code/modules/mob/living/simple_animal/guardian/types/protector.dm b/code/modules/mob/living/simple_animal/guardian/types/protector.dm
deleted file mode 100644
index e42dcb62e2e..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/protector.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-//Protector
-/mob/living/simple_animal/hostile/guardian/protector
- melee_damage_lower = 30
- melee_damage_upper = 30
- range = 20
- damage_coeff = list(BRUTE = 0.4, BURN = 0.4, TOX = 0.4, CLONE = 0.4, STAMINA = 0, OXY = 0.4)
- playstyle_string = "As a protector type you cause your summoner to leash to you instead of you leashing to them and have two modes; Combat Mode, where you do and take medium damage, and Protection Mode, where you take almost no damage and have reduced damage. While in protection mode, you move significantly slower, and have extremely low range."
- magic_fluff_string = "..And draw the Guardian, a stalwart protector that never leaves the side of its charge."
- tech_fluff_string = "Boot sequence complete. Protector modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! You caught one! Wait, no... it caught you! The fisher has become the fishy."
- miner_fluff_string = "You encounter... Uranium, a very resistant guardian."
- toggle_button_type = /atom/movable/screen/guardian/ToggleMode
- var/toggle = FALSE
-
-/mob/living/simple_animal/hostile/guardian/protector/ex_act(severity)
- if(severity == 1)
- adjustBruteLoss(400) //if in protector mode, will do 20 damage and not actually necessarily kill the summoner
- else
- ..()
- if(QDELETED(src))
- return
- if(toggle)
- visible_message("The explosion glances off [src]'s energy shielding!")
-
-/mob/living/simple_animal/hostile/guardian/protector/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
- . = ..()
- if(. > 0 && toggle)
- var/image/I = new('icons/effects/effects.dmi', src, "shield-flash", MOB_LAYER+0.01, dir = pick(GLOB.cardinals))
- if(guardiancolor)
- I.color = guardiancolor
- flick_overlay_view(I, src, 5)
-
-/mob/living/simple_animal/hostile/guardian/protector/ToggleMode()
- if(cooldown > world.time)
- return 0
- cooldown = world.time + 10
- if(toggle)
- cut_overlays()
- melee_damage_lower = initial(melee_damage_lower)
- melee_damage_upper = initial(melee_damage_upper)
- speed = initial(speed)
- damage_coeff = list(BRUTE = 0.4, BURN = 0.4, TOX = 0.4, CLONE = 0.4, STAMINA = 0, OXY = 0.4)
- to_chat(src, "You switch to combat mode.")
- toggle = FALSE
- else
- var/mutable_appearance/shield_overlay = mutable_appearance('icons/effects/effects.dmi', "shield-grey")
- if(guardiancolor)
- shield_overlay.color = guardiancolor
- add_overlay(shield_overlay)
- melee_damage_lower = 15
- melee_damage_upper = 15
- speed = 4
- range = 5
- damage_coeff = list(BRUTE = 0.05, BURN = 0.05, TOX = 0.05, CLONE = 0.05, STAMINA = 0, OXY = 0.05) //damage? what's damage?
- to_chat(src, "You switch to protection mode.")
- toggle = TRUE
-
-/mob/living/simple_animal/hostile/guardian/protector/snapback() //snap to what? snap to the guardian!
- if(summoner)
- if(get_dist(get_turf(summoner),get_turf(src)) <= range)
- return
- else
- if(istype(summoner.loc, /obj/effect))
- to_chat(src, "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]!")
- visible_message("\The [src] jumps back to its user.")
- Recall(TRUE)
- else
- to_chat(summoner, "You moved out of range, and were pulled back! You can only move [range] meters from [real_name]!")
- summoner.visible_message("\The [summoner] jumps back to [summoner.p_their()] protector.")
- new /obj/effect/temp_visual/guardian/phase/out(get_turf(summoner))
- summoner.forceMove(get_turf(src))
- new /obj/effect/temp_visual/guardian/phase(get_turf(summoner))
diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
deleted file mode 100644
index 105ae8b35ec..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
+++ /dev/null
@@ -1,154 +0,0 @@
-//Ranged
-/obj/projectile/guardian//now featuring anime-accurate unpredictable richochet. Hit your master! Hit yourself! Salt in dchat when your own richochet puts you into crit.
- name = "crystal spray"
- icon_state = "guardian"
- damage = 15
- damage_type = BRUTE
- armour_penetration = 100
- ricochets_max = 2
- ricochet_chance = 65
- ricochet_auto_aim_range = 0
- ricochet_incidence_leeway = 50
- projectile_piercing = PASSMOB
-
-/mob/living/simple_animal/hostile/guardian/ranged
- a_intent = INTENT_HELP
- friendly_verb_continuous = "quietly assesses"
- friendly_verb_simple = "quietly assess"
- melee_damage_lower = 10
- melee_damage_upper = 10
- damage_coeff = list(BRUTE = 0.9, BURN = 0.9, TOX = 0.9, CLONE = 0.9, STAMINA = 0, OXY = 0.9)
- projectiletype = /obj/projectile/guardian
- ranged_cooldown_time = 1 //fast!
- projectilesound = 'sound/effects/hit_on_shattered_glass.ogg'
- ranged = 1
- range = 13
- playstyle_string = "As a ranged type, you have only light damage resistance, but are capable of spraying shards of crystal at incredibly high speed. You can also deploy surveillance snares to monitor enemy movement. Finally, you can switch to scout mode, in which you can't attack, but can move without limit."
- magic_fluff_string = "..And draw the Sentinel, an alien master of ranged combat."
- tech_fluff_string = "Boot sequence complete. Ranged combat modules active. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one, it's a ranged carp. This fishy can watch people pee in the ocean."
- miner_fluff_string = "You encounter... Diamond, a powerful projectile thrower."
- see_invisible = SEE_INVISIBLE_LIVING
- see_in_dark = 8
- toggle_button_type = /atom/movable/screen/guardian/ToggleMode
- var/list/snares = list()
- var/toggle = FALSE
- speed = -2//very fast!
-
-/mob/living/simple_animal/hostile/guardian/ranged/ToggleMode()
- if(loc == summoner)
- if(toggle)
- ranged = initial(ranged)
- melee_damage_lower = initial(melee_damage_lower)
- melee_damage_upper = initial(melee_damage_upper)
- obj_damage = initial(obj_damage)
- environment_smash = initial(environment_smash)
- alpha = 255
- range = initial(range)
- to_chat(src, "You switch to combat mode.")
- toggle = FALSE
- else
- ranged = 0
- melee_damage_lower = 0
- melee_damage_upper = 0
- obj_damage = 0
- environment_smash = ENVIRONMENT_SMASH_NONE
- alpha = 45
- range = 255
- to_chat(src, "You switch to scout mode.")
- toggle = TRUE
- else
- to_chat(src, "You have to be recalled to toggle modes!")
-
-/mob/living/simple_animal/hostile/guardian/ranged/Shoot(atom/targeted_atom)
- . = ..()
- if(istype(., /obj/projectile))
- var/obj/projectile/P = .
- if(guardiancolor)
- P.color = guardiancolor
-
-/mob/living/simple_animal/hostile/guardian/ranged/ToggleLight()
- var/msg
- switch(lighting_alpha)
- if (LIGHTING_PLANE_ALPHA_VISIBLE)
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
- msg = "You activate your night vision."
- if (LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- msg = "You increase your night vision."
- if (LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
- lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
- msg = "You maximize your night vision."
- else
- lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
- msg = "You deactivate your night vision."
-
- to_chat(src, "[msg]")
-
-
-/mob/living/simple_animal/hostile/guardian/ranged/verb/Snare()
- set name = "Set Surveillance Snare"
- set category = "Guardian"
- set desc = "Set an invisible snare that will alert you when living creatures walk over it. Max of 5"
- if(snares.len <6)
- var/turf/snare_loc = get_turf(loc)
- var/obj/effect/snare/S = new /obj/effect/snare(snare_loc)
- S.spawner = src
- S.name = "[get_area(snare_loc)] snare ([rand(1, 1000)])"
- snares |= S
- to_chat(src, "Surveillance snare deployed!")
- else
- to_chat(src, "You have too many snares deployed. Remove some first.")
-
-/mob/living/simple_animal/hostile/guardian/ranged/verb/DisarmSnare()
- set name = "Remove Surveillance Snare"
- set category = "Guardian"
- set desc = "Disarm unwanted surveillance snares."
- var/picked_snare = input(src, "Pick which snare to remove", "Remove Snare") as null|anything in sortNames(snares)
- if(picked_snare)
- snares -= picked_snare
- qdel(picked_snare)
- to_chat(src, "Snare disarmed.")
-
-/obj/effect/snare
- name = "snare"
- desc = "You shouldn't be seeing this!"
- var/mob/living/simple_animal/hostile/guardian/spawner
- invisibility = INVISIBILITY_ABSTRACT
-
-/obj/effect/snare/Initialize()
- . = ..()
- var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
- )
- AddElement(/datum/element/connect_loc, loc_connections)
-
-
-/obj/effect/snare/proc/on_entered(datum/source, AM as mob|obj)
- SIGNAL_HANDLER
- if(isliving(AM) && spawner && spawner.summoner && AM != spawner && !spawner.hasmatchingsummoner(AM))
- to_chat(spawner.summoner, "[AM] has crossed surveillance snare, [name].")
- var/list/guardians = spawner.summoner.hasparasites()
- for(var/para in guardians)
- to_chat(para, "[AM] has crossed surveillance snare, [name].")
-
-/obj/effect/snare/singularity_act()
- return
-
-/obj/effect/snare/singularity_pull()
- return
-
-/mob/living/simple_animal/hostile/guardian/ranged/Manifest(forced)
- if (toggle)
- incorporeal_move = INCORPOREAL_MOVE_BASIC
- . = ..()
-
-/mob/living/simple_animal/hostile/guardian/ranged/Recall(forced)
- // To stop scout mode from moving when recalled
- incorporeal_move = FALSE
- . = ..()
-
-/mob/living/simple_animal/hostile/guardian/ranged/AttackingTarget()
- if(toggle)
- return
- ..()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/slime.dm b/code/modules/mob/living/simple_animal/guardian/types/slime.dm
deleted file mode 100644
index bf38ffed2ef..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/slime.dm
+++ /dev/null
@@ -1,73 +0,0 @@
-//Slime guardian- modified support guardian who has higher utility but is less potent in battle
-/mob/living/simple_animal/hostile/guardian/slime
- a_intent = INTENT_HARM
- speed = 0
- damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- melee_damage_lower = 10
- melee_damage_upper = 10
- melee_damage_type = TOX
- playstyle_string = "As a slime type, you can toggle between a weak combat mode, and a strong healing mode that nourishes and repairs damage. This mode also works on slimes. Be warned: You are more vulnerable to damage then most holoparasites."
- magic_fluff_string = "..And draw the Xenobiologist, a purveyor of godlike power."
- carp_fluff_string = "CARP CARP CARP! You caught a slimy carp. Gross, maybe you should throw this one back."
- tech_fluff_string = "Boot sequence complete. Xenobiological support module active. Holoparasite swarm online."
- miner_fluff_string = "You encounter... Slime, the master of xenobiology."
- slime_fluff_string = "The crystal in your hand shatters into mist, which forms a strange, slimy figure!"
- toggle_button_type = /atom/movable/screen/guardian/ToggleMode
- var/toggle = FALSE
-
-/mob/living/simple_animal/hostile/guardian/slime/Initialize()
- . = ..()
- var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
- medsensor.add_hud_to(src)
-
-/mob/living/simple_animal/hostile/guardian/slime/AttackingTarget()
- . = ..()
- if(is_deployed() && toggle && isslime(target))
- var/mob/living/simple_animal/slime/slime = target
- slime.add_nutrition(rand(14, 30))
- slime.adjustHealth(10)
- return
-
- if(is_deployed() && toggle && iscarbon(target))
- var/mob/living/carbon/C = target
- C.adjustBruteLoss(-7)
- C.adjustFireLoss(-7)
- C.adjustOxyLoss(-7)
- C.adjustToxLoss(-7)
- C.adjustCloneLoss(-0.5)
- C.adjust_nutrition(10)
- var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(C))
- if(guardiancolor)
- H.color = guardiancolor
- if(C == summoner)
- update_health_hud()
- med_hud_set_health()
- med_hud_set_status()
-
- if(is_deployed() && toggle == FALSE && iscarbon(target))
- if(prob(20))
- var/mob/living/carbon/D = target
- D.Paralyze(25)
- D.visible_message("\The [src] knocks down \the [D]!", \
- "\The [src] knocks you down!")
-
-/mob/living/simple_animal/hostile/guardian/slime/ToggleMode()
- if(src.loc == summoner)
- if(toggle)
- a_intent = INTENT_HARM
- speed = -1
- damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.2, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- melee_damage_lower = 15
- melee_damage_upper = 15
- to_chat(src, "Blorble... You switch to combat mode.")
- toggle = FALSE
- else
- a_intent = INTENT_HELP
- speed = 2
- damage_coeff = list(BRUTE = 1.2, BURN = 1.2, TOX = 0.7, CLONE = 1.2, STAMINA = 0, OXY = 1.2)
- melee_damage_lower = 0
- melee_damage_upper = 0
- to_chat(src, "You switch to nourshing mode. Yummy.")
- toggle = TRUE
- else
- to_chat(src, "You have to be recalled to toggle modes!")
diff --git a/code/modules/mob/living/simple_animal/guardian/types/standard.dm b/code/modules/mob/living/simple_animal/guardian/types/standard.dm
deleted file mode 100644
index 2528a091471..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/standard.dm
+++ /dev/null
@@ -1,36 +0,0 @@
-//Standard
-/mob/living/simple_animal/hostile/guardian/punch
- melee_damage_lower = 20
- melee_damage_upper = 20
- obj_damage = 80
- next_move_modifier = 0.6 //attacks 40% faster
- environment_smash = ENVIRONMENT_SMASH_WALLS
- playstyle_string = "As a standard type you have no special abilities, but have a high damage resistance and a powerful attack capable of smashing through walls."
- magic_fluff_string = "..And draw the Assistant, faceless and generic, but never to be underestimated."
- tech_fluff_string = "Boot sequence complete. Standard combat modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! You caught one! It's really boring and standard. Better punch some walls to ease the tension."
- miner_fluff_string = "You encounter... Adamantine, a powerful attacker."
- var/battlecry = "AT"
- speed = 4//unlike funny jojo man, the punch ghost is actually balanced by their low mobility
-
-/mob/living/simple_animal/hostile/guardian/punch/verb/Battlecry()
- set name = "Set Battlecry"
- set category = "Guardian"
- set desc = "Choose what you shout as you punch people."
- var/input = stripped_input(src,"What do you want your battlecry to be? Max length of 6 characters.", ,"", 7)
- if(input)
- battlecry = input
-
-
-
-/mob/living/simple_animal/hostile/guardian/punch/AttackingTarget()
- . = ..()
- if(isliving(target))
- say("[battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry]!!", ignore_spam = TRUE)
- playsound(loc, src.attack_sound, 50, TRUE, TRUE)
- playsound(loc, src.attack_sound, 50, TRUE, TRUE)
- playsound(loc, src.attack_sound, 50, TRUE, TRUE)
- playsound(loc, src.attack_sound, 50, TRUE, TRUE)
- if(isanimal(target))
- var/mob/living/C = target
- C.apply_damage(35, BRUTE)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm
deleted file mode 100644
index 57f1b1892f9..00000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/support.dm
+++ /dev/null
@@ -1,148 +0,0 @@
-//Healer
-/mob/living/simple_animal/hostile/guardian/healer
- a_intent = INTENT_HARM
- friendly_verb_continuous = "heals"
- friendly_verb_simple = "heal"
- speed = 0
- damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- melee_damage_lower = 15
- melee_damage_upper = 15
- playstyle_string = "As a support type, you may toggle your basic attacks to a healing mode. In addition, Alt-Clicking on an adjacent object or mob will warp them to your bluespace beacon after a short delay."
- magic_fluff_string = "..And draw the CMO, a potent force of life... and death."
- carp_fluff_string = "CARP CARP CARP! You caught a support carp. It's a kleptocarp!"
- tech_fluff_string = "Boot sequence complete. Support modules active. Holoparasite swarm online."
- miner_fluff_string = "You encounter... Bluespace, the master of support."
- toggle_button_type = /atom/movable/screen/guardian/ToggleMode
- var/obj/structure/receiving_pad/beacon
- var/beacon_cooldown = 0
- var/toggle = FALSE
-
-/mob/living/simple_animal/hostile/guardian/healer/Initialize()
- . = ..()
- var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
- medsensor.add_hud_to(src)
-
-/mob/living/simple_animal/hostile/guardian/healer/get_status_tab_items()
- . = ..()
- if(beacon_cooldown >= world.time)
- . += "Beacon Cooldown Remaining: [DisplayTimeText(beacon_cooldown - world.time)]"
-
-/mob/living/simple_animal/hostile/guardian/healer/AttackingTarget()
- . = ..()
- if(is_deployed() && toggle && iscarbon(target))
- var/mob/living/carbon/C = target
- C.adjustBruteLoss(-5)
- C.adjustFireLoss(-5)
- C.adjustOxyLoss(-5)
- C.adjustToxLoss(-5)
- var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(C))
- if(guardiancolor)
- H.color = guardiancolor
- if(C == summoner)
- update_health_hud()
- med_hud_set_health()
- med_hud_set_status()
-
-/mob/living/simple_animal/hostile/guardian/healer/ToggleMode()
- if(src.loc == summoner)
- if(toggle)
- a_intent = INTENT_HARM
- speed = -2
- damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- melee_damage_lower = 5
- melee_damage_upper = 5
- next_move_modifier = 0.3///attack as fast as you can click, but your actual hits are basically tickle damage :))
- to_chat(src, "You switch to combat mode.")
- toggle = FALSE
- else
- a_intent = INTENT_HELP
- speed = 1
- damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
- melee_damage_lower = 0
- melee_damage_upper = 0
- to_chat(src, "You switch to healing mode.")
- toggle = TRUE
- else
- to_chat(src, "You have to be recalled to toggle modes!")
-
-
-/mob/living/simple_animal/hostile/guardian/healer/verb/Beacon()
- set name = "Place Bluespace Beacon"
- set category = "Guardian"
- set desc = "Mark a floor as your beacon point, allowing you to warp targets to it. Your beacon will not work at extreme distances."
-
- if(beacon_cooldown >= world.time)
- to_chat(src, "Your power is on cooldown. You must wait five minutes between placing beacons.")
- return
-
- var/turf/beacon_loc = get_turf(src.loc)
- if(!isfloorturf(beacon_loc))
- return
-
- if(beacon)
- beacon.disappear()
- beacon = null
-
- beacon = new(beacon_loc, src)
-
- to_chat(src, "Beacon placed! You may now warp targets and objects to it, including your user, via Alt+Click.")
-
- beacon_cooldown = world.time + 3000
-
-/obj/structure/receiving_pad
- name = "bluespace receiving pad"
- icon = 'icons/turf/floors.dmi'
- desc = "A receiving zone for bluespace teleportations."
- icon_state = "light_on_flicker-1"
- light_range = MINIMUM_USEFUL_LIGHT_RANGE
- density = FALSE
- anchored = TRUE
- layer = ABOVE_OPEN_TURF_LAYER
-
-/obj/structure/receiving_pad/New(loc, mob/living/simple_animal/hostile/guardian/healer/G)
- . = ..()
- if(G?.guardiancolor)
- add_atom_colour(G.guardiancolor, FIXED_COLOUR_PRIORITY)
-
-/obj/structure/receiving_pad/proc/disappear()
- visible_message("[src] vanishes!")
- qdel(src)
-
-/mob/living/simple_animal/hostile/guardian/healer/AltClickOn(atom/movable/A)
- if(!istype(A))
- return
- if(src.loc == summoner)
- to_chat(src, "You must be manifested to warp a target!")
- return
- if(!beacon)
- to_chat(src, "You need a beacon placed to warp things!")
- return
- if(!Adjacent(A))
- to_chat(src, "You must be adjacent to your target!")
- return
- if(A.anchored)
- to_chat(src, "Your target cannot be anchored!")
- return
-
- var/turf/T = get_turf(A)
- if(beacon.virtual_z() != T.virtual_z())
- to_chat(src, "The beacon is too far away to warp to!")
- return
-
- to_chat(src, "You begin to warp [A].")
- A.visible_message("[A] starts to glow faintly!", \
- "You start to faintly glow, and you feel strangely weightless!")
- do_attack_animation(A)
-
- if(!do_after(src, 6 SECONDS, A)) //now start the channel
- to_chat(src, "You need to hold still!")
- return
-
- new /obj/effect/temp_visual/guardian/phase/out(T)
- if(isliving(A))
- var/mob/living/L = A
- L.flash_act()
- A.visible_message("[A] disappears in a flash of light!", \
- "Your vision is obscured by a flash of light!")
- do_teleport(A, beacon, 0, channel = TELEPORT_CHANNEL_BLUESPACE)
- new /obj/effect/temp_visual/guardian/phase(get_turf(A))
diff --git a/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm b/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm
index 78432c92a4d..038aae0900d 100644
--- a/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm
@@ -9,7 +9,7 @@
status_flags = CANSTUN|CANKNOCKDOWN|CANPUSH
mouse_opacity = MOUSE_OPACITY_ICON
a_intent = INTENT_HARM
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
move_to_delay = 10
health = 70
@@ -35,14 +35,14 @@
minimum_distance = 1
icon_state = "mining_drone_offense"
faction = list("mining", "turret")
- loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/effect/spawner/lootdrop/minebot)
+ loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/effect/spawner/random/minebot)
projectiletype = /obj/projectile/kinetic/miner/weak
/obj/projectile/kinetic/miner/weak
damage = 15
-/obj/effect/spawner/lootdrop/minebot
+/obj/effect/spawner/random/minebot
loot = list(/obj/item/borg/upgrade/modkit/minebot_passthrough = 15,
/obj/item/borg/upgrade/modkit/chassis_mod = 15,
/obj/item/borg/upgrade/modkit/tracer = 15,
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index ec7c76f5ca6..402c6c920c0 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -22,7 +22,7 @@
bubble_icon = "alien"
a_intent = INTENT_HARM
attack_sound = 'sound/weapons/bladeslice.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
unsuitable_atmos_damage = 15
faction = list(ROLE_ALIEN)
status_flags = CANPUSH
@@ -30,7 +30,6 @@
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
unique_name = 1
- gold_core_spawnable = HOSTILE_SPAWN
deathsound = 'sound/voice/hiss6.ogg'
deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw..."
@@ -143,7 +142,6 @@
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 10,
/obj/item/stack/sheet/animalhide/xeno = 2)
mob_size = MOB_SIZE_LARGE
- gold_core_spawnable = NO_SPAWN
/obj/projectile/neurotox
name = "neurotoxin"
@@ -169,7 +167,6 @@
friendly_verb_simple = "caress"
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
- gold_core_spawnable = HOSTILE_SPAWN
icon_state = "maid"
icon_living = "maid"
icon_dead = "maid_dead"
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index d43d744e280..2de36372922 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -34,7 +34,7 @@
friendly_verb_simple = "bear hug"
//Space bears aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
@@ -98,7 +98,6 @@
health = 120
maxHealth = 120
armored = TRUE
- gold_core_spawnable = HOSTILE_SPAWN
/mob/living/simple_animal/hostile/bear/cave
name = "brown bear"
@@ -115,7 +114,7 @@
name = "pile of bear armor"
desc = "A scattered pile of various shaped armor pieces fitted for a bear, some duct tape, and a nail filer. Crude instructions \
are written on the back of one of the plates. This seems like an awful idea."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "bear_armor_upgrade"
/obj/item/bear_armor/afterattack(atom/target, mob/user, proximity_flag)
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 676b58a9852..c019c6a65ad 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -47,11 +47,10 @@
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BUG
movement_type = FLYING
- gold_core_spawnable = FRIENDLY_SPAWN
search_objects = 1 //have to find those plant trays!
//Spaceborn beings don't get hurt by space
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
del_on_death = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 67a80713d8e..4f0448b385c 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -37,13 +37,12 @@
speak_emote = list("gnashes")
//Space carp aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
faction = list("carp", "mining")
movement_type = FLYING
pressure_resistance = 200
- gold_core_spawnable = HOSTILE_SPAWN
var/random_color = TRUE //if the carp uses random coloring
var/rarechance = 1 //chance for rare color variant
@@ -159,7 +158,6 @@
icon_state = "holocarp"
icon_living = "holocarp"
maxbodytemp = INFINITY
- gold_core_spawnable = NO_SPAWN
del_on_death = 1
random_color = FALSE
food_type = list()
@@ -229,7 +227,6 @@
desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
gender = FEMALE
speak_emote = list("squeaks")
- gold_core_spawnable = NO_SPAWN
faction = list(ROLE_SYNDICATE)
AIStatus = AI_OFF
rarechance = 10
diff --git a/code/modules/mob/living/simple_animal/hostile/clown.dm b/code/modules/mob/living/simple_animal/hostile/clown.dm
index b513c74e9d5..a5883ce91ef 100644
--- a/code/modules/mob/living/simple_animal/hostile/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/clown.dm
@@ -29,7 +29,6 @@
del_on_death = 1
loot = list(/obj/effect/mob_spawn/human/clown/corpse)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 270
maxbodytemp = 370
unsuitable_atmos_damage = 10
@@ -56,7 +55,7 @@
. = ..()
if(banana_time && banana_time < world.time)
var/turf/T = get_turf(src)
- var/list/adjacent = T.GetAtmosAdjacentTurfs()
+ var/list/adjacent = T.get_atmos_adjacent_turfs()
new banana_type(pick(adjacent))
banana_time = world.time + rand(30,60)
diff --git a/code/modules/mob/living/simple_animal/hostile/cockroach.dm b/code/modules/mob/living/simple_animal/hostile/cockroach.dm
index c822268a7fe..d744d4a413c 100644
--- a/code/modules/mob/living/simple_animal/hostile/cockroach.dm
+++ b/code/modules/mob/living/simple_animal/hostile/cockroach.dm
@@ -7,7 +7,7 @@
maxHealth = 1
turns_per_move = 5
loot = list(/obj/effect/decal/cleanable/insectguts)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 270
maxbodytemp = INFINITY
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
@@ -23,7 +23,6 @@
melee_damage_upper = 0
obj_damage = 0
ventcrawler = VENTCRAWLER_ALWAYS
- gold_core_spawnable = FRIENDLY_SPAWN
verb_say = "chitters"
verb_ask = "chitters inquisitively"
verb_exclaim = "chitters loudly"
@@ -49,7 +48,6 @@
melee_damage_lower = 5
melee_damage_upper = 5
obj_damage = 20
- gold_core_spawnable = HOSTILE_SPAWN
projectilesound = 'sound/weapons/gun/pistol/shot.ogg'
projectiletype = /obj/projectile/glockroachbullet
casingtype = /obj/item/ammo_casing/glockroach
diff --git a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
index 57a33c2ee02..26f176d74fa 100644
--- a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
@@ -26,10 +26,9 @@
attack_verb_simple = "blink at"
attack_sound = 'sound/weapons/pierce.ogg'
movement_type = FLYING
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
- gold_core_spawnable = HOSTILE_SPAWN
faction = list("spooky")
del_on_death = 1
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index c9c2e131cc0..6959b9e61cd 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -27,11 +27,10 @@
attack_sound = 'sound/hallucinations/growl1.ogg'
speak_emote = list("growls")
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
faction = list("faithless")
- gold_core_spawnable = HOSTILE_SPAWN
footstep_type = FOOTSTEP_MOB_SHOE
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 5e3e8d0b34d..fa15c57249e 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -50,7 +50,6 @@
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
unique_name = 1
- gold_core_spawnable = HOSTILE_SPAWN
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
footstep_type = FOOTSTEP_MOB_CLAW
mob_size = MOB_SIZE_LARGE
@@ -122,7 +121,6 @@
var/datum/action/innate/spider/lay_eggs/lay_eggs
var/datum/action/innate/spider/set_directive/set_directive
var/static/list/consumed_mobs = list() //the refs of mobs that have been consumed by nurse spiders to lay eggs
- gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/hostile/poison/giant_spider/nurse/Initialize()
. = ..()
@@ -172,7 +170,6 @@
melee_damage_upper = 20
poison_per_bite = 5
move_to_delay = 5
- gold_core_spawnable = NO_SPAWN
//vipers are the rare variant of the hunter, no IMMEDIATE damage but so much poison medical care will be needed fast.
/mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper
@@ -205,7 +202,6 @@
move_to_delay = 8
speed = 9
status_flags = NONE
- gold_core_spawnable = NO_SPAWN
var/slowed_by_webs = FALSE
/mob/living/simple_animal/hostile/poison/giant_spider/tarantula/Moved(atom/oldloc, dir)
@@ -220,16 +216,15 @@
/mob/living/simple_animal/hostile/poison/giant_spider/ice //spiders dont usually like tempatures of 140 kelvin who knew
name = "giant ice spider"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
poison_type = /datum/reagent/consumable/frostoil
color = rgb(114,228,250)
- gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/hostile/poison/giant_spider/nurse/ice
name = "giant ice spider"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
poison_type = /datum/reagent/consumable/frostoil
@@ -237,12 +232,11 @@
/mob/living/simple_animal/hostile/poison/giant_spider/hunter/ice
name = "giant ice spider"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
poison_type = /datum/reagent/consumable/frostoil
color = rgb(114,228,250)
- gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/hostile/poison/giant_spider/handle_automated_action()
if(!..()) //AIStatus is off
diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm
index a175bb40fec..6a11507beea 100644
--- a/code/modules/mob/living/simple_animal/hostile/goose.dm
+++ b/code/modules/mob/living/simple_animal/hostile/goose.dm
@@ -29,7 +29,6 @@
speak_emote = list("honks")
faction = list("neutral")
attack_same = TRUE
- gold_core_spawnable = HOSTILE_SPAWN
var/random_retaliate = TRUE
var/icon_vomit_start = "vomit_start"
var/icon_vomit = "vomit"
@@ -95,7 +94,6 @@
response_disarm_simple = "gently push aside"
response_harm_continuous = "kicks"
response_harm_simple = "kick"
- gold_core_spawnable = NO_SPAWN
random_retaliate = FALSE
var/vomiting = FALSE
var/vomitCoefficient = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
index 850ff235375..292a9fee365 100644
--- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
@@ -73,8 +73,6 @@
if(origin && (origin.current ? (origin.current.stat == DEAD) : origin.get_ghost()))
origin.transfer_to(M)
var/datum/antagonist/changeling/C = origin.has_antag_datum(/datum/antagonist/changeling)
- if(!C)
- C = origin.add_antag_datum(/datum/antagonist/changeling/xenobio)
if(C.can_absorb_dna(owner))
C.add_new_profile(owner)
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 431229fefc4..9eb029b22ec 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -1,29 +1,29 @@
-/obj/projectile/hivebotbullet
- damage = 10
- damage_type = BRUTE
-
/mob/living/simple_animal/hostile/hivebot
name = "hivebot"
- desc = "A small robot."
+ desc = "A human-sized automaton clad in the scrap of a dead world. Exposed circuitry sparks subtly as it analyzes the area around it."
icon = 'icons/mob/hivebot.dmi'
icon_state = "basic"
icon_living = "basic"
icon_dead = "basic"
gender = NEUTER
mob_biotypes = MOB_ROBOTIC
- health = 15
- maxHealth = 15
+ health = 35
+ maxHealth = 35
healable = 0
- melee_damage_lower = 2
- melee_damage_upper = 3
+ melee_damage_lower = 8
+ melee_damage_upper = 12
+
attack_verb_continuous = "claws"
attack_verb_simple = "claw"
attack_sound = 'sound/weapons/bladeslice.ogg'
+ casingtype = /obj/item/ammo_casing/c10mm
projectilesound = 'sound/weapons/gun/pistol/shot.ogg'
- projectiletype = /obj/projectile/hivebotbullet
+
+ armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 100, "fire" = 50, "acid" = 0)
+
faction = list("hivebot")
check_friendly_fire = 1
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
possible_a_intents = list(INTENT_HELP, INTENT_GRAB, INTENT_DISARM, INTENT_HARM)
minbodytemp = 0
verb_say = "states"
@@ -35,7 +35,16 @@
del_on_death = 1
minbodytemp = 0
maxbodytemp = 600
- loot = list(/obj/effect/decal/cleanable/robot_debris)
+ loot = list(
+ /obj/effect/decal/cleanable/robot_debris,
+ /obj/effect/spawner/random/waste/hivebot,
+ /obj/effect/spawner/random/waste/hivebot/part,
+ )
+
+ //yeah so it turns out that /simple_animal/hostile gets upset when you call say because say contains a sleep. so we have to do this on subtypes.
+ var/list/aggro_blurb = list("INFILTRATOR WITHIN AO!!", "TERMINATE HOSTILE!!", "DEFEND TERMINUS!!", "CODE 7-34!!")
+ var/aggro_blurb_chance = 10
+
var/alert_light
footstep_type = FOOTSTEP_MOB_CLAW
@@ -48,8 +57,9 @@
. = ..()
a_intent_change(INTENT_HARM)
update_icons()
- if(prob(5))
- say(pick("INTRUDER DETECTED!", "CODE 7-34.", "101010!!"), forced = type)
+ if(prob(aggro_blurb_chance))
+ say("[pick(aggro_blurb)]", forced = type)
+
/mob/living/simple_animal/hostile/hivebot/LoseAggro()
. = ..()
@@ -69,58 +79,107 @@
/mob/living/simple_animal/hostile/hivebot/death(gibbed)
do_sparks(3, TRUE, src)
- new /obj/effect/spawner/lootdrop/waste/hivebot(loc)
..(TRUE)
-/mob/living/simple_animal/hostile/hivebot/range
- name = "hivebot"
- desc = "A smallish robot, this one is armed!"
+/mob/living/simple_animal/hostile/hivebot/ranged
+ name = "combat hivebot"
+ desc = "A human-sized automaton clad in the scrap of a dead world. A weapon pivots around on its top, searching for a target to engage."
icon_state = "ranged"
icon_living = "ranged"
icon_dead = "ranged"
ranged = TRUE
retreat_distance = 5
minimum_distance = 5
-
-/mob/living/simple_animal/hostile/hivebot/range/rockplanet
- faction = list("mining", "hivebot")
-
-/mob/living/simple_animal/hostile/hivebot/rapid
- icon_state = "ranged"
- icon_living = "ranged"
- icon_dead = "ranged"
+ loot = list(
+ /obj/effect/decal/cleanable/robot_debris,
+ /obj/effect/spawner/random/waste/hivebot,
+ /obj/effect/spawner/random/waste/hivebot/part,
+ /obj/effect/spawner/random/waste/hivebot/part,
+ )
+
+/mob/living/simple_animal/hostile/hivebot/ranged/rapid
ranged = TRUE
rapid = 3
- retreat_distance = 5
- minimum_distance = 5
-
-/mob/living/simple_animal/hostile/hivebot/rapid/rockplanet
- faction = list("mining", "hivebot")
+ rapid_fire_delay = 4
+ casingtype = /obj/item/ammo_casing/c57x39mm
+ projectilesound = 'sound/weapons/gun/smg/sidewinder.ogg'
/mob/living/simple_animal/hostile/hivebot/strong
- name = "strong hivebot"
+ name = "heavy hivebot"
+ desc = "A towering scrap-clad monolith. Hatred radiates out from the sensors that adorn it, beams of subtle light coming from within its sparking core."
+ armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 100, "fire" = 50, "acid" = 0)
icon_state = "strong"
icon_living = "strong"
icon_dead = "strong"
- desc = "A robot, this one is armed and looks tough!"
health = 80
maxHealth = 80
ranged = TRUE
+ casingtype = /obj/item/ammo_casing/mm712x82
+ projectilesound = 'sound/weapons/gun/rifle/hydra.ogg'
+ melee_damage_lower = 12
+ melee_damage_upper = 20
+ move_to_delay = 10
+ loot = list(
+ /obj/effect/decal/cleanable/robot_debris,
+ /obj/effect/spawner/random/waste/hivebot/more,
+ /obj/effect/spawner/random/waste/hivebot/part/heavy,
+ /obj/effect/spawner/random/waste/hivebot/part,
+ /obj/effect/spawner/random/waste/hivebot/part,
+ )
+
+/mob/living/simple_animal/hostile/hivebot/defender //slave to the system
+ name = "core hivebot"
+ desc = "A massive, alien tower of metal and circuitry. Eyes adorn its body, each one casting a ray of electronic light in myriad directions. Slaved to its whim is a scrapped turret mounting, angrily glancing at the world around it."
+ armor = list("melee" = 40, "bullet" = 60, "laser" = 30, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 100, "fire" = 50, "acid" = 0)
+ icon_state = "strong"
+ icon_living = "strong"
+ icon_dead = "strong"
+ health = 120
+ maxHealth = 120
+ ranged = TRUE
+
+ casingtype = /obj/item/ammo_casing/mm712x82
+ projectilesound = 'sound/weapons/gun/rifle/hydra.ogg'
+ rapid = 3
+ rapid_fire_delay = 4
+
+ retreat_distance = 3
+ minimum_distance = 5
+
+ melee_damage_lower = 15
+ melee_damage_upper = 28
+
+ move_to_delay = 20
+
+ loot = list(
+ /obj/effect/decal/cleanable/robot_debris,
+ /obj/effect/spawner/random/waste/hivebot/more,
+ /obj/effect/spawner/random/waste/hivebot/part/superheavy,
+ /obj/effect/spawner/random/waste/hivebot/part/heavy,
+ /obj/effect/spawner/random/waste/hivebot/part/heavy,
+ )
+
+/mob/living/simple_animal/hostile/hivebot/defender/death(gibbed)
+ //once we get better sprites i want this to be like the claw's death. aka fucking cool.
+ radiation_pulse(src, 500)
+ explosion(src, 0,1,3,3,)
+ ..(TRUE)
-/mob/living/simple_animal/hostile/hivebot/strong/rockplanet
- faction = list("mining", "hivebot")
+
+/mob/living/simple_animal/hostile/hivebot/defender/Initialize(mapload)
+ . = ..()
+ transform *= 1.3
/mob/living/simple_animal/hostile/hivebot/mechanic
name = "hivebot mechanic"
icon_state = "strong"
icon_living = "strong"
icon_dead = "strong"
- desc = "A robot built for base upkeep, intended for use inside hivebot colonies."
+ desc = "A tidy yet discordant machine of scrap, adorned with analyzers, waldos, and touching eyes."
health = 60
maxHealth = 60
ranged = TRUE
rapid = 3
- gold_core_spawnable = HOSTILE_SPAWN
var/datum/action/innate/hivebot/foamwall/foam
/mob/living/simple_animal/hostile/hivebot/mechanic/Initialize(mapload)
@@ -173,43 +232,3 @@
return
new /obj/structure/foamedmetal(H.loc)
playsound(get_turf(H), 'sound/effects/extinguish.ogg', 50, TRUE, -1)
-
-
-/mob/living/simple_animal/hostile/hivebot/wasteplanet
- name = "hivebot"
- desc = "A smallish robot, this one is armed!"
- icon_state = "basic"
- icon_living = "basic"
- icon_dead = "basic"
- ranged = FALSE
- faction = list("mining", "hivebot")
- health = 30
- maxHealth = 30
- healable = 0
- melee_damage_lower = 5
- melee_damage_upper = 15
-
-
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged
- ranged = TRUE
- icon_state = "ranged"
- icon_living = "ranged"
- icon_dead = "ranged"
- ranged = TRUE
- retreat_distance = 5
- minimum_distance = 5
-
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid
- rapid = 3
-
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong
- name = "strong hivebot"
- icon_state = "strong"
- icon_living = "strong"
- icon_dead = "strong"
- desc = "A robot, this one is armed and looks tough!"
- health = 80
- maxHealth = 80
- ranged = TRUE
- retreat_distance = 5
- minimum_distance = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 70ce3f665ba..e12e86e47b0 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -18,8 +18,10 @@
var/projectiletype //set ONLY it and NULLIFY casingtype var, if we have ONLY projectile
var/projectilesound
var/casingtype //set ONLY it and NULLIFY projectiletype, if we have projectile IN CASING
- var/move_to_delay = 3 //delay for the automated movement.
+ ///delay for the automated movement.
+ var/move_to_delay = 3
var/list/friends = list()
+
var/list/emote_taunt = list()
var/taunt_chance = 0
@@ -33,7 +35,7 @@
var/check_friendly_fire = FALSE // Should the ranged mob check for friendlies when shooting
var/retreat_distance = null //If our mob runs from players when they're too close, set in tile distance. By default, mobs do not retreat.
var/minimum_distance = 1 //Minimum approach distance, so ranged mobs chase targets down, but still keep their distance set in tiles to the target, set higher to make mobs keep distance
-
+ var/shoot_point_blank = FALSE // If this mob will still shoot even in melee range.
//These vars are related to how mobs locate and target
var/robust_searching = 0 //By default, mobs have a simple searching method, set this to 1 for the more scrutinous searching (stat_attack, stat_exclusive, etc), should be disabled on most mobs
@@ -240,12 +242,12 @@
if(istype(the_target, /obj/machinery/porta_turret))
var/obj/machinery/porta_turret/P = the_target
- if(P.in_faction(src)) //Don't attack if the turret is in the same faction
- return FALSE
- if(P.has_cover &&!P.raised) //Don't attack invincible turrets
+ if(!(P.turret_flags & TURRET_FLAG_SHOOT_FAUNA)) //Don't attack turrets that won't shoot us
return FALSE
if(P.machine_stat & BROKEN) //Or turrets that are already broken
return FALSE
+ if(faction_check(P.faction, faction)) //Or turrets in the same faction
+ return FALSE
return TRUE
if(istype(the_target, /obj/machinery/drill))
@@ -315,7 +317,10 @@
Goto(target,move_to_delay,minimum_distance)
if(target)
if(isturf(target_from.loc) && target.Adjacent(target_from)) //If they're next to us, attack
- MeleeAction()
+ if(ranged && shoot_point_blank && ranged_cooldown <= world.time)
+ OpenFire(target)
+ else
+ MeleeAction()
else
if(rapid_melee > 1 && target_distance <= melee_queue_distance)
MeleeAction(FALSE)
@@ -366,9 +371,10 @@
/mob/living/simple_animal/hostile/proc/Aggro()
vision_range = aggro_vision_range
- if(target && emote_taunt.len && prob(taunt_chance))
- manual_emote("[pick(emote_taunt)] at [target].")
- taunt_chance = max(taunt_chance-7,2)
+ if(target)
+ if(emote_taunt.len && prob(taunt_chance))
+ manual_emote("[pick(emote_taunt)] at [target].")
+ taunt_chance = max(taunt_chance-7,2)
/mob/living/simple_animal/hostile/proc/LoseAggro()
@@ -698,3 +704,27 @@
if (length(initial(src.faction)) > 0)
src.faction += initial(src.faction)
src.faction += tag
+
+/mob/living/simple_animal/hostile/proc/fire_line(source, list/turfs, fire_source = "fire breath", ignite_turfs = FALSE, power = 4, flame_color = "red")
+ var/list/hit_list = list()
+ for(var/turf/T in turfs)
+ if(istype(T, /turf/closed))
+ break
+ new /obj/effect/hotspot(T)
+ T.hotspot_expose(700,50,1)
+ if(ignite_turfs)
+ T.IgniteTurf(power,flame_color)
+ for(var/mob/living/L in T.contents)
+ if((L in hit_list) || L == source)
+ continue
+ hit_list += L
+ L.adjustFireLoss(20)
+ to_chat(L, "You're hit by [source]'s [fire_source]!")
+
+ // deals damage to mechs
+ for(var/obj/mecha/M in T.contents)
+ if(M in hit_list)
+ continue
+ hit_list += M
+ M.take_damage(45, BRUTE, "melee", 1)
+ sleep(1.5)
diff --git a/code/modules/mob/living/simple_animal/hostile/human/cat_butcher.dm b/code/modules/mob/living/simple_animal/hostile/human/cat_butcher.dm
deleted file mode 100644
index 0f14f615e5b..00000000000
--- a/code/modules/mob/living/simple_animal/hostile/human/cat_butcher.dm
+++ /dev/null
@@ -1,86 +0,0 @@
-/mob/living/simple_animal/hostile/human/cat_butcherer
- name = "Cat Surgeon"
- desc = "Feline genemod physiological modification surgery is outlawed in Nanotrasen-controlled sectors. This doctor doesn't seem to care, and thus, is wanted for several warcrimes."
- icon_state = "cat_butcher"
- icon_living = "cat_butcher"
- projectiletype = /obj/projectile/bullet/dart/tranq
- projectilesound = 'sound/items/syringeproj.ogg'
- ranged = TRUE
- ranged_message = "fires the syringe gun at"
- ranged_cooldown_time = 30
- speak_chance = 0
- stat_attack = HARD_CRIT
- melee_damage_lower = 15
- melee_damage_upper = 15
- attack_verb_continuous = "slashes at"
- attack_verb_simple = "slash at"
- attack_sound = 'sound/weapons/circsawhit.ogg'
- loot = list(/obj/effect/mob_spawn/human/corpse/cat_butcher, /obj/item/circular_saw, /obj/item/gun/syringe)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
- faction = list("hostile")
- check_friendly_fire = TRUE
- var/impatience = 0
-
-/mob/living/simple_animal/hostile/human/cat_butcherer/CanAttack(atom/the_target)
- if(iscarbon(target))
- var/mob/living/carbon/human/C = target
- if(C.getorgan(/obj/item/organ/ears/cat) && C.getorgan(/obj/item/organ/tail/cat) && C.has_trauma_type(/datum/brain_trauma/severe/pacifism))//he wont attack his creations
- if(C.stat >= UNCONSCIOUS && (!HAS_TRAIT(C, TRAIT_NOMETABOLISM) || !istype(C.dna.species, /datum/species/ipc)))//unless they need healing
- return ..()
- else
- return FALSE
- return ..()
-
-/mob/living/simple_animal/hostile/human/cat_butcherer/AttackingTarget()
- if(iscarbon(target))
- var/mob/living/carbon/human/L = target
- if(!L.getorgan(/obj/item/organ/ears/cat) && L.stat >= UNCONSCIOUS) //target doesnt have cat ears
- if(L.getorgan(/obj/item/organ/ears)) //slice off the old ears
- var/obj/item/organ/ears/ears = L.getorgan(/obj/item/organ/ears)
- visible_message("[src] slices off [L]'s ears!", "You slice [L]'s ears off.")
- ears.Remove(L)
- ears.forceMove(get_turf(L))
- else //implant new ears
- visible_message("[src] attaches a pair of cat ears to [L]!", "You attach a pair of cat ears to [L].")
- var/obj/item/organ/ears/cat/newears = new
- newears.Insert(L, drop_if_replaced = FALSE)
- return
- else if(!L.getorgan(/obj/item/organ/tail/cat) && L.stat >= UNCONSCIOUS)
- if(L.getorgan(/obj/item/organ/tail)) //cut off the tail if they have one already
- var/obj/item/organ/tail/tail = L.getorgan(/obj/item/organ/tail)
- visible_message("[src] severs [L]'s tail in one swift swipe!", "You sever [L]'s tail in one swift swipe.")
- tail.Remove(L)
- tail.forceMove(get_turf(L))
- else //put a cat tail on
- visible_message("[src] attaches a cat tail to [L]!", "You attach a tail to [L].")
- var/obj/item/organ/tail/cat/newtail = new
- newtail.Insert(L, drop_if_replaced = FALSE)
- return
- else if(!L.has_trauma_type(/datum/brain_trauma/severe/pacifism) && L.stat >= UNCONSCIOUS) //still does damage
- visible_message("[src] drills a hole in [L]'s skull!", "You pacify [L]. Another successful creation.")
- L.gain_trauma(/datum/brain_trauma/severe/pacifism, TRAUMA_RESILIENCE_SURGERY)
- say("I'm a genius!!")
- L.health += 20 //he heals a bit whenever he finishes
- else if(L.stat >= UNCONSCIOUS) //quickly heal them up and move on to our next target!
- visible_message("[src] injects [L] with an unknown medicine!", "You inject [L] with medicine.")
- L.SetSleeping(0, FALSE)
- L.SetUnconscious(0, FALSE)
- L.adjustOxyLoss(-50)// do CPR first
- if(L.blood_volume <= 500) //bandage them up and give em some blood if they're bleeding
- L.blood_volume += 30
- L.heal_bleeding(10)
- if(L.getBruteLoss() >= 50)// first, did we beat them into crit? if so, heal that
- var/healing = min(L.getBruteLoss(), 120)
- L.adjustBruteLoss(-healing)
- L.heal_bleeding(10)
- return
- else if(L.getFireLoss() >= 50) // are they still down from other damage? fix it, but not as fast as the burns
- var/healing = min(L.getFireLoss(), 50)
- L.adjustFireLoss(-healing)
- impatience += 50
- if(prob(impatience))
- FindTarget()//so we don't focus on some unconscious dude when we could get our eyes on the prize
- impatience = 0
- say("Bah!!")
- return
- return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
index 4d38e1c5f87..3257e6440b9 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
@@ -1,32 +1,99 @@
/mob/living/simple_animal/hostile/human/frontier
- name = "Frontiersman"
- desc = "A frontiersman! A terrorist that would probably kill everyone without mercy."
+ name = "Frontiersman Shank"
+ desc = "A member of the brutal Frontiersman terrorist fleet! This one clutches a wicked-looking knife in nimble fingers, eager to relieve you of your innards."
icon_state = "frontiersmanmelee"
+ icon = 'icons/mob/simple_frontiersman.dmi'
icon_living = "frontiersmanmelee"
icon_dead = "frontiersmanmelee_dead"
speak_chance = 0
melee_damage_lower = 15
melee_damage_upper = 15
loot = list(/obj/effect/mob_spawn/human/corpse/frontier,
- /obj/item/kitchen/knife)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ /obj/item/melee/knife/survival)
faction = list(FACTION_ANTAG_FRONTIERSMEN)
+ footstep_type = FOOTSTEP_MOB_SHOE
+
+/mob/living/simple_animal/hostile/human/frontier/internals
+ icon_state = "frontiersmanmelee_mask"
+ icon_living = "frontiersmanmelee_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier,
+ /obj/item/clothing/mask/breath,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+ atmos_requirements = IMMUNE_ATMOS_REQS
+ minbodytemp = 0
+
/mob/living/simple_animal/hostile/human/frontier/ranged
+ name = "Frontiersman Quickdraw"
+ desc = "A member of the brutal Frontiersman terrorist fleet! This one thumbs a slender revolver, stained chrome and a malicious smile glinting in the light."
icon_state = "frontiersmanranged"
icon_living = "frontiersmanranged"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
- /obj/item/gun/ballistic/revolver/syndicate)
+ /obj/item/gun/ballistic/revolver/shadow)
ranged = 1
retreat_distance = 5
minimum_distance = 5
- projectilesound = 'sound/weapons/gun/revolver/shot.ogg'
- casingtype = /obj/item/ammo_casing/a357
+ projectilesound = 'sound/weapons/gun/revolver/cattleman.ogg'
+ casingtype = /obj/item/ammo_casing/a44roum
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/internals
+ icon_state = "frontiersmanranged_mask"
+ icon_living = "frontiersmanranged_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
+ /obj/item/gun/ballistic/revolver/shadow,
+ /obj/item/clothing/mask/breath,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+ atmos_requirements = IMMUNE_ATMOS_REQS
+ minbodytemp = 0
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/internals/neutered
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
+ /obj/item/clothing/mask/breath,
+ /obj/item/tank/internals/emergency_oxygen/engi)
/mob/living/simple_animal/hostile/human/frontier/ranged/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)
+/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon
+ name = "Frontiersman Sawbones"
+ desc = "A member of the brutal Frontiersman terrorist fleet! They appear to be a \"doctor\" of some sort, nervously swinging about some kind of makeshift syringe launcher."
+ icon_state = "frontiersmansurgeon"
+ icon_living = "frontiersmansurgeon"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon,
+ /obj/item/melee/knife/survival,
+ /obj/item/gun/syringe)
+
+ minimum_distance = 1
+ retreat_distance = null
+ projectiletype = /obj/projectile/bullet/dart/tranq
+ projectilesound = 'sound/items/syringeproj.ogg'
+ casingtype = null
+ ranged_message = "fires the syringe gun at"
+ ranged_cooldown_time = 30
+ armor_base = /obj/item/clothing/suit/frontiersmen
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon/neuter
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon)
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon/internals
+ icon_state = "frontiersmansurgeon_mask"
+ icon_living = "frontiersmansurgeon_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon,
+ /obj/item/melee/knife/survival,
+ /obj/item/gun/syringe,
+ /obj/item/clothing/mask/breath,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon/internals/neuter
+ icon_state = "frontiersmansurgeon_mask"
+ icon_living = "frontiersmansurgeon_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon,
+ /obj/item/clothing/mask/breath,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+
/mob/living/simple_animal/hostile/human/frontier/ranged/mosin
+ name = "Frontiersman Sharpshot"
+ desc = "A member of the brutal Frontiersman terrorist fleet! This one confidently mills about with a long rifle slung over their shoulder."
icon_state = "frontiersmanrangedrifle"
icon_living = "frontiersmanrangedrifle"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
@@ -34,23 +101,86 @@
casingtype = /obj/item/ammo_casing/a8_50r
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'
+/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/internals
+ icon_state = "frontiersmanrangedrifle_mask"
+ icon_living = "frontiersmanrangedrifle_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
+ /obj/item/gun/ballistic/rifle/illestren,
+ /obj/item/clothing/mask/breath,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+ atmos_requirements = IMMUNE_ATMOS_REQS
+ minbodytemp = 0
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/internals/neutered
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
+ /obj/item/clothing/mask/breath,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+
/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper
+ name = "Frontiersman Doorkicker"
+ desc = "A member of the brutal Frontiersman terrorist fleet! Bedecked in military-grade armor, they swagger their shotgun about with a boldness uncommon even among other Frontiersmen."
icon_state = "frontiersmanrangedelite"
icon_living = "frontiersmanrangedelite"
- maxHealth = 170
- health = 170
projectilesound = 'sound/weapons/gun/shotgun/shot.ogg'
casingtype = /obj/item/ammo_casing/shotgun/buckshot
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/shotgun/brimstone)
+ armor_base = /obj/item/clothing/suit/armor/vest/frontier
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals
+ icon_state = "frontiersmanrangedelite_mask"
+ icon_living = "frontiersmanrangedelite_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
+ /obj/item/gun/ballistic/shotgun/brimstone,
+ /obj/item/clothing/mask/gas,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+ atmos_requirements = IMMUNE_ATMOS_REQS
+ minbodytemp = 0
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals/neutered
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
+ /obj/item/clothing/mask/gas,
+ /obj/item/tank/internals/emergency_oxygen/engi)
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/flame
+ name = "Frontiersman Scorcher"
+ desc = "An ashen revenant wades through a sea of flames, mummified under twenty pounds of blackened asbestos fabric. Mirrored lenses glare inscrutably as they swing their instrument of destruction towards you. You should probably run."
+ icon_state = "frontiersmanflametrooper"
+ icon_living = "frontiersmanflametrooper"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/flame,
+ /obj/item/flamethrower)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ maxbodytemp = 1000
+
+ minimum_distance = 1
+ retreat_distance = null
+ shoot_point_blank = TRUE
+ projectiletype = null
+ projectilesound = 'sound/weapons/gun/flamethrower/flamethrower1.ogg'
+ casingtype = null
+ armor_base = /obj/item/clothing/suit/armor/frontier/fireproof
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/flame/OpenFire()
+ var/turf/T = get_ranged_target_turf_direct(src, target, 4)
+ var/list/burn_turfs = getline(src, T) - get_turf(src)
+ visible_message("[src] [ranged_message] at [target.name]!")
+ playsound(src, projectilesound, 100, TRUE)
+ fire_line(src, burn_turfs, "flamethrower", TRUE, 10)
+ ranged_cooldown = world.time + ranged_cooldown_time
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/flame/neuter
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/flame)
+
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm
+ name = "Frontiersman Gunner"
+ desc = "A member of the brutal Frontiersman terrorist fleet! This one could almost be mistaken for a real soldier by their assault rifle and armor, if it weren't for their swaggering demeanor."
icon_state = "frontiersmanrangedak47"
icon_living = "frontiersmanrangedak47"
projectilesound = 'sound/weapons/gun/rifle/skm.ogg'
@@ -59,11 +189,29 @@
casingtype = /obj/item/ammo_casing/a762_40
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/automatic/assault/skm)
+ armor_base = /obj/item/clothing/suit/armor/vest/frontier
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm/internals
+ icon_state = "frontiersmanrangedak47_mask"
+ icon_living = "frontiersmanrangedak47_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
+ /obj/item/gun/ballistic/automatic/assault/skm,
+ /obj/item/clothing/mask/gas,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+ atmos_requirements = IMMUNE_ATMOS_REQS
+ minbodytemp = 0
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm/internals/neutered
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
+ /obj/item/clothing/mask/gas,
+ /obj/item/tank/internals/emergency_oxygen/engi)
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm/neutured
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle
+ name = "Frontiersman Crackshot"
+ desc = "A member of the brutal Frontiersman terrorist fleet! Compared to their allies, they stand a little straighter, laugh a little colder. Their long rifle has a regular series of scratches on the receiver."
icon_state = "frontiersmanrangedmosin"
icon_living = "frontiersmanrangedmosin"
@@ -71,40 +219,83 @@
/obj/item/gun/ballistic/rifle/illestren)
casingtype = /obj/item/ammo_casing/a8_50r
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'
+ armor_base = /obj/item/clothing/suit/armor/vest/frontier
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals
+ icon_state = "frontiersmanrangedmosin_mask"
+ icon_living = "frontiersmanrangedmosin_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
+ /obj/item/gun/ballistic/rifle/illestren,
+ /obj/item/clothing/mask/gas,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+ atmos_requirements = IMMUNE_ATMOS_REQS
+ minbodytemp = 0
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals/neutered
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
+ /obj/item/clothing/mask/gas,
+ /obj/item/tank/internals/emergency_oxygen/engi)
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy
+ name = "Frontiersman Sweeper"
+ desc = "Unseen behind the mirror-visor of this heavily plated hardsuit, flinty eyes dream of cruelty. A mass of chrome and photonics swings your way, the soft whine of its motor a harbinger of iridescent death."
icon_state = "frontiersmanrangedminigun"
icon_living = "frontiersmanrangedminigun"
projectilesound = 'sound/weapons/laser4.ogg'
- maxHealth = 260
- health = 260
rapid = 6
rapid_fire_delay = 1.5
casingtype = null
projectiletype = /obj/projectile/beam/weak/penetrator
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy)
+ armor_base = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals
+ icon_state = "frontiersmanrangedminigun_mask"
+ icon_living = "frontiersmanrangedminigun_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy,
+ /obj/item/clothing/mask/gas,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+ atmos_requirements = IMMUNE_ATMOS_REQS
+ minbodytemp = 0
+
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals/neutered
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless,
+ /obj/item/clothing/mask/gas,
+ /obj/item/tank/internals/emergency_oxygen/engi)
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless)
/mob/living/simple_animal/hostile/human/frontier/ranged/officer
- name = "Frontiersman Officer"
+ name = "Frontiersman Boss"
+ desc = "This Frontiersman moves with what could almost pass for discipline among the infamously ragtag terrorists. They leer at their underlings, one hand resting consciously over the machine pistol at their hip."
icon_state = "frontiersmanofficer"
icon_living = "frontiersmanofficer"
- maxHealth = 65
- health = 65
- rapid = 3
+ rapid = 4
+ projectilesound = 'sound/weapons/gun/pistol/mauler.ogg'
casingtype = /obj/item/ammo_casing/c9mm
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer,
- /obj/item/gun/ballistic/automatic/pistol/APS)
+ /obj/item/gun/ballistic/automatic/pistol/mauler)
+ armor_base = /obj/item/clothing/suit/armor/frontier
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/officer/internals
+ icon_state = "frontiersmanofficer_mask"
+ icon_living = "frontiersmanofficer_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer,
+ /obj/item/gun/ballistic/automatic/pistol/mauler,
+ /obj/item/clothing/mask/gas,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+ atmos_requirements = IMMUNE_ATMOS_REQS
+ minbodytemp = 0
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/officer/internals/neutered
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer,
+ /obj/item/clothing/mask/gas,
+ /obj/item/tank/internals/emergency_oxygen/engi)
/mob/living/simple_animal/hostile/human/frontier/ranged/officer/neutured
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer)
-
-/mob/living/simple_animal/hostile/human/frontier/ranged/officer/Aggro()
- ..()
- summon_backup(15)
- say(pick("Help!!", "They're right here!!", "Don't let me die!!"))
diff --git a/code/modules/mob/living/simple_animal/hostile/human/human.dm b/code/modules/mob/living/simple_animal/hostile/human/human.dm
index 633bd40090e..1efe7c02b26 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/human.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/human.dm
@@ -30,7 +30,6 @@
loot = list(/obj/effect/mob_spawn/human/corpse/damaged)
del_on_death = TRUE
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
minbodytemp = 180
status_flags = CANPUSH
@@ -39,3 +38,26 @@
footstep_type = FOOTSTEP_MOB_SHOE
faction = list("hermit")
+
+ ///Steals the armor datum from this type of armor
+ var/obj/item/clothing/armor_base
+
+/mob/living/simple_animal/hostile/human/Initialize()
+ . = ..()
+ if(ispath(armor_base, /obj/item/clothing))
+ //sigh. if only we could get the initial() value of list vars
+ var/obj/item/clothing/instance = new armor_base()
+ armor = instance.armor
+ qdel(instance)
+
+/mob/living/simple_animal/hostile/human/vv_edit_var(var_name, var_value)
+ switch(var_name)
+ if (NAMEOF(src, armor_base))
+ if(ispath(var_value, /obj/item/clothing))
+ var/obj/item/clothing/temp = new var_value
+ armor = temp.armor
+ qdel(temp)
+ datum_flags |= DF_VAR_EDITED
+ return TRUE
+ return FALSE
+ . = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm
index 6c1676d202a..5898a9c75ea 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm
@@ -7,10 +7,10 @@
stat_attack = HARD_CRIT
melee_damage_upper = 15
loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
faction = list(ROLE_DEATHSQUAD)
check_friendly_fire = TRUE
dodging = TRUE
+ armor_base = /obj/item/clothing/suit/armor/vest
/mob/living/simple_animal/hostile/human/nanotrasen/screaming
icon_state = "nanotrasen"
@@ -62,8 +62,6 @@
icon = 'icons/mob/simple_human.dmi'
icon_state = "nanotrasen_ert"
icon_living = "nanotrasen_ert"
- maxHealth = 150
- health = 150
melee_damage_lower = 13
melee_damage_upper = 18
ranged = TRUE
@@ -72,9 +70,10 @@
rapid_melee = 3
retreat_distance = 0
minimum_distance = 1
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
projectiletype = /obj/projectile/beam/laser
projectilesound = 'sound/weapons/laser.ogg'
loot = list(/obj/effect/gibspawner/human)
faction = list(ROLE_DEATHSQUAD)
+ armor_base = /obj/item/clothing/suit/space/hardsuit/ert/sec
diff --git a/code/modules/mob/living/simple_animal/hostile/human/pirate.dm b/code/modules/mob/living/simple_animal/hostile/human/pirate.dm
index df10cfa6a2b..fd33a21fe03 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/pirate.dm
@@ -5,10 +5,9 @@
icon_living = "piratemelee"
icon_dead = "pirate_dead"
speak_chance = 0
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
speak_emote = list("yarrs")
loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
- /obj/item/melee/transforming/energy/sword/saber/pirate)
+ /obj/item/melee/energy/sword/saber/pirate)
faction = list("pirate")
/mob/living/simple_animal/hostile/human/pirate/melee
@@ -31,9 +30,10 @@
icon_state = "piratespace"
icon_living = "piratespace"
icon_dead = "piratespace_dead"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
speed = 1
+ armor_base = /obj/item/clothing/suit/space
/mob/living/simple_animal/hostile/human/pirate/melee/space/Initialize()
. = ..()
@@ -71,9 +71,10 @@
icon_state = "piratespaceranged"
icon_living = "piratespaceranged"
icon_dead = "piratespaceranged_dead"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
speed = 1
+ armor_base = /obj/item/clothing/suit/space
/mob/living/simple_animal/hostile/human/pirate/ranged/space/Initialize()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
index b251dda91e4..4eac3878efa 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
@@ -19,7 +19,7 @@
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/hallucinations/growl1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
unsuitable_atmos_damage = 10
stat_attack = HARD_CRIT
faction = list("skeleton")
@@ -48,8 +48,7 @@
deathmessage = "collapses into a pile of bones, its gear clanging as it hits the ground!"
loot = list(/obj/effect/decal/remains/human,
/obj/item/clothing/suit/armor/witchhunter,
- /obj/item/clothing/head/witchunter,
- /obj/item/claymore/weak{name = "holy sword"})
+ /obj/item/melee/sword/claymore{name = "holy sword"})
/mob/living/simple_animal/hostile/human/skeleton/ice
name = "ice skeleton"
diff --git a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
index f7abea96b22..cb90ebc348a 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
@@ -7,17 +7,17 @@
loot = list(
/obj/effect/mob_spawn/human/corpse/damaged/whitesands
)
+ armor_base = /obj/item/clothing/suit/hooded/survivor
+
+ speak_emote = list("breathes heavily.", "growls.", "sharply inhales.")
+ emote_hear = list("murmers.","grumbles.","whimpers.")
/mob/living/simple_animal/hostile/human/hermit/survivor/death(gibbed)
move_force = MOVE_FORCE_DEFAULT
move_resist = MOVE_RESIST_DEFAULT
pull_force = PULL_FORCE_DEFAULT
..()
- /*
- if(prob(15))
- new /obj/item/mob_trophy/shiny(loc)
- visible_message("You notice a glimmering nugget of shiny metal.")
- */
+
/mob/living/simple_animal/hostile/human/hermit/survivor
name = "Hermit Wanderer"
@@ -39,7 +39,7 @@
icon_state = "survivor_hunter"
icon_living = "survivor_hunter"
projectiletype = null
- casingtype = /obj/item/ammo_casing/aac_300blk/recycled
+ casingtype = /obj/item/ammo_casing/a762_40
projectilesound = 'sound/weapons/gun/rifle/shot.ogg'
ranged = 1
rapid_fire_delay = 6
@@ -60,13 +60,28 @@
icon_living = "survivor_gunslinger"
projectilesound = 'sound/weapons/gun/smg/shot.ogg'
speed = 10
- rapid = 4
+ rapid = 3
rapid_fire_delay = 3
- casingtype = /obj/item/ammo_casing/a545_39/recycled
+ casingtype = /obj/item/ammo_casing/c46x30mm/recycled
loot = list(
/obj/effect/mob_spawn/human/corpse/damaged/whitesands/gunslinger,
)
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11 // Intended for the e11_manufactory ruin.
+ name = "Hermit Trooper"
+ desc = "Quality weapons are hard to get by in the sandworlds, which forces many survivors to improvise with that they have. This one is hoping that an E-11 of all things will save his life."
+ icon_state = "survivor_e11"
+ icon_living = "survivor_e11"
+ projectilesound = 'sound/weapons/gun/laser/e-fire.ogg'
+ speed = 10
+ faction = list("eoehoma")
+ rapid_fire_delay = 1
+ casingtype = null
+ projectiletype = /obj/projectile/beam/laser/eoehoma/hermit
+ loot = list(
+ /obj/effect/mob_spawn/human/corpse/damaged/whitesands/e11,
+ )
+
//survivor corpses
/obj/effect/mob_spawn/human/corpse/damaged/whitesands
@@ -79,7 +94,7 @@
var/survivor_type //room for alternatives inside the fuckoff grade init.
/obj/effect/mob_spawn/human/corpse/damaged/whitesands/Initialize() //everything here should equal out to 100 for the sake of my sanity.
- mob_species = pickweight(list(
+ mob_species = pick_weight(list(
/datum/species/human = 50,
/datum/species/lizard = 20,
/datum/species/ipc = 10,
@@ -91,7 +106,7 @@
//to-do: learn how to make mobsprites for other survivors
//gloves are a tossup
- gloves = pickweight(list(
+ gloves = pick_weight(list(
/obj/item/clothing/gloves/color/black = 60,
/obj/item/clothing/gloves/explorer = 30,
/obj/item/clothing/gloves/explorer/old = 10
@@ -99,7 +114,7 @@
)
//bags are semi-random.
- back = pickweight(list(
+ back = pick_weight(list(
/obj/item/storage/backpack = 20,
/obj/item/storage/backpack/explorer = 20,
/obj/item/storage/backpack/satchel = 20,
@@ -111,12 +126,12 @@
//as are bag contents
backpack_contents = list()
if(prob(70))
- backpack_contents += pickweight(list( //these could stand to be expanded, right now they're just mildly modified miner ones, and I don't know how to plus that up.
+ backpack_contents += pick_weight(list( //these could stand to be expanded, right now they're just mildly modified miner ones, and I don't know how to plus that up.
/obj/item/soap = 10,
/obj/item/stack/marker_beacon/ten = 15,
/obj/item/mining_scanner = 5,
/obj/item/extinguisher/mini = 10,
- /obj/item/kitchen/knife/combat = 5,
+ /obj/item/melee/knife/combat = 5,
/obj/item/flashlight/seclite = 10,
/obj/item/stack/sheet/sinew = 10,
/obj/item/stack/sheet/bone = 5,
@@ -127,33 +142,33 @@
)
)
if(prob(70))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/stack/sheet/animalhide/goliath_hide = 20,
/obj/item/stack/marker_beacon/ten = 10,
/obj/item/mining_scanner = 20,
/obj/item/extinguisher/mini = 10,
- /obj/item/kitchen/knife/combat/survival = 10,
+ /obj/item/melee/knife/survival = 10,
/obj/item/flashlight/seclite = 10,
/obj/item/stack/sheet/sinew = 10,
/obj/item/stack/sheet/bone = 10
)
)
if(prob(70))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/stack/sheet/animalhide/goliath_hide = 5,
/obj/item/stack/marker_beacon/ten = 5,
/obj/item/mining_scanner = 5,
/obj/item/extinguisher/mini = 10,
- /obj/item/kitchen/knife/combat/survival = 12,
+ /obj/item/melee/knife/survival = 12,
/obj/item/flashlight/seclite = 10,
/obj/item/stack/sheet/sinew = 5,
/obj/item/stack/sheet/bone = 5,
- /obj/item/kitchen/knife/combat = 3,
- /obj/item/reagent_containers/food/snacks/rationpack = 30
+ /obj/item/melee/knife/combat = 3,
+ /obj/item/storage/ration/shredded_beef = 30
)
)
if (prob(15)) //mayhaps a medkit
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/storage/firstaid/regular = 50,
/obj/item/storage/firstaid/brute = 15,
/obj/item/storage/firstaid/medical = 15,
@@ -166,7 +181,7 @@
backpack_contents += /obj/item/reagent_containers/hypospray/medipen/survival
//masks
- mask = pickweight(list(
+ mask = pick_weight(list(
/obj/item/clothing/mask/gas = 40,
/obj/item/clothing/mask/gas/explorer = 20,
/obj/item/clothing/mask/gas/explorer/old = 20,
@@ -176,7 +191,7 @@
//the eyes are the window into the soul.
if(prob(70))
- glasses = pickweight(list(
+ glasses = pick_weight(list(
/obj/item/clothing/glasses/heat = 20,
/obj/item/clothing/glasses/cold = 20,
/obj/item/clothing/glasses/meson = 40,
@@ -188,7 +203,7 @@
if(prob(1)) //oh my god they can't hear the sandstorm coming they've got airpods in
ears = /obj/item/instrument/piano_synth/headphones/spacepods
else
- ears = pickweight(list(
+ ears = pick_weight(list(
/obj/item/radio/headset = 50,
/obj/item/radio/headset/alt = 50
)
@@ -197,17 +212,16 @@
switch(survivor_type)
if("survivor")
//uniforms are random to show varied backgrounds, but similar goal
- uniform = pickweight(list(
+ uniform = pick_weight(list(
/obj/item/clothing/under/color/random = 65,
/obj/item/clothing/under/rank/cargo/miner/lavaland = 10,
/obj/item/clothing/under/rank/prisoner = 10,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 5,
- /obj/item/clothing/under/color/khaki/buster = 5,
/obj/item/clothing/under/rank/cargo/miner = 5
)
)
//storage is semi-randomized, giving some variety
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/storage/belt/fannypack = 40,
/obj/item/storage/belt/mining = 20,
/obj/item/storage/belt/mining/alt = 15,
@@ -223,7 +237,7 @@
r_pocket = /obj/item/spacecash/bundle/smallrand
if("hunter")
- uniform = pickweight(list(
+ uniform = pick_weight(list(
/obj/item/clothing/under/color/random = 50,
/obj/item/clothing/under/rank/cargo/miner/lavaland = 25,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 15,
@@ -231,7 +245,7 @@
/obj/item/clothing/under/utility = 5
)
)
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/storage/belt/mining = 30,
/obj/item/storage/belt/fannypack = 20,
/obj/item/storage/belt/mining/alt = 15,
@@ -244,14 +258,14 @@
if(prob(20))
l_pocket = /obj/item/reagent_containers/food/snacks/meat/steak/goliath
else if(prob(60))
- l_pocket = /obj/item/ammo_box/aac_300blk_stripper
+ l_pocket = /obj/item/ammo_box/a762_stripper
if(prob(20))
new /obj/item/gun/ballistic/rifle/polymer(loc)
else
- visible_message(span_warning("The hunter's weapon shatters as they impact the ground!"))
+ visible_message(span_warning("The hermit's weapon shatters as they impact the ground!"))
if("gunslinger")
- uniform = pickweight(list(
+ uniform = pick_weight(list(
/obj/item/clothing/under/rank/cargo/miner/lavaland = 35,
/obj/item/clothing/under/color/random = 25,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 15,
@@ -260,7 +274,7 @@
/obj/item/clothing/under/syndicate/combat = 5
)
)
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/storage/belt/mining = 30,
/obj/item/storage/belt/bandolier = 30,
/obj/item/storage/belt/military = 20,
@@ -272,12 +286,31 @@
if(prob(30))
shoes = /obj/item/clothing/shoes/combat //sometimes there are nicer shoes
if(prob(50))
- l_pocket = /obj/item/ammo_box/magazine/skm_545_39
+ l_pocket = /obj/item/ammo_box/magazine/skm_46_30/recycled
if(prob(20))
new /obj/item/gun/ballistic/automatic/smg/skm_carbine(loc)
else
- visible_message(span_warning("The gunslinger's weapon shatters as they impact the ground!"))
+ visible_message(span_warning("The hermit's weapon shatters as they impact the ground!"))
+ if("e11")
+ uniform = pick_weight(list(
+ /obj/item/clothing/under/rank/cargo/miner = 65,
+ /obj/item/clothing/under/color/random = 25,
+ /obj/item/clothing/under/rank/cargo/miner/lavaland/old = 10,
+ )
+ )
+ belt = pick_weight(list(
+ /obj/item/storage/belt/utility = 25,
+ /obj/item/storage/belt/mining = 15,
+ /obj/item/storage/belt/fannypack = 15,
+ /obj/item/storage/belt/mining/alt = 5,
+ )
+ )
+ shoes = /obj/item/clothing/shoes/workboots
+ if(prob(50)) // Hilarious, ain't it?
+ new /obj/item/gun/energy/e_gun/e11 (loc)
+ else
+ visible_message(span_warning("The trooper's weapon shatters as they impact the ground!"))
. = ..()
@@ -290,6 +323,9 @@
/obj/effect/mob_spawn/human/corpse/damaged/whitesands/gunslinger
survivor_type = "gunslinger"
+/obj/effect/mob_spawn/human/corpse/damaged/whitesands/e11
+ survivor_type = "e11"
+
//hold overs for any admin who may want to spawn their own survivor realmobs
/datum/outfit/whitesands
diff --git a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm
index c18d131168c..669871fd9c1 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm
@@ -13,7 +13,7 @@
icon_living = "syndicate"
speak_chance = 0
stat_attack = HARD_CRIT
- loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/clothing/neck/dogtag/ramzi)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
maxbodytemp = 400
unsuitable_atmos_damage = 15
@@ -21,19 +21,21 @@
check_friendly_fire = TRUE
dodging = TRUE
rapid_melee = 2
+ armor_base = /obj/item/clothing/suit/armor/vest
///////////////Melee////////////
/mob/living/simple_animal/hostile/human/syndicate/space
+ name = "Ramzi Clique Initiate"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Despite their armored hardsuit, this one is unarmed."
icon_state = "syndicate_space"
icon_living = "syndicate_space"
- name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
speed = 1
+ loot = list(/obj/item/clothing/neck/dogtag/ramzi)
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/space/Initialize()
. = ..()
@@ -41,18 +43,20 @@
set_light(4)
/mob/living/simple_animal/hostile/human/syndicate/space/stormtrooper
+ name = "Ramzi Clique Battlemaster"
+ desc = "A silhouette of obsidian glass stalks into view, empty hands clutching into armored fists. They are unarmed, and this is nearly a fair fight."
icon_state = "syndicate_stormtrooper"
icon_living = "syndicate_stormtrooper"
- name = "Ramzi Clique Assault Trooper"
- maxHealth = 250
- health = 250
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
/mob/living/simple_animal/hostile/human/syndicate/melee //dude with a knife and no shields
+ name = "Ramzi Clique Close Combatant"
+ desc = "A deserter from the Gorlex Marauders turned pirate. They hold a clean and razor-sharp knife with obvious training."
melee_damage_lower = 15
melee_damage_upper = 15
icon_state = "syndicate_knife"
icon_living = "syndicate_knife"
- loot = list(/obj/effect/gibspawner/human)
+ loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/neck/dogtag/ramzi)
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
@@ -60,16 +64,15 @@
var/projectile_deflect_chance = 0
/mob/living/simple_animal/hostile/human/syndicate/melee/space
+ name = "Ramzi Clique Infiltrator"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Rusted hardsuit gauntlets hold a shard of polished steel in an veteran's guard."
icon_state = "syndicate_space_knife"
icon_living = "syndicate_space_knife"
- name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1000
speed = 1
- projectile_deflect_chance = 50
+ projectile_deflect_chance = 0
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/melee/space/Initialize()
. = ..()
@@ -77,14 +80,19 @@
set_light(4)
/mob/living/simple_animal/hostile/human/syndicate/melee/space/stormtrooper
+ name = "Ramzi Clique Assassin"
+ desc = "Wicked knifepoint tracks your every impulse. Clean, black armor plate glides across itself, bereft of all sound or resistance."
icon_state = "syndicate_stormtrooper_knife"
icon_living = "syndicate_stormtrooper_knife"
name = "Ramzi Clique Stormtrooper"
maxHealth = 250
health = 250
- projectile_deflect_chance = 50
+ projectile_deflect_chance = 0
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
/mob/living/simple_animal/hostile/human/syndicate/melee/sword
+ name = "Ramzi Clique Duelist"
+ desc = "A deserter from the Gorlex Marauders turned pirate. They hold a glaring energy sword at half-guard."
melee_damage_lower = 30
melee_damage_upper = 30
icon_state = "syndicate_sword"
@@ -96,7 +104,7 @@
light_color = COLOR_SOFT_RED
status_flags = 0
var/obj/effect/light_emitter/red_energy_sword/sord
- projectile_deflect_chance = 50
+ projectile_deflect_chance = 25
/mob/living/simple_animal/hostile/human/syndicate/melee/sword/Initialize()
. = ..()
@@ -113,16 +121,16 @@
return ..()
/mob/living/simple_animal/hostile/human/syndicate/melee/sword/space
+ name = "Ramzi Clique Duelist"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Their decayed hardsuit still obeys as they hold their energy sword in counterpoint to your approach."
icon_state = "syndicate_space_sword"
icon_living = "syndicate_space_sword"
- name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
speed = 1
- projectile_deflect_chance = 50
+ projectile_deflect_chance = 25
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/melee/sword/space/Initialize()
. = ..()
@@ -135,16 +143,18 @@
return ..()
/mob/living/simple_animal/hostile/human/syndicate/melee/sword/space/stormtrooper
+ name = "Ramzi Clique Blademaster"
+ desc = "Carmine bladelight glares furiously off the contours of a sleek, black armored suit. Their body betrays precious little as they glide in perfect conservation of motion from one stance to the next."
icon_state = "syndicate_stormtrooper_sword"
icon_living = "syndicate_stormtrooper_sword"
- name = "Ramzi Clique Stormtrooper"
- maxHealth = 250
- health = 250
projectile_deflect_chance = 50
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
///////////////Guns////////////
/mob/living/simple_animal/hostile/human/syndicate/ranged
+ name = "Ramzi Clique Operative"
+ desc = "A deserter from the Gorlex Marauders turned pirate. They warily glance around, a compact sidearm held at the ready."
ranged = 1
retreat_distance = 5
minimum_distance = 5
@@ -152,24 +162,24 @@
icon_living = "syndicate_pistol"
casingtype = /obj/item/ammo_casing/c10mm
projectilesound = 'sound/weapons/gun/pistol/shot.ogg'
- loot = list(/obj/effect/gibspawner/human)
+ loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/neck/dogtag/ramzi)
dodging = FALSE
rapid_melee = 1
/mob/living/simple_animal/hostile/human/syndicate/ranged/infiltrator //shuttle loan event
projectilesound = 'sound/weapons/gun/smg/shot_suppressed.ogg'
- loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/clothing/neck/dogtag/ramzi)
/mob/living/simple_animal/hostile/human/syndicate/ranged/space
+ name = "Ramzi Clique Operative"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Rusty gauntlets clutch a pocket pistol, the added bulk of their wrappings giving it a rather undersized appearance."
icon_state = "syndicate_space_pistol"
icon_living = "syndicate_space_pistol"
- name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
speed = 1
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/ranged/space/Initialize()
. = ..()
@@ -177,13 +187,15 @@
set_light(4)
/mob/living/simple_animal/hostile/human/syndicate/ranged/space/stormtrooper
+ name = "Ramzi Clique Pistolmaster" //I can't think of something better, sue me
+ desc = "Obsidian armor cradles a small handgun with sculptural grace. Its snub muzzle follows you before you even think to move."
icon_state = "syndicate_stormtrooper_pistol"
icon_living = "syndicate_stormtrooper_pistol"
- name = "Ramzi Clique Stormtrooper"
- maxHealth = 250
- health = 250
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg
+ name = "Ramzi Clique Commando"
+ desc = "A deserter from the Gorlex Marauders turned pirate. They scan the room with their submachinegun held at eye level, sweeping every corner."
rapid = 2
icon_state = "syndicate_smg"
icon_living = "syndicate_smg"
@@ -195,15 +207,15 @@
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space
+ name = "Ramzi Clique Commando"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Green hardsuit optics glint as they sweep their submachinegun across the room, scanning for threats."
icon_state = "syndicate_space_smg"
icon_living = "syndicate_space_smg"
- name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
speed = 1
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space/Initialize()
. = ..()
@@ -211,13 +223,15 @@
set_light(4)
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space/stormtrooper
+ name = "Ramzi Clique Shock Trooper"
+ desc = "Night-black armor traces the silhouette of a soldier equaled by precious few. Their Cobra SMG tracks you perfectly, a staccato bark of .45 already in its throat."
icon_state = "syndicate_stormtrooper_smg"
icon_living = "syndicate_stormtrooper_smg"
- name = "Ramzi Clique Stormtrooper"
- maxHealth = 250
- health = 250
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun
+ name = "Ramzi Clique Breacher"
+ desc = "A deserter from the Gorlex Marauders turned pirate. They move low and quickly, heavy combat shotgun at the ready."
rapid = 2
rapid_fire_delay = 6
minimum_distance = 3
@@ -226,15 +240,16 @@
casingtype = /obj/item/ammo_casing/shotgun/buckshot //buckshot fired in a two-round burst. This will two-tap unarmored players.
/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space
+ name = "Ramzi Clique Breacher"
+ desc = "A deserter from the Gorlex Marauders turned pirate. The unmistakeable bulk of a Bulldog shotgun graces the wrapped, patched hands of their aging hardsuit."
icon_state = "syndicate_space_shotgun"
icon_living = "syndicate_space_shotgun"
name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
speed = 1
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space/Initialize()
. = ..()
@@ -242,15 +257,17 @@
set_light(4)
/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space/stormtrooper
+ name = "Ramzi Clique Executioner"
+ desc = "Ink and black glass poured into the shape of an armored commando, dripping menace with every step. Their combat shotgun follows you with lethal intent, promising a blizzard of buckshot in less than a blink."
icon_state = "syndicate_stormtrooper_shotgun"
icon_living = "syndicate_stormtrooper_shotgun"
- name = "Ramzi Clique Stormtrooper"
- maxHealth = 250
- health = 250
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
///////////////Misc////////////
/mob/living/simple_animal/hostile/human/syndicate/civilian
+ name = "Ramzi Clique Technician"
+ desc = "A deserter from the Gorlex Marauders turned pirate. This one is not only unarmed, but a coward as well."
minimum_distance = 10
retreat_distance = 10
obj_damage = 0
@@ -280,7 +297,7 @@
attack_verb_simple = "cut"
attack_sound = 'sound/weapons/bladeslice.ogg'
faction = list(ROLE_SYNDICATE)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
mob_size = MOB_SIZE_TINY
@@ -288,7 +305,6 @@
limb_destroyer = 1
speak_emote = list("states")
bubble_icon = "syndibot"
- gold_core_spawnable = HOSTILE_SPAWN
del_on_death = 1
deathmessage = "is smashed into pieces!"
diff --git a/code/modules/mob/living/simple_animal/hostile/human/zombie.dm b/code/modules/mob/living/simple_animal/hostile/human/zombie.dm
index 7a12465b98b..c70b459fb7b 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/zombie.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/zombie.dm
@@ -7,8 +7,6 @@
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
speak_chance = 0
stat_attack = HARD_CRIT //braains
- maxHealth = 100
- health = 100
harm_intent_damage = 5
melee_damage_lower = 21
melee_damage_upper = 21
@@ -16,7 +14,7 @@
attack_verb_simple = "bite"
attack_sound = 'sound/hallucinations/growl1.ogg'
a_intent = INTENT_HARM
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
status_flags = CANPUSH
loot = list()
@@ -41,6 +39,7 @@
//They have claws now.
O.r_hand = null
O.l_hand = null
+ armor_base = O.suit
var/icon/P = get_flat_human_icon("zombie_[zombiejob]", J , dummy_prefs, "zombie", outfit_override = O)
icon = P
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm b/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
index 32dc8d4bc88..4a0970751d9 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/jungle
vision_range = 5
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
faction = list("jungle")
weather_immunities = list("acid")
obj_damage = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index 8b1de1c2b8a..1b1dd1d7290 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -28,4 +28,3 @@
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 150
maxbodytemp = 500
- gold_core_spawnable = HOSTILE_SPAWN
diff --git a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
index 2a60b3c52fc..e72211f6601 100644
--- a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
@@ -19,13 +19,13 @@ Featuring:
*/
/mob/living/simple_animal/hostile/human/syndicate/mecha_pilot
- name = "Syndicate Mecha Pilot"
+ name = "Syndicate Exosuit Pilot"
desc = "Death to Nanotrasen. This variant comes in MECHA DEATH flavour."
wanted_objects = list()
search_objects = 0
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
- var/spawn_mecha_type = /obj/mecha/combat/marauder/mauler/loaded
+ var/spawn_mecha_type = /obj/mecha/combat/marauder/touro/loaded
var/obj/mecha/mecha //Ref to pilot's mecha instance
var/required_mecha_charge = 7500 //If the pilot doesn't have a mecha, what charge does a potential Grand Theft Mecha need? (Defaults to half a battery)
var/mecha_charge_evacuate = 50 //Amount of charge at which the pilot tries to abandon the mecha
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 63519d29c7c..fc8cbbce6d8 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -42,7 +42,7 @@ Difficulty: Medium
pixel_x = -16
base_pixel_x = -16
//mob_trophy = /obj/item/mob_trophy/miner_eye
- loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator)
+ loot = list(/obj/item/melee/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator)
wander = FALSE
del_on_death = TRUE
blood_volume = BLOOD_VOLUME_NORMAL
@@ -50,7 +50,7 @@ Difficulty: Medium
achievement_type = /datum/award/achievement/boss/blood_miner_kill
crusher_achievement_type = /datum/award/achievement/boss/blood_miner_crusher
score_achievement_type = /datum/award/score/blood_miner_score
- var/obj/item/melee/transforming/cleaving_saw/miner/miner_saw
+ var/obj/item/melee/cleaving_saw/miner/miner_saw
var/time_until_next_transform = 0
var/dashing = FALSE
var/dash_cooldown = 15
@@ -107,11 +107,11 @@ Difficulty: Medium
shoot_ka()
transform_weapon()
-/obj/item/melee/transforming/cleaving_saw/miner //nerfed saw because it is very murdery
+/obj/item/melee/cleaving_saw/miner //nerfed saw because it is very murdery
force = 6
- force_on = 10
+ active_force = 10
-/obj/item/melee/transforming/cleaving_saw/miner/attack(mob/living/target, mob/living/carbon/human/user)
+/obj/item/melee/cleaving_saw/miner/attack(mob/living/target, mob/living/carbon/human/user)
target.add_stun_absorption("miner", 10, INFINITY)
..()
target.stun_absorption -= "miner"
@@ -248,14 +248,12 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/transform_weapon()
if(time_until_next_transform <= world.time)
miner_saw.transform_cooldown = 0
- miner_saw.transform_weapon(src, TRUE)
- if(!miner_saw.active)
- rapid_melee = 5 // 4 deci cooldown before changes, npcpool subsystem wait is 20, 20/4 = 5
- else
- rapid_melee = 3 // same thing but halved (slightly rounded up)
+ miner_saw.attack_self(src)
+ var/saw_open = HAS_TRAIT(miner_saw, TRAIT_TRANSFORM_ACTIVE)
+ rapid_melee = saw_open ? 3 : 5
transform_stop_attack = TRUE
- icon_state = "miner[miner_saw.active ? "_transformed":""]"
- icon_living = "miner[miner_saw.active ? "_transformed":""]"
+ icon_state = "miner[saw_open ? "_transformed":""]"
+ icon_living = "miner[saw_open ? "_transformed":""]"
time_until_next_transform = world.time + rand(50, 100)
/obj/effect/temp_visual/dir_setting/miner_death
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/codename_claw.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/codename_claw.dm
index 3a4506b6256..d3a50564ca7 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/codename_claw.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/codename_claw.dm
@@ -58,7 +58,7 @@
speed = 5
move_to_delay = 5
speak_emote = list("verbalizes")
- mob_trophy = /obj/item/nullrod/armblade/tentacle
+ mob_trophy = /obj/item/melee/synthetic_arm_blade
loot = list(/obj/effect/spawner/clawloot)
health = 2250
maxHealth = 2250
@@ -232,7 +232,6 @@
projectiletype = /obj/projectile/tentacle
projectilesound = 'sound/effects/splat.ogg'
Shoot(target)
-
/////TENTACLE END
/////STING ATTACK
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 863abf56dad..a386758b8e6 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -607,12 +607,12 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box)
var/ready_to_deploy = FALSE
/obj/machinery/anomalous_crystal/helpers/Destroy()
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
. = ..()
/obj/machinery/anomalous_crystal/helpers/ActivationReaction(mob/user, method)
if(..() && !ready_to_deploy)
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
ready_to_deploy = TRUE
notify_ghosts("An anomalous crystal has been activated in [get_area(src)]! This crystal can always be used by ghosts hereafter.", enter_link = "(Click to enter)", ghost_sound = 'sound/effects/ghost2.ogg', source = src, action = NOTIFY_ATTACK, header = "Anomalous crystal activated")
@@ -659,7 +659,6 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box)
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
- gold_core_spawnable = HOSTILE_SPAWN
verb_say = "warps"
verb_ask = "floats inquisitively"
verb_exclaim = "zaps"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm
index 08ef1a7b21c..bf580926517 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm
@@ -23,8 +23,8 @@
ranged_cooldown_time = 20
vision_range = 10
damage_coeff = list(BRUTE = 1, BURN = 0.5, TOX = 0.5, CLONE = 0.5, STAMINA = 0, OXY = 0.5)
- loot = list(/obj/item/claymore/cursed, /obj/item/clothing/suit/space/hardsuit/cult/enchanted)
- mob_trophy = list(/obj/item/claymore/cursed, /obj/item/clothing/suit/space/hardsuit/cult/enchanted, /obj/item/upgradescroll)
+ loot = list(/obj/item/melee/sword/claymore, /obj/item/clothing/suit/space/hardsuit/cult/enchanted)
+ mob_trophy = list(/obj/item/melee/sword/claymore, /obj/item/clothing/suit/space/hardsuit/cult/enchanted, /obj/item/upgradescroll)
wander = FALSE
del_on_death = TRUE
blood_volume = BLOOD_VOLUME_NORMAL
@@ -40,7 +40,7 @@
/datum/action/innate/megafauna_attack/rapid_fire)
move_force = MOVE_FORCE_NORMAL
var/turf/starting
- var/obj/item/claymore/cursed/mob/weapon
+ var/obj/item/melee/sword/claymore/weapon
var/charging = FALSE
var/dash_cooldown = 6 SECONDS
var/runic_blast_cooldown = 14 SECONDS
@@ -50,23 +50,6 @@
var/dash_num = 3
var/newcolor = rgb(149, 10, 10)
-/obj/item/claymore/cursed
- name = "cursed longsword"
- desc = "For those who overcame a great challenge. It glows with a dim red light."
- icon_state = "cultblade"
- item_state = "cultblade"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- w_class = WEIGHT_CLASS_BULKY
- throwforce = 25
- block_chance = 65
- armour_penetration = 50
- sharpness = IS_SHARP
-
-/obj/item/claymore/cursed/mob
- block_chance = 0
- force = 16
-
/mob/living/simple_animal/hostile/megafauna/cult_templar/Initialize()
. = ..()
starting = get_turf(src)
@@ -421,7 +404,7 @@
/obj/item/clothing/suit/space/hardsuit/cult/enchanted
name = "\improper Cursed Nar'Sien hardened armor"
desc = "A heavily-armored exosuit worn by warriors of the Nar'Sien cult. This one is cursed, screaming voices into the mind of the wearer."
- allowed = list(/obj/item/gun, /obj/item/nullrod, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/tank/internals)
armor = list("melee" = 75, "bullet" = 50, "laser" = 30, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 80, "fire" = 100, "acid" = 100)
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | LAVA_PROOF
@@ -465,7 +448,7 @@
stop_automated_movement = 1
status_flags = CANPUSH
attack_sound = 'sound/magic/demon_attack1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
faction = list("cult")
maxHealth = 60
health = 60
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
index 00a32a8dc44..03faa787d15 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
@@ -322,4 +322,3 @@ Difficulty: Extremely Hard
var/turf/T = get_turf(target)
mineral_scan_pulse(T, world.view + 1)
. = ..()
-
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index b7a2f091265..6a153adc54e 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -179,7 +179,7 @@ Difficulty: Medium
var/increment = 360 / spiral_count
for(var/j = 1 to spiral_count)
var/list/turfs = line_target(j * increment + i * increment / 2, range, src)
- INVOKE_ASYNC(src, PROC_REF(fire_line), turfs)
+ INVOKE_ASYNC(src, PROC_REF(dragon_fire_line), turfs)
SLEEP_CHECK_DEATH(25)
SetRecoveryTime(30)
@@ -250,11 +250,11 @@ Difficulty: Medium
var/range = 15
var/list/turfs = list()
turfs = line_target(-40, range, at)
- INVOKE_ASYNC(src, PROC_REF(fire_line), turfs)
+ INVOKE_ASYNC(src, PROC_REF(dragon_fire_line), turfs)
turfs = line_target(0, range, at)
- INVOKE_ASYNC(src, PROC_REF(fire_line), turfs)
+ INVOKE_ASYNC(src, PROC_REF(dragon_fire_line), turfs)
turfs = line_target(40, range, at)
- INVOKE_ASYNC(src, PROC_REF(fire_line), turfs)
+ INVOKE_ASYNC(src, PROC_REF(dragon_fire_line), turfs)
/mob/living/simple_animal/hostile/megafauna/dragon/proc/line_target(offset, range, atom/at = target)
if(!at)
@@ -268,32 +268,9 @@ Difficulty: Medium
T = check
return (getline(src, T) - get_turf(src))
-/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_line(list/turfs)
+/mob/living/simple_animal/hostile/megafauna/dragon/proc/dragon_fire_line(list/turfs)
SLEEP_CHECK_DEATH(0)
- dragon_fire_line(src, turfs)
-
-//fire line keeps going even if dragon is deleted
-/proc/dragon_fire_line(source, list/turfs)
- var/list/hit_list = list()
- for(var/turf/T in turfs)
- if(istype(T, /turf/closed))
- break
- new /obj/effect/hotspot(T)
- T.hotspot_expose(700,50,1)
- for(var/mob/living/L in T.contents)
- if(L in hit_list || L == source)
- continue
- hit_list += L
- L.adjustFireLoss(20)
- to_chat(L, "You're hit by [source]'s fire breath!")
-
- // deals damage to mechs
- for(var/obj/mecha/M in T.contents)
- if(M in hit_list)
- continue
- hit_list += M
- M.take_damage(45, BRUTE, "melee", 1)
- sleep(1.5)
+ fire_line(src, turfs)
/mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(lava_arena = FALSE, atom/movable/manual_target, swoop_cooldown = 30)
if(stat || swooping)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 37934c0367e..c1cb46cb85e 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -15,7 +15,7 @@
robust_searching = TRUE
ranged_ignores_vision = TRUE
stat_attack = DEAD
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
damage_coeff = list(BRUTE = 1, BURN = 0.5, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
minbodytemp = 0
maxbodytemp = INFINITY
@@ -86,7 +86,8 @@
..()
/mob/living/simple_animal/hostile/megafauna/proc/spawn_mob_trophy()
- loot += mob_trophy
+ if(mob_trophy)
+ loot += mob_trophy
/mob/living/simple_animal/hostile/megafauna/gib()
if(health > 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
deleted file mode 100644
index 0c13b9d67f1..00000000000
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-
-Swarmer Beacon
-
-A strange machine appears anywhere a normal lavaland mob can it produces a swarmer at a rate of
-1/15 seconds, until there are GetTotalAISwarmerCap()/2 swarmers, after this it is up to the swarmers themselves to
-increase their population (it will repopulate them should they fall under GetTotalAISwarmerCap()/2 again)
-
-tl;dr A million of the little hellraisers spawn (controlled by AI) and try to eat mining
-
-Loot: Not much, besides a shit load of artificial bluespace crystals, Oh and mining doesn't get eaten
-that's a plus I suppose.
-
-Difficulty: Special
-
-*/
-
-GLOBAL_LIST_EMPTY(AISwarmers)
-GLOBAL_LIST_EMPTY(AISwarmersByType)//AISwarmersByType[.../resource] = list(1st, 2nd, nth), AISwarmersByType[../ranged] = list(1st, 2nd, nth) etc.
-GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swarmer/ai/resource = 30, /mob/living/simple_animal/hostile/swarmer/ai/ranged_combat = 20, /mob/living/simple_animal/hostile/swarmer/ai/melee_combat = 10))
-
-
-//returns a type of AI swarmer that is NOT at max cap
-//type order is shuffled, to prevent bias
-/proc/GetUncappedAISwarmerType()
- var/static/list/swarmerTypes = subtypesof(/mob/living/simple_animal/hostile/swarmer/ai)
- LAZYINITLIST(GLOB.AISwarmersByType)
- for(var/t in shuffle(swarmerTypes))
- var/list/amount = GLOB.AISwarmersByType[t]
- if(!amount || amount.len < GLOB.AISwarmerCapsByType[t])
- return t
-
-
-//Total of all subtype caps
-/proc/GetTotalAISwarmerCap()
- var/static/list/swarmerTypes = subtypesof(/mob/living/simple_animal/hostile/swarmer/ai)
- . = 0
- LAZYINITLIST(GLOB.AISwarmersByType)
- for(var/t in swarmerTypes)
- . += GLOB.AISwarmerCapsByType[t]
-
-//this should. not be a simple mob i think
-/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon
- name = "swarmer beacon"
- desc = "That name is a bit of a mouthful, but stop paying attention to your mouth they're eating everything!"
- icon = 'icons/mob/swarmer.dmi'
- icon_state = "swarmer_console"
- health = 750
- maxHealth = 750 //""""low-ish"""" HP because it's a passive boss, and the swarm itself is the real foe
- mob_biotypes = MOB_ROBOTIC
- gps_name = "Hungry Signal"
- achievement_type = /datum/award/achievement/boss/swarmer_beacon_kill
- crusher_achievement_type = /datum/award/achievement/boss/swarmer_beacon_crusher
- score_achievement_type = /datum/award/score/swarmer_beacon_score
- faction = list("mining", "boss", "swarmer")
- weather_immunities = list("lava","ash")
- stop_automated_movement = TRUE
- wander = FALSE
- layer = BELOW_MOB_LAYER
- AIStatus = AI_OFF
- del_on_death = TRUE
- var/swarmer_spawn_cooldown = 0
- var/swarmer_spawn_cooldown_amt = 150 //Deciseconds between the swarmers we spawn
- var/call_help_cooldown = 0
- var/call_help_cooldown_amt = 150 //Deciseconds between calling swarmers to help us when attacked
- var/static/list/swarmer_caps
-
-
-/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Initialize()
- . = ..()
- swarmer_caps = GLOB.AISwarmerCapsByType //for admin-edits
- for(var/ddir in GLOB.cardinals)
- new /obj/structure/swarmer/blockade (get_step(src, ddir))
- var/mob/living/simple_animal/hostile/swarmer/ai/resource/R = new(loc)
- step(R, ddir) //Step the swarmers, instead of spawning them there, incase the turf is solid
-
-
-/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Life()
- . = ..()
- if(.)
- var/createtype = GetUncappedAISwarmerType()
- if(createtype && world.time > swarmer_spawn_cooldown && GLOB.AISwarmers.len < (GetTotalAISwarmerCap()*0.5))
- swarmer_spawn_cooldown = world.time + swarmer_spawn_cooldown_amt
- new createtype(loc)
-
-
-/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
- . = ..()
- if(. > 0 && world.time > call_help_cooldown)
- call_help_cooldown = world.time + call_help_cooldown_amt
- summon_backup(25) //long range, only called max once per 15 seconds, so it's not deathlag
-
-
-//SWARMER AI
-//AI versions of the swarmer mini-antag
-//This is an Abstract Base, it re-enables AI, but does not give the swarmer any goals/targets
-/mob/living/simple_animal/hostile/swarmer/ai
- wander = 1
- faction = list("swarmer", "mining")
- weather_immunities = list("ash") //wouldn't be fun otherwise
- AIStatus = AI_ON
-
-/mob/living/simple_animal/hostile/swarmer/ai/Initialize()
- . = ..()
- ToggleLight() //so you can see them eating you out of house and home/shooting you/stunlocking you for eternity
- LAZYADD(GLOB.AISwarmers, src)
- GLOB.AISwarmersByType[type] += list(src)
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/Destroy()
- GLOB.AISwarmers -= src
- GLOB.AISwarmersByType[type] -= src
- return ..()
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/SwarmerTypeToCreate()
- return GetUncappedAISwarmerType()
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/handle_automated_action()
- . = ..()
- if(.)
- if(!stop_automated_movement)
- if(health < maxHealth*0.25)
- StartAction(100)
- RepairSelf()
- return
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/Move(atom/newloc)
- if(newloc)
- if(newloc.virtual_z() == virtual_z()) //so these actions are Z-specific
- if(islava(newloc))
- var/turf/open/lava/L = newloc
- if(!L.is_safe())
- StartAction(20)
- new /obj/structure/catwalk/swarmer_catwalk(newloc)
- return FALSE
-
- if(ischasm(newloc) && !throwing)
- throw_at(get_edge_target_turf(src, get_dir(src, newloc)), 7 , 3, src, FALSE) //my planet needs me
- return FALSE
-
- return ..()
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/proc/StartAction(deci = 0)
- stop_automated_movement = TRUE
- AIStatus = AI_OFF
- addtimer(CALLBACK(src, PROC_REF(EndAction)), deci)
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/proc/EndAction()
- stop_automated_movement = FALSE
- AIStatus = AI_ON
-
-
-
-
-//RESOURCE SWARMER:
-//Similar to the original Player-Swarmers, these dismantle things to obtain the metal inside
-//They then use this medal to produce more swarmers or traps/barricades
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource
- search_objects = 1
- attack_all_objects = TRUE //attempt to nibble everything
- lose_patience_timeout = 150
- var/static/list/sharedWanted = typecacheof(list(/turf/closed/mineral, /turf/closed/wall)) //eat rocks and walls
- var/static/list/sharedIgnore = list()
-
-//This handles viable things to eat/attack
-//Place specific cases of AI derpiness here
-//Most can be left to the automatic Gain/LosePatience() system
-/mob/living/simple_animal/hostile/swarmer/ai/resource/CanAttack(atom/the_target)
-
- //SPECIFIC CASES:
- //Smash fulltile windows before grilles
- if(istype(the_target, /obj/structure/grille))
- for(var/obj/structure/window/rogueWindow in get_turf(the_target))
- if(rogueWindow.fulltile) //done this way because the subtypes are weird.
- the_target = rogueWindow
- break
-
- //GENERAL CASES:
- if(is_type_in_typecache(the_target, sharedIgnore)) //always ignore
- return FALSE
- if(is_type_in_typecache(the_target, sharedWanted)) //always eat
- return TRUE
-
- return ..() //else, have a nibble, see if it's food
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/OpenFire(atom/A)
- if(isliving(A)) //don't shoot rocks, sillies.
- ..()
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/AttackingTarget()
- if(target.swarmer_act(src))
- add_type_to_wanted(target.type)
- return TRUE
- else
- add_type_to_ignore(target.type)
- return FALSE
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/handle_automated_action()
- . = ..()
- if(.)
- if(!stop_automated_movement)
- if(GLOB.AISwarmers.len < GetTotalAISwarmerCap() && resources >= 50)
- StartAction(100) //so they'll actually sit still and use the verbs
- CreateSwarmer()
- return
-
- if(resources > 5)
- if(prob(5)) //lower odds, as to prioritise reproduction
- StartAction(10) //not a typo
- CreateBarricade()
- return
- if(prob(5))
- CreateTrap()
- return
-
-
-//So swarmers can learn what is and isn't food
-/mob/living/simple_animal/hostile/swarmer/ai/resource/proc/add_type_to_wanted(typepath)
- if(!sharedWanted[typepath])// this and += is faster than |=
- sharedWanted += typecacheof(typepath)
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/proc/add_type_to_ignore(typepath)
- if(!sharedIgnore[typepath])
- sharedIgnore += typecacheof(typepath)
-
-
-//RANGED SWARMER
-/mob/living/simple_animal/hostile/swarmer/ai/ranged_combat
- icon_state = "swarmer_ranged"
- icon_living = "swarmer_ranged"
- projectiletype = /obj/projectile/beam/laser
- projectilesound = 'sound/weapons/laser.ogg'
- check_friendly_fire = TRUE //you're supposed to protect the resource swarmers, you poop
- retreat_distance = 3
- minimum_distance = 3
-
-/mob/living/simple_animal/hostile/swarmer/ai/ranged_combat/Aggro()
- ..()
- summon_backup(15, TRUE) //Exact matching, so that goliaths don't come to aid the swarmers, that'd be silly
-
-
-//MELEE SWARMER
-/mob/living/simple_animal/hostile/swarmer/ai/melee_combat
- icon_state = "swarmer_melee"
- icon_living = "swarmer_melee"
- health = 60
- maxHealth = 60
- ranged = FALSE
-
-/mob/living/simple_animal/hostile/swarmer/ai/melee_combat/Aggro()
- ..()
- summon_backup(15, TRUE)
-
-
-/mob/living/simple_animal/hostile/swarmer/ai/melee_combat/AttackingTarget()
- if(isliving(target))
- if(prob(35))
- StartAction(30)
- DisperseTarget(target)
- else
- var/mob/living/L = target
- L.attack_animal(src)
- L.electrocute_act(10, src, flags = SHOCK_NOGLOVES)
- return TRUE
- else
- return ..()
-
-
-
-
-//SWARMER CATWALKS
-//Used so they can survive lavaland better
-/obj/structure/catwalk/swarmer_catwalk
- name = "swarmer catwalk"
- desc = "A catwalk-like mesh, produced by swarmers to allow them to navigate hostile terrain."
- icon = 'icons/obj/smooth_structures/swarmer_catwalk.dmi'
- icon_state = "swarmer_catwalk-0"
- base_icon_state = "swarmer_catwalk"
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 0568533c1e0..7b8bb392f1f 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -23,7 +23,7 @@
speak_emote = list("creaks")
taunt_chance = 30
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
faction = list("mimic")
@@ -224,7 +224,7 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca
TrueGun = G
if(istype(G, /obj/item/gun/ballistic))
Pewgun = G
- var/obj/item/ammo_box/magazine/M = Pewgun.mag_type
+ var/obj/item/ammo_box/magazine/M = Pewgun.default_ammo_type
casingtype = initial(M.ammo_type)
if(istype(G, /obj/item/gun/energy))
Zapgun = G
@@ -267,102 +267,5 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca
icon_state = TrueGun.icon_state
icon_living = TrueGun.icon_state
-/mob/living/simple_animal/hostile/mimic/xenobio
- health = 210
- maxHealth = 210
- attack_verb_continuous = "bites"
- attack_verb_simple = "bite"
- speak_emote = list("clatters")
- gold_core_spawnable = HOSTILE_SPAWN
- var/opened = FALSE
- var/open_sound = 'sound/machines/crate_open.ogg'
- var/close_sound = 'sound/machines/crate_close.ogg'
- var/max_mob_size = MOB_SIZE_HUMAN
- var/locked = FALSE
- var/datum/action/innate/mimic/lock/lock
-
-/mob/living/simple_animal/hostile/mimic/xenobio/Initialize()
- . = ..()
- lock = new
- lock.Grant(src)
-
-/mob/living/simple_animal/hostile/mimic/xenobio/AttackingTarget()
- if(src == target)
- toggle_open()
- return
- return ..()
-
-/mob/living/simple_animal/hostile/mimic/xenobio/attack_hand(mob/living/carbon/human/M)
- . = ..()
- if(M.a_intent != "help")
- return
- toggle_open()
-
-/mob/living/simple_animal/hostile/mimic/xenobio/death()
- var/obj/structure/closet/crate/C = new(get_turf(src))
- // Put loot in crate
- for(var/atom/movable/AM as anything in src)
- AM.forceMove(C)
- return ..()
-
-/mob/living/simple_animal/hostile/mimic/xenobio/CanAllowThrough(atom/movable/mover, border_dir)
- . = ..()
- if(istype(mover, /obj/structure/closet))
- return FALSE
-
-/mob/living/simple_animal/hostile/mimic/xenobio/proc/toggle_open()
- if(locked)
- return
- if(!opened)
- density = FALSE
- opened = TRUE
- icon_state = "crateopen"
- playsound(src, open_sound, 50, TRUE)
- for(var/atom/movable/AM as anything in src)
- AM.forceMove(loc)
- else
- density = TRUE
- opened = FALSE
- icon_state = "crate"
- playsound(src, close_sound, 50, TRUE)
- for(var/atom/movable/AM in get_turf(src))
- if(insertion_allowed(AM))
- AM.forceMove(src)
-
-/mob/living/simple_animal/hostile/mimic/xenobio/proc/insertion_allowed(atom/movable/AM)
- if(ismob(AM))
- if(!isliving(AM)) //Don't let ghosts and such get trapped in the beast.
- return FALSE
- var/mob/living/L = AM
- if(L.anchored || L.buckled || L.incorporeal_move || L.has_buckled_mobs())
- return FALSE
- if(L.mob_size > MOB_SIZE_TINY) // Tiny mobs are treated as items.
- if(L.density || L.mob_size > max_mob_size)
- return FALSE
- L.stop_pulling()
-
- else if(istype(AM, /obj/structure/closet))
- return FALSE
- else if(isobj(AM))
- if(AM.anchored || AM.has_buckled_mobs())
- return FALSE
- else if(isitem(AM) && !HAS_TRAIT(AM, TRAIT_NODROP))
- return TRUE
- else
- return FALSE
- return TRUE
-
/datum/action/innate/mimic
background_icon_state = "bg_default"
-
-/datum/action/innate/mimic/lock
- name = "Lock/Unlock"
- desc = "Toggle preventing yourself from being opened or closed."
-
-/datum/action/innate/mimic/lock/Activate()
- var/mob/living/simple_animal/hostile/mimic/xenobio/M = owner
- M.locked = !M.locked
- if(!M.locked)
- to_chat(M, "You loosen up, allowing yourself to be opened and closed.")
- else
- to_chat(M, "You stiffen up, preventing anyone from opening or closing you.")
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
index d10b9b86fb9..5e953c74119 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
@@ -1,4 +1,3 @@
-#define LEGIONVIRUS_TYPE /datum/disease/transformation/legionvirus
#define BULLET_SHELL_DAMAGE 1
//A beast that fire freezing blasts.
@@ -33,7 +32,6 @@
attack_sound = 'sound/weapons/bladeslice.ogg'
aggro_vision_range = 9
turns_per_move = 5
- gold_core_spawnable = HOSTILE_SPAWN
loot = list(/obj/item/stack/ore/diamond{layer = ABOVE_MOB_LAYER},
/obj/item/stack/ore/diamond{layer = ABOVE_MOB_LAYER})
var/lava_drinker = TRUE
@@ -46,10 +44,10 @@
damage_type = BURN
nodamage = TRUE
flag = "energy"
- temperature = -50 // Cools you down! per hit!
+ temperature = -5 // Cools you down! per hit!
/obj/projectile/temp/basilisk/super
- temperature = -100
+ temperature = -20
damage = 5
nodamage = FALSE
@@ -204,7 +202,6 @@
projectiletype = /obj/projectile/temp/basilisk/heated
#undef BULLET_SHELL_DAMAGE
-#undef LEGIONVIRUS_TYPE
//Watcher
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher
@@ -231,7 +228,6 @@
robust_searching = 1
attack_same = TRUE // So we'll fight basilisks
//mob_trophy = /obj/item/mob_trophy/watcher_wing
- gold_core_spawnable = NO_SPAWN
loot = list()
butcher_results = list(/obj/item/stack/ore/diamond = 2, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/bone = 1)
lava_drinker = FALSE
@@ -340,8 +336,8 @@
if(istype(L))
L.apply_status_effect(/datum/status_effect/freon/watcher)
-/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril
- fromtendril = TRUE
+/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/nest
+ from_nest = TRUE
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/forgotten
name = "forgotten watcher"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm
index 769f6ce3d5f..6495b967fb8 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm
@@ -242,7 +242,7 @@
/datum/reagent/brimdust/on_mob_life(mob/living/carbon/carbon, delta_time, times_fired)
. = ..()
carbon.adjustFireLoss((ispodperson(carbon) ? -1 : 1) * delta_time)
- carbon.adjust_bodytemperature(55 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, carbon.get_body_temp_normal())
+ carbon.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, carbon.get_body_temp_normal())
/datum/reagent/brimdust/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
index cb7eaad0e98..94dd221945b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
@@ -185,7 +185,6 @@
move_to_delay = 5
mob_biotypes = MOB_ORGANIC|MOB_BEAST
mouse_opacity = MOUSE_OPACITY_ICON
- butcher_results = list()
guaranteed_butcher_results = list(/obj/item/stack/sheet/animalhide/goliath_hide = 1)
deathmessage = "falls to the ground."
status_flags = CANPUSH
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
index e4eb7122d39..3377165ea3e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
@@ -29,7 +29,6 @@
throw_message = "sinks in slowly, before being pushed out of "
deathmessage = "stops moving as green liquid oozes from the carcass!"
status_flags = CANPUSH
- gold_core_spawnable = HOSTILE_SPAWN
search_objects = 1
wanted_objects = list(
/obj/item/stack/ore/diamond,
@@ -45,10 +44,8 @@
/mob/living/simple_animal/hostile/asteroid/goldgrub/Initialize()
. = ..()
- var/i = rand(1,3)
- while(i)
+ for (var/i in 1 to rand(1, 3))
loot += pick(/obj/item/stack/ore/silver, /obj/item/stack/ore/gold, /obj/item/stack/ore/uranium, /obj/item/stack/ore/diamond)
- i--
spit = new
burrow = new
spit.Grant(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index bf8552ba5cb..d9c011fe85f 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -226,7 +226,6 @@
D.set_vehicle_dir_layer(NORTH, OBJ_LAYER)
D.set_vehicle_dir_layer(EAST, OBJ_LAYER)
D.set_vehicle_dir_layer(WEST, OBJ_LAYER)
- D.keytype = /obj/item/key/lasso
D.drive_verb = "ride"
else
user.visible_message("[src] is rocking around! You can't put the saddle on!")
@@ -250,10 +249,7 @@
health = 180
speed = 4
//mob_trophy = /obj/item/mob_trophy/elder_tentacle
- pre_attack_icon = "ancient_goliath_preattack"
- throw_message = "does nothing to the rocky hide of the"
guaranteed_butcher_results = list()
- trophy_drop_mod = 75
wander = FALSE
bonus_tame_chance = 10
var/list/cached_tentacle_turfs
@@ -280,9 +276,9 @@
else
cached_tentacle_turfs -= t
-/mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril
+/mob/living/simple_animal/hostile/asteroid/goliath/beast/nest
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/goliath = 2, /obj/item/stack/sheet/bone = 2, /obj/item/stack/sheet/sinew = 2)
- fromtendril = TRUE
+ from_nest = TRUE
//tentacles
/obj/effect/temp_visual/goliath_tentacle
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
index ee48ed624ee..a6457306cda 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
@@ -28,7 +28,6 @@
friendly_verb_simple = "pinch"
a_intent = INTENT_HELP
ventcrawler = VENTCRAWLER_ALWAYS
- gold_core_spawnable = FRIENDLY_SPAWN
stat_attack = HARD_CRIT
gender = NEUTER
stop_automated_movement = FALSE
@@ -43,12 +42,16 @@
animal_species = /mob/living/simple_animal/hostile/asteroid/gutlunch
childtype = list(/mob/living/simple_animal/hostile/asteroid/gutlunch/grublunch = 100)
+ var/mutable_appearance/gutlunch_full_overlay
+
wanted_objects = list(/obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/blood/gibs/, /obj/item/organ, /obj/item/reagent_containers/food/snacks/meat/slab)
/mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize()
. = ..()
- if(wanted_objects.len)
- AddComponent(/datum/component/udder, /obj/item/udder/gutlunch, CALLBACK(src, PROC_REF(regenerate_icons)), CALLBACK(src, PROC_REF(regenerate_icons)))
+ if(!length(wanted_objects))
+ return
+ AddComponent(/datum/component/udder, /obj/item/udder/gutlunch, CALLBACK(src, TYPE_PROC_REF(/atom/movable, update_overlays)), CALLBACK(src, TYPE_PROC_REF(/atom/movable, update_overlays)))
+ gutlunch_full_overlay = mutable_appearance(icon, "gl_full")
/mob/living/simple_animal/hostile/asteroid/gutlunch/CanAttack(atom/the_target) // Gutlunch-specific version of CanAttack to handle stupid stat_exclusive = true crap so we don't have to do it for literally every single simple_animal/hostile except the two that spawn in lavaland
if(isturf(the_target) || !the_target || the_target.type == /atom/movable/lighting_object) // bail out on invalids
@@ -72,14 +75,12 @@
return FALSE
-/mob/living/simple_animal/hostile/asteroid/gutlunch/regenerate_icons(new_udder_volume, max_udder_volume)
- cut_overlays()
- var/static/gutlunch_full_overlay
- if(isnull(gutlunch_full_overlay))
- gutlunch_full_overlay = iconstate2appearance(icon, "gl_full")
- if(new_udder_volume == max_udder_volume)
- add_overlay(gutlunch_full_overlay)
- ..()
+/mob/living/simple_animal/hostile/asteroid/gutlunch/update_overlays(new_udder_volume, max_udder_volume)
+ . = ..()
+ if(new_udder_volume != max_udder_volume)
+ return
+
+ . += gutlunch_full_overlay
//Male gutlunch. They're smaller and more colorful!
/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck
@@ -100,7 +101,6 @@
/mob/living/simple_animal/hostile/asteroid/gutlunch/grublunch
name = "grublunch"
wanted_objects = list() //They don't eat.
- gold_core_spawnable = NO_SPAWN
var/growth = 0
//Baby gutlunch
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 5158c80d056..601c87498b6 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -51,7 +51,8 @@
return TRUE
/mob/living/simple_animal/hostile/asteroid/hivelord/spawn_mob_trophy()
- loot += mob_trophy //we don't butcher
+ if(mob_trophy)
+ loot += mob_trophy //we don't butcher
/mob/living/simple_animal/hostile/asteroid/hivelord/death(gibbed)
mouse_opacity = MOUSE_OPACITY_ICON
@@ -164,7 +165,7 @@
if(stored_mob)
stored_mob.forceMove(get_turf(src))
stored_mob = null
- else if(fromtendril)
+ else if(from_nest)
new /obj/effect/mob_spawn/human/corpse/charredskeleton(T)
else if(dwarf_mob)
new /obj/effect/mob_spawn/human/corpse/damaged/legioninfested/dwarf(T)
@@ -172,11 +173,11 @@
new /obj/effect/mob_spawn/human/corpse/damaged/legioninfested(T)
..(gibbed)
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril
- fromtendril = TRUE
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest
+ from_nest = TRUE
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf/tendril
- fromtendril = TRUE
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf/nest
+ from_nest = TRUE
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf/death(gibbed)
move_force = MOVE_FORCE_DEFAULT
@@ -208,7 +209,7 @@
attack_sound = 'sound/weapons/pierce.ogg'
throw_message = "is shrugged off by"
del_on_death = TRUE
- stat_attack = HARD_CRIT
+ stat_attack = SOFT_CRIT
robust_searching = 1
var/can_infest_dead = FALSE
@@ -222,7 +223,7 @@
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/staff/Initialize()
. = ..()
- addtimer(CALLBACK(src, PROC_REF(death)), 50)
+ addtimer(CALLBACK(src, PROC_REF(death)), 5 SECONDS)
AddComponent(/datum/component/swarming)
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life()
@@ -230,6 +231,8 @@
if(stat == DEAD || !isturf(loc))
return
for(var/mob/living/carbon/human/victim in range(src, 1)) //Only for corpse right next to/on same tile
+ if(istype(victim.getorganslot(ORGAN_SLOT_REGENERATIVE_CORE), /obj/item/organ/legion_skull)) // no double dipping
+ continue
switch(victim.stat)
if(UNCONSCIOUS, HARD_CRIT)
infest(victim)
@@ -239,21 +242,90 @@
infest(victim)
return //This will qdelete the legion.
-
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H)
- visible_message("[name] burrows into the flesh of [H]!")
- var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
- if(HAS_TRAIT(H, TRAIT_DWARF)) //dwarf legions aren't just fluff!
- L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc)
+ visible_message(span_warning("[name] burrows into [H]!"))
+ to_chat(H, span_boldwarning("You feel something digging into your body..."))
+ if(H.stat != DEAD)
+ var/obj/item/organ/legion_skull/throwyouabone = new()
+ throwyouabone.Insert(H)
else
- L = new(H.loc)
- visible_message("[L] staggers to [L.p_their()] feet!")
- H.death()
- H.adjustBruteLoss(1000)
- L.stored_mob = H
- H.forceMove(L)
+ var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
+ if(HAS_TRAIT(H, TRAIT_DWARF)) //dwarf legions aren't just fluff!
+ L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc)
+ else
+ L = new(H.loc)
+ visible_message(span_warning("[L] staggers to [L.p_their()] feet!"))
+ H.adjustBruteLoss(1000)
+ L.stored_mob = H
+ H.forceMove(L)
qdel(src)
+/obj/item/organ/legion_skull
+ name = "legion skull"
+ desc = "The skull of a legion, likely torn from a soon-to-be host."
+ icon_state = "legion_skull"
+ zone = BODY_ZONE_CHEST
+ slot = ORGAN_SLOT_REGENERATIVE_CORE
+ grind_results = list(/datum/reagent/medicine/soulus = 2, /datum/reagent/blood = 5)
+ var/datum/disease/transformation/legionvirus/malignance
+ var/malignance_countdown = 5 MINUTES
+ var/malignance_tracker
+
+/obj/item/organ/legion_skull/on_find(mob/living/finder)
+ ..()
+ to_chat(finder, span_warning("You found a skull-shaped growth in [owner]'s [zone]!"))
+
+/obj/item/organ/legion_skull/Insert(mob/living/carbon/M, special = 0)
+ ..()
+ malignance = new()
+ malignance.infect(M, FALSE) //we handle all the fancy virus stuff in the organ, so we need a reference for it
+ malignance_tracker = addtimer(CALLBACK(src, PROC_REF(update_stage)), malignance_countdown, TIMER_STOPPABLE|TIMER_DELETE_ME)
+ M.heal_overall_bleeding(12) //stop dying so fast
+
+/obj/item/organ/legion_skull/Remove(mob/living/carbon/M, special = 0)
+ malignance_countdown = initial(malignance_countdown)
+ deltimer(malignance_tracker)
+ malignance_tracker = null
+ malignance.cure()
+ ..()
+
+/obj/item/organ/legion_skull/on_life()
+ . = ..()
+ skull_check()
+
+/obj/item/organ/legion_skull/on_death()
+ . = ..()
+ skull_check()
+
+/// track our timers and reagents
+/obj/item/organ/legion_skull/proc/skull_check()
+ if(!owner)
+ return
+ if(!malignance)
+ malignance = new()
+ malignance.infect(owner, FALSE)
+ if(owner.reagents.has_reagent(/datum/reagent/medicine/synaptizine, needs_metabolizing = TRUE) || owner.reagents.has_reagent(/datum/reagent/medicine/spaceacillin, needs_metabolizing = TRUE))
+ if(isnull(timeleft(malignance_tracker))) //ruhehehehehe
+ malignance_countdown = min(malignance_countdown + 1 SECONDS, initial(malignance_countdown)) //slightly improve our resistance to dying so we don't turn the second a treatment runs out
+ return
+ malignance_countdown = timeleft(malignance_tracker) //pause our timer if we have the reagents
+ deltimer(malignance_tracker)
+ malignance_tracker = null //you would think deltimer would do this but it actually doesn't track a direct reference!
+ return
+ if(!malignance_tracker)
+ malignance_tracker = addtimer(CALLBACK(src, PROC_REF(update_stage)), malignance_countdown, TIMER_STOPPABLE|TIMER_DELETE_ME) //and resume if we run out
+
+/// Updates the stage of our tied disease
+/obj/item/organ/legion_skull/proc/update_stage()
+ malignance.update_stage(min(malignance.stage + 1, malignance.max_stages))
+ if(malignance.stage == 5)
+ malignance.stage_act() //force the transformation here, then delete everything
+ qdel(malignance)
+ qdel(src)
+ return
+ malignance_countdown = initial(malignance_countdown)
+ malignance_tracker = addtimer(CALLBACK(src, PROC_REF(update_stage)), malignance_countdown, TIMER_STOPPABLE|TIMER_DELETE_ME)
+
//Advanced Legion is slightly tougher to kill and can raise corpses (revive other legions)
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/advanced
name = "Signifer"
@@ -295,7 +367,7 @@
del_on_death = TRUE
sentience_type = SENTIENCE_BOSS
loot = list(/obj/item/organ/regenerative_core/legion = 3, /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 5, /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 5, /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 5)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = INFINITY
move_to_delay = 7
@@ -320,7 +392,7 @@
/mob/living/simple_animal/hostile/big_legion/Initialize()
.=..()
- AddComponent(/datum/component/spawner, list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril), 200, faction, "peels itself off from", 3)
+ AddComponent(/datum/component/spawner, list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest), 200, faction, "peels itself off from", 3)
// Snow Legion
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow
@@ -345,8 +417,8 @@
icon_aggro = "snowlegion_head"
icon_dead = "snowlegion_head"
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/tendril
- fromtendril = TRUE
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/nest
+ from_nest = TRUE
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/crystal
name = "disfigured legion"
@@ -376,7 +448,7 @@
P.fire(i*(360/5))
return ..()
-//Tendril-spawned Legion remains, the charred skeletons of those whose bodies sank into lava or fell into chasms.
+//nest-spawned Legion remains, the charred skeletons of those whose bodies sank into lava or fell into chasms.
/obj/effect/mob_spawn/human/corpse/charredskeleton
name = "charred skeletal remains"
burn_damage = 1000
@@ -393,7 +465,7 @@
H.transform = H.transform.Scale(0.8, 1)//somehow dwarf squashing is borked when not roundstart. I hate WS code
/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/Initialize() //in an ideal world, these would generate, the legion would overlay over the corpse, and we'd get cool sprites
- mob_species = pickweight(list(
+ mob_species = pick_weight(list(
/datum/species/human = 50,
/datum/species/lizard = 20,
/datum/species/ipc = 10,
@@ -402,7 +474,7 @@
/datum/species/spider = 5
)
)
- var/type = pickweight(list(
+ var/type = pick_weight(list(
"Miner" = 40,
"Assistant" = 10,
"Engineer" = 5,
@@ -413,19 +485,16 @@
)
)
- switch(type)
- if("Miner")
- outfit = /datum/outfit/generic/miner
- if("Assistant")
- outfit = /datum/outfit/generic
- if("Engineer")
- outfit = /datum/outfit/generic/engineer
- if("Doctor")
- outfit = /datum/outfit/generic/doctor
- if("Scientist")
- outfit = /datum/outfit/generic/science
- if("Cargo")
- outfit = /datum/outfit/generic/cargo
- if("Security")
- outfit = /datum/outfit/generic/security
+ var/outfit_map = list(
+ "Miner" = /datum/outfit/generic/miner,
+ "Assistant" = /datum/outfit/generic,
+ "Engineer" = /datum/outfit/generic/engineer,
+ "Doctor" = /datum/outfit/generic/doctor,
+ "Scientist" = /datum/outfit/generic/science,
+ "Cargo" = /datum/outfit/generic/cargo,
+ "Security" = /datum/outfit/generic/security
+ )
+
+ outfit = outfit_map[type] // Access outfit directly
+
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
index 09d85a664e8..c142ffddc10 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
@@ -1,6 +1,6 @@
/datum/outfit/generic/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
- uniform = pickweight(list(
+ uniform = pick_weight(list(
/obj/item/clothing/under/utility = 5,
/obj/item/clothing/under/utility/skirt = 5,
/obj/item/clothing/under/color/black = 1,
@@ -17,15 +17,14 @@
/obj/item/clothing/under/suit/black = 1,
/obj/item/clothing/under/dress/sailor = 1,
/obj/item/clothing/under/dress/striped = 1,
- /obj/item/clothing/under/dress/skirt/blue = 1,
+ /obj/item/clothing/under/dress/skirt/color/blue = 1,
/obj/item/clothing/under/syndicate/tacticool = 1,
)
)
- suit = pickweight(list(
+ suit = pick_weight(list(
/obj/item/clothing/suit/hooded/wintercoat = 1,
/obj/item/clothing/suit/jacket = 1,
/obj/item/clothing/suit/jacket/leather = 1,
- /obj/item/clothing/suit/jacket/leather/overcoat = 1,
/obj/item/clothing/suit/jacket/leather/duster = 1,
/obj/item/clothing/suit/jacket/miljacket = 1,
/obj/item/clothing/suit/jacket/puffer = 1,
@@ -34,7 +33,7 @@
/obj/item/clothing/suit/toggle/hazard = 1,
)
)
- back = pickweight(list(
+ back = pick_weight(list(
/obj/item/storage/backpack = 1,
/obj/item/storage/backpack/satchel = 1,
/obj/item/storage/backpack/duffelbag = 1,
@@ -43,22 +42,22 @@
)
)
if (prob(10))
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/gun/ballistic/automatic/pistol/candor = 2,
/obj/item/gun/ballistic/automatic/pistol/commander = 1,
- /obj/item/gun/ballistic/automatic/pistol/syndicate = 1,
- /obj/item/gun/ballistic/revolver/syndicate = 1,
+ /obj/item/gun/ballistic/automatic/pistol/ringneck = 1,
+ /obj/item/gun/ballistic/revolver/viper = 1,
/obj/item/gun/ballistic/revolver/firebrand = 1,
)
)
if(prob(50))
- gloves = pickweight(list(
+ gloves = pick_weight(list(
/obj/item/clothing/gloves/color/black = 1,
/obj/item/clothing/gloves/fingerless = 1,
/obj/item/clothing/gloves/color/white = 1,
)
)
- shoes = pickweight(list(
+ shoes = pick_weight(list(
/obj/item/clothing/shoes/laceup = 1,
/obj/item/clothing/shoes/sandal = 1,
/obj/item/clothing/shoes/winterboots = 1,
@@ -70,7 +69,7 @@
)
)
if(prob(50))
- head = pickweight(list(
+ head = pick_weight(list(
/obj/item/clothing/head/beret = 3,
/obj/item/clothing/head/beret/grey = 3,
/obj/item/clothing/head/flatcap = 3,
@@ -81,11 +80,10 @@
/obj/item/clothing/head/hardhat/orange = 2,
/obj/item/clothing/head/hardhat/dblue = 2,
/obj/item/clothing/head/pirate = 1,
- /obj/item/clothing/head/foilhat = 1
)
)
if(prob(50))
- mask = pickweight(list(
+ mask = pick_weight(list(
/obj/item/clothing/mask/balaclava = 1,
/obj/item/clothing/mask/bandana/red = 1,
/obj/item/clothing/mask/gas = 3,
@@ -93,7 +91,7 @@
)
)
if(prob(25))
- neck = pickweight(list(
+ neck = pick_weight(list(
/obj/item/clothing/neck/scarf/red = 1,
/obj/item/clothing/neck/scarf/green = 1,
/obj/item/clothing/neck/scarf/darkblue = 1,
@@ -105,7 +103,7 @@
)
ears = pick(/obj/item/radio/headset, /obj/item/radio/headset/alt)
if(prob(50))
- glasses = pickweight(list(
+ glasses = pick_weight(list(
/obj/item/clothing/glasses/regular = 1,
/obj/item/clothing/glasses/regular/circle = 1,
/obj/item/clothing/glasses/regular/jamjar = 1,
@@ -123,7 +121,7 @@
l_pocket = pick(/obj/item/radio, /obj/item/flashlight)
id = /obj/item/card/id
backpack_contents = list()
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/dice/d20 = 1,
/obj/item/lipstick = 1,
/obj/item/clothing/mask/vape = 1,
@@ -153,14 +151,14 @@
/datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(prob(75))
- uniform = pickweight(list(
+ uniform = pick_weight(list(
/obj/item/clothing/under/rank/cargo/miner/lavaland = 5,
/obj/item/clothing/under/rank/cargo/miner = 4,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 1,
)
)
if(prob(25))
- suit = pickweight(list(
+ suit = pick_weight(list(
/obj/item/clothing/suit/hooded/explorer = 18,
/obj/item/clothing/suit/hooded/explorer/old = 1,
/obj/item/clothing/suit/hooded/cloak/goliath = 1
@@ -169,13 +167,13 @@
if(prob(75))
back = /obj/item/storage/backpack/explorer
if(prob(75))
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/storage/belt/mining = 2,
/obj/item/storage/belt/mining/alt = 2
)
)
else if(prob(75))
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/pickaxe = 16,
/obj/item/pickaxe/mini = 8,
/obj/item/pickaxe/silver = 4,
@@ -185,7 +183,7 @@
)
)
if(prob(75))
- gloves = pickweight(list(
+ gloves = pick_weight(list(
/obj/item/clothing/gloves/color/black = 9,
/obj/item/clothing/gloves/explorer/old = 1
)
@@ -193,7 +191,7 @@
if(prob(75))
shoes = /obj/item/clothing/shoes/workboots/mining
if(prob(75))
- mask = pickweight(list(
+ mask = pick_weight(list(
/obj/item/clothing/mask/gas/explorer = 9,
/obj/item/clothing/mask/gas/explorer/old = 1
)
@@ -201,16 +199,16 @@
if(prob(50))
glasses = /obj/item/clothing/glasses/meson
if(prob(50))
- r_pocket = pickweight(list(
+ r_pocket = pick_weight(list(
/obj/item/stack/marker_beacon = 20,
- /obj/item/spacecash/bundle/mediumrand = 7,
+ /obj/item/spacecash/bundle/smallrand = 7,
/obj/item/reagent_containers/hypospray/medipen/survival = 2,
/obj/item/borg/upgrade/modkit/damage = 1
)
)
if(prob(25))
- l_pocket = pickweight(list(
- /obj/item/spacecash/bundle/mediumrand = 5,
+ l_pocket = pick_weight(list(
+ /obj/item/spacecash/bundle/smallrand = 5,
/obj/item/reagent_containers/hypospray/medipen/survival = 2,
/obj/item/borg/upgrade/modkit/cooldown = 1
)
@@ -218,7 +216,7 @@
if(prob(75))
for(var/count in 1 to 3)
if(prob(70))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/borg/upgrade/modkit/damage = 1,
/obj/item/borg/upgrade/modkit/trigger_guard = 1,
/obj/item/soap/nanotrasen = 1,
@@ -230,7 +228,7 @@
/obj/item/stack/marker_beacon/ten = 2,
/obj/item/mining_scanner = 2,
/obj/item/extinguisher/mini = 2,
- /obj/item/kitchen/knife/combat/survival = 3,
+ /obj/item/melee/knife/survival = 3,
/obj/item/flashlight/seclite = 3,
/obj/item/stack/sheet/sinew = 3,
/obj/item/stack/sheet/bone = 3
@@ -238,7 +236,7 @@
)
if(prob(30))
backpack_contents += list(
- /obj/item/reagent_containers/hypospray/medipen/survival = pickweight(list(
+ /obj/item/reagent_containers/hypospray/medipen/survival = pick_weight(list(
1 = 3,
2 = 2,
3 = 1
@@ -247,7 +245,7 @@
)
else if (prob(75))
backpack_contents = list()
- back = pickweight(list(
+ back = pick_weight(list(
/obj/item/kinetic_crusher = 9,
/obj/item/kinetic_crusher/old = 1
)
@@ -275,10 +273,10 @@
if(prob(75))
back = pick(/obj/item/storage/backpack/industrial, /obj/item/storage/backpack/satchel/eng, /obj/item/storage/backpack/duffelbag/engineering, /obj/item/storage/backpack/messenger/engi)
if(prob(10))
- back = /obj/item/fireaxe
+ back = /obj/item/melee/axe/fire
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/stack/tape/industrial/electrical = 1,
/obj/item/electronics/apc = 1,
/obj/item/multitool = 1,
@@ -307,7 +305,7 @@
else if (prob(75))
back = /obj/item/defibrillator/loaded
if(prob(75))
- belt = pickweight(list(/obj/item/storage/belt/medical = 5, /obj/item/defibrillator/compact/loaded = 1))
+ belt = pick_weight(list(/obj/item/storage/belt/medical = 5, /obj/item/defibrillator/compact/loaded = 1))
if(prob(75))
gloves = pick(/obj/item/clothing/gloves/color/white, /obj/item/clothing/gloves/color/latex/nitrile)
if(prob(75))
@@ -322,7 +320,7 @@
glasses = pick(/obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health/prescription)
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/reagent_containers/pill/patch/styptic = 5,
/obj/item/reagent_containers/pill/patch/silver_sulf = 5,
/obj/item/storage/firstaid/medical = 3,
@@ -367,7 +365,7 @@
neck = /obj/item/clothing/neck/tie/horrible
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/research_notes/loot/tiny = 3,
/obj/item/research_notes/loot/small = 3,
/obj/item/reagent_scanner = 3,
@@ -378,7 +376,7 @@
/obj/item/stock_parts/micro_laser/high = 2,
/obj/item/stock_parts/matter_bin/adv = 2,
/obj/item/survey_handheld = 1,
- /obj/item/weldingtool/experimental = 1,
+ /obj/item/weldingtool/electric = 1,
/obj/item/mmi/posibrain = 1,
/obj/item/reagent_containers/glass/beaker/plastic = 1,
/obj/item/organ/eyes/robotic/shield = 1,
@@ -410,8 +408,8 @@
ears = /obj/item/radio/headset/headset_cargo
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pickweight(list(
- /obj/item/spacecash/bundle/mediumrand = 5,
+ backpack_contents += pick_weight(list(
+ /obj/item/spacecash/bundle/smallrand = 5,
/obj/item/ammo_box/magazine/illestren_a850r = 5,
/obj/item/ammo_box/magazine/zip_ammo_9mm = 5,
/obj/item/modular_computer/tablet/preset/cargo = 3,
@@ -424,7 +422,7 @@
if(prob(75))
accessory = /obj/item/clothing/accessory/armband/cargo
if(prob(25))
- suit = /obj/item/clothing/suit/armor/vest/scrap_armor
+ suit = /obj/item/clothing/suit/armor/vest/scrap
suit_store = /obj/item/gun/ballistic/rifle/illestren
/datum/outfit/generic/cargo
@@ -447,7 +445,7 @@
if(prob(75))
head = pick(/obj/item/clothing/head/helmet/sec, /obj/item/clothing/head/helmet/blueshirt, /obj/item/clothing/head/helmet/bulletproof)
if(prob(75))
- mask = /obj/item/clothing/mask/gas/sechailer
+ mask = /obj/item/clothing/mask/gas
if(prob(75))
ears = /obj/item/radio/headset/headset_sec
if(prob(75))
@@ -455,16 +453,16 @@
if(prob(75))
r_pocket = pick(/obj/item/flashlight/seclite, /obj/item/assembly/flash/handheld, /obj/item/restraints/handcuffs)
if(prob(50))
- suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg, /obj/item/gun/energy/e_gun/iot)
+ suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg)
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/restraints/handcuffs = 8,
/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/storage/box/ammo/c9mm_rubber = 3,
+ /obj/item/storage/box/ammo/c9mm = 1,
/obj/item/stock_parts/cell/gun = 3,
/obj/item/coin/antagtoken = 1,
/obj/item/grenade/stingbang = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
similarity index 99%
rename from code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm
rename to code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
index 786cdaa8096..17f189080d7 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
@@ -45,7 +45,7 @@
name = "ice blast"
damage = 5
nodamage = FALSE
- temperature = -75
+ temperature = -2
/mob/living/simple_animal/hostile/asteroid/ice_demon/OpenFire()
// Sentient ice demons teleporting has been linked to server crashes
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice whelp.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm
similarity index 98%
rename from code/modules/mob/living/simple_animal/hostile/mining_mobs/ice whelp.dm
rename to code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm
index 7a4d8cb234c..8973b3ed18b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice whelp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm
@@ -40,7 +40,7 @@
/mob/living/simple_animal/hostile/asteroid/ice_whelp/OpenFire()
var/turf/T = get_ranged_target_turf_direct(src, target, fire_range)
var/list/burn_turfs = getline(src, T) - get_turf(src)
- dragon_fire_line(src, burn_turfs)
+ fire_line(src, burn_turfs)
/mob/living/simple_animal/hostile/asteroid/ice_whelp/death(gibbed)
move_force = MOVE_FORCE_DEFAULT
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
index 19334bc84fc..18be354c265 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
@@ -1,7 +1,7 @@
//the base mining mob
/mob/living/simple_animal/hostile/asteroid
vision_range = 2
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
faction = list("mining")
weather_immunities = list("lava","ash")
obj_damage = 30
@@ -15,22 +15,14 @@
var/mob_trophy
var/throw_message = "bounces off of"
var/throw_deflection = 20 //WS edit - Whitesands
- var/fromtendril = FALSE
+ var/from_nest = FALSE
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
mob_size = MOB_SIZE_LARGE
var/icon_aggro = null
var/trophy_drop_mod = 25
- var/datum/armor/armor //WS edit - Whitesands
/mob/living/simple_animal/hostile/asteroid/Initialize(mapload)
- if (islist(armor)) //WS edit begin - Whitesands
- armor = getArmor(arglist(armor))
- else if (!armor)
- armor = getArmor()
- else if (!istype(armor, /datum/armor))
- stack_trace("Invalid type [armor.type] found in .armor during [src.type] Initialize()") //WS edit begin - Whitesands
-
. = ..()
apply_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
@@ -45,11 +37,6 @@
return
icon_state = icon_living
-/mob/living/simple_animal/hostile/asteroid/getarmor(def_zone, type) //WS edit begin - Whitesands
- if(armor)
- return armor.getRating(type)
- return 0 // If no armor //WS edit end
-
/mob/living/simple_animal/hostile/asteroid/bullet_act(obj/projectile/P)//Reduces damage from most projectiles to curb off-screen kills
if(!stat)
Aggro()
@@ -70,7 +57,7 @@
/mob/living/simple_animal/hostile/asteroid/death(gibbed)
SSblackbox.record_feedback("tally", "mobs_killed_mining", 1, type)
- if(prob(trophy_drop_mod)) //on average, you'll need to kill 4 creatures before getting the item
+ if(prob(trophy_drop_mod)) //on average, you'll need to kill 5 creatures before getting the item
spawn_mob_trophy()
..(gibbed)
diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
index 55d873cf036..e6a5ec66cb9 100644
--- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm
+++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
@@ -14,8 +14,7 @@
attack_sound = 'sound/weapons/bladeslice.ogg'
faction = list("nether")
speak_emote = list("screams")
- gold_core_spawnable = HOSTILE_SPAWN
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
var/phaser = TRUE
@@ -158,7 +157,6 @@
icon_state = "blank-body"
icon_living = "blank-body"
icon_dead = "blank-dead"
- gold_core_spawnable = NO_SPAWN
health = 100
maxHealth = 100
melee_damage_lower = 5
@@ -167,48 +165,3 @@
attack_verb_simple = "punch"
deathmessage = "falls apart into a fine dust."
phaser = FALSE
-
-/obj/structure/spawner/nether
- name = "netherworld link"
- desc = null //see examine()
- icon_state = "nether"
- max_integrity = 50
- spawn_time = 600 //1 minute
- max_mobs = 15
- spawn_text = "crawls through"
- mob_types = list(/mob/living/simple_animal/hostile/netherworld/migo, /mob/living/simple_animal/hostile/netherworld, /mob/living/simple_animal/hostile/netherworld/blankbody)
- faction = list("nether")
-
-/obj/structure/spawner/nether/Initialize()
- .=..()
- START_PROCESSING(SSprocessing, src)
-
-/obj/structure/spawner/nether/examine(mob/user)
- . = ..()
- if(isskeleton(user) || iszombie(user))
- . += "A direct link to another dimension full of creatures very happy to see you. You can see your house from here!"
- else
- . += "A direct link to another dimension full of creatures not very happy to see you. Entering the link would be a very bad idea."
-
-/obj/structure/spawner/nether/attack_hand(mob/user)
- . = ..()
- if(isskeleton(user) || iszombie(user))
- to_chat(user, "You don't feel like going home yet...")
- else
- user.visible_message("[user] is violently pulled into the link!", \
- "Touching the portal, you are quickly pulled through into a world of unimaginable horror!")
- contents.Add(user)
-
-/obj/structure/spawner/nether/process()
- for(var/mob/living/M in contents)
- if(M)
- playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE)
- M.adjustBruteLoss(60)
- new /obj/effect/gibspawner/generic(get_turf(M), M)
- if(M.stat == DEAD)
- var/mob/living/simple_animal/hostile/netherworld/blankbody/blank
- blank = new(loc)
- blank.name = "[M]"
- blank.desc = "It's [M], but [M.p_their()] flesh has an ashy texture, and [M.p_their()] face is featureless save an eerie smile."
- src.visible_message("[M] reemerges from the link!")
- qdel(M)
diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
index cad59e7369b..f957018dfad 100644
--- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
@@ -25,7 +25,6 @@
attack_sound = 'sound/weapons/punch1.ogg'
ventcrawler = VENTCRAWLER_ALWAYS
unique_name = TRUE
- gold_core_spawnable = HOSTILE_SPAWN
faction = list("rat")
var/datum/action/cooldown/coffer
var/datum/action/cooldown/riot
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
index 4f671f37ac6..2a3c67f1d18 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -36,7 +36,7 @@
//Space bats need no air to fly in.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
/mob/living/simple_animal/hostile/retaliate/bat/Initialize()
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index 75610b382cb..220f4dab979 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -29,7 +29,6 @@
del_on_death = 1
loot = list(/obj/effect/mob_spawn/human/clown/corpse)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 270
maxbodytemp = 370
unsuitable_atmos_damage = 10
@@ -56,7 +55,7 @@
. = ..()
if(banana_time && banana_time < world.time)
var/turf/T = get_turf(src)
- var/list/adjacent = T.GetAtmosAdjacentTurfs()
+ var/list/adjacent = T.get_atmos_adjacent_turfs()
new banana_type(pick(adjacent))
banana_time = world.time + rand(30,60)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
index e8bee6661a5..6c23f5cefe2 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
@@ -28,7 +28,6 @@
butcher_results = list(/obj/item/reagent_containers/food/snacks/nugget = 1)
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
- gold_core_spawnable = FRIENDLY_SPAWN
var/stepped_sound = 'sound/effects/huuu.ogg'
/mob/living/simple_animal/hostile/retaliate/frog/Initialize()
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
index 8b9d0d666bf..a3da5b7c5be 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
@@ -25,12 +25,11 @@
speak_emote = list("weeps")
deathmessage = "wails, disintegrating into a pile of ectoplasm!"
loot = list(/obj/item/ectoplasm)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
movement_type = FLYING
pressure_resistance = 300
- gold_core_spawnable = NO_SPAWN //too spooky for science
light_system = MOVABLE_LIGHT
light_range = 1 // same glowing as visible player ghosts
light_power = 2
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
index 80e5968cbc4..ce333d2ef00 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
@@ -51,7 +51,6 @@
faction = list("nanotrasenprivate")
a_intent = INTENT_HARM
loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
status_flags = CANPUSH
search_objects = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
index 3375cd0a726..a40b9043ee6 100644
--- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
@@ -44,7 +44,7 @@
mouse_opacity = MOUSE_OPACITY_ICON
butcher_results = list(/obj/item/stack/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30)
deathmessage = "screeches as its wings turn to dust and it collapses on the floor, life estinguished."
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
faction = list("carp")
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index bac0b4b1d51..b4a70b9c304 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -28,7 +28,7 @@
attack_verb_simple = "claw"
attack_sound = 'sound/hallucinations/growl1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
faction = list("statue")
@@ -49,7 +49,6 @@
move_force = MOVE_FORCE_EXTREMELY_STRONG
move_resist = MOVE_FORCE_EXTREMELY_STRONG
pull_force = MOVE_FORCE_EXTREMELY_STRONG
- gold_core_spawnable = HOSTILE_SPAWN
var/cannot_be_seen = 1
var/mob/living/creator = null
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 41efc6993d9..69e0970e226 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -40,7 +40,6 @@
deathmessage = "is hacked into pieces!"
loot = list(/obj/item/stack/sheet/mineral/wood)
- gold_core_spawnable = HOSTILE_SPAWN
del_on_death = 1
var/is_tree = TRUE
@@ -81,7 +80,7 @@
loot = list(/obj/item/stack/rods)
speak_emote = list("polls")
faction = list()
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
is_tree = FALSE
/mob/living/simple_animal/hostile/tree/festivus/attack_hand(mob/living/carbon/human/M)
diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
index 52ddcc72963..13d8dd57ba4 100644
--- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
@@ -96,7 +96,7 @@
a_intent = INTENT_HARM
ranged_cooldown_time = 45
attack_sound = 'sound/weapons/bladeslice.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
unsuitable_atmos_damage = 0
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
faction = list("hostile","vines","plants")
diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
index b77436c09c8..be3242ed525 100644
--- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
@@ -32,7 +32,6 @@
aggro_vision_range = 9
mob_size = MOB_SIZE_SMALL
environment_smash = ENVIRONMENT_SMASH_NONE
- gold_core_spawnable = HOSTILE_SPAWN
var/wumbo = 0
var/inflate_cooldown = 0
var/datum/action/innate/fugu/expand/E
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index bc22f78ae7a..92b955d3a84 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -64,7 +64,6 @@
friendly_verb_simple = "groom"
mob_size = MOB_SIZE_SMALL
movement_type = FLYING
- gold_core_spawnable = FRIENDLY_SPAWN
var/parrot_damage_upper = 10
var/parrot_state = PARROT_WANDER //Hunt for a perch when created
@@ -260,8 +259,8 @@
switch(ch)
if(RADIO_CHANNEL_NANOTRASEN)
available_channels.Add(RADIO_TOKEN_NANOTRASEN)
- if(RADIO_CHANNEL_COMMAND)
- available_channels.Add(RADIO_TOKEN_COMMAND)
+ if(RADIO_CHANNEL_EMERGENCY)
+ available_channels.Add(RADIO_TOKEN_EMERGENCY)
if(RADIO_CHANNEL_MINUTEMEN)
available_channels.Add(RADIO_TOKEN_MINUTEMEN)
if(RADIO_CHANNEL_INTEQ)
@@ -904,7 +903,6 @@
name = "Polly"
desc = "Polly the Parrot. An expert on quantum cracker theory."
speak = list("Polly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE")
- gold_core_spawnable = NO_SPAWN
speak_chance = 3
var/memory_saved = FALSE
var/rounds_survived = 0
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
deleted file mode 100644
index fcb9274a2c6..00000000000
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ /dev/null
@@ -1,66 +0,0 @@
-/mob/living/simple_animal/shade
- name = "Shade"
- real_name = "Shade"
- desc = "A bound spirit."
- gender = PLURAL
- icon = 'icons/mob/cult.dmi'
- icon_state = "shade"
- icon_living = "shade"
- mob_biotypes = MOB_SPIRIT
- maxHealth = 40
- health = 40
- healable = 0
- speak_emote = list("hisses")
- emote_hear = list("wails.","screeches.")
- response_help_continuous = "puts their hand through"
- response_help_simple = "put your hand through"
- response_disarm_continuous = "flails at"
- response_disarm_simple = "flail at"
- response_harm_continuous = "punches"
- response_harm_simple = "punch"
- speak_chance = 1
- melee_damage_lower = 5
- melee_damage_upper = 12
- attack_verb_continuous = "metaphysically strikes"
- attack_verb_simple = "metaphysically strike"
- minbodytemp = 0
- maxbodytemp = INFINITY
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- stop_automated_movement = 1
- faction = list("cult")
- status_flags = CANPUSH
- movement_type = FLYING
- loot = list(/obj/item/ectoplasm)
- del_on_death = TRUE
- initial_language_holder = /datum/language_holder/construct
-
-/mob/living/simple_animal/shade/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
-
-/mob/living/simple_animal/shade/death()
- deathmessage = "lets out a contented sigh as [p_their()] form unwinds."
- ..()
-
-/mob/living/simple_animal/shade/attack_animal(mob/living/simple_animal/M)
- if(isconstruct(M))
- var/mob/living/simple_animal/hostile/construct/C = M
- if(!C.can_repair_constructs)
- return
- if(health < maxHealth)
- adjustHealth(-25)
- Beam(M,icon_state="sendbeam",time=4)
- M.visible_message(
- "[M] heals \the [src].", \
- "You heal [src], leaving [src] at [health]/[maxHealth] health.")
- else
- to_chat(M, "You cannot heal [src], as [p_theyre()] unharmed!")
- else if(src != M)
- return ..()
-
-/mob/living/simple_animal/shade/attackby(obj/item/O, mob/user, params) //Marker -Agouri
- if(istype(O, /obj/item/soulstone))
- var/obj/item/soulstone/SS = O
- SS.transfer_soul("SHADE", src, user)
- else
- . = ..()
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 3670e14a640..a1a0886a236 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -59,7 +59,7 @@
///Atmos effect - Yes, you can make creatures that require plasma or co2 to survive. N2O is a trace gas and handled separately, hence why it isn't here. It'd be hard to add it. Hard and me don't mix (Yes, yes make all the dick jokes you want with that.) - Errorage
///Leaving something at 0 means it's off - has no maximum.
- var/list/atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ var/list/atmos_requirements = NORMAL_ATMOS_REQS
///This damage is taken when atmos doesn't fit all the requirements above.
var/unsuitable_atmos_damage = 2
@@ -86,7 +86,6 @@
///Set to 1 to allow breaking of crates,lockers,racks,tables; 2 for walls; 3 for Rwalls.
var/environment_smash = ENVIRONMENT_SMASH_NONE
-
///Hot simple_animal baby making vars.
var/list/childtype = null
var/next_scan_time = 0
@@ -98,8 +97,6 @@
var/obj/item/card/id/access_card = null
///In the event that you want to have a buffing effect on the mob, but don't want it to stack with other effects, any outside force that applies a buff to a simple mob should at least set this to 1, so we have something to check against.
var/buffed = 0
- ///If the mob can be spawned with a gold slime core. HOSTILE_SPAWN are spawned with plasma, FRIENDLY_SPAWN are spawned with blood.
- var/gold_core_spawnable = NO_SPAWN
var/datum/component/spawner/nest
@@ -143,8 +140,18 @@
///What kind of footstep this mob should have. Null if it shouldn't have any.
var/footstep_type
+ /// Base armor value on this mob for running armor checks
+ var/datum/armor/armor
+
+
/mob/living/simple_animal/Initialize(mapload)
. = ..()
+ if (islist(armor))
+ armor = getArmor(arglist(armor))
+ else if (!armor)
+ armor = getArmor()
+ else if (!istype(armor, /datum/armor))
+ stack_trace("Invalid type [armor.type] found in .armor during [src.type] Initialize()")
GLOB.simple_animals[AIStatus] += src
if(gender == PLURAL)
gender = pick(MALE,FEMALE)
@@ -173,6 +180,11 @@
return ..()
+/mob/living/simple_animal/getarmor(def_zone, type)
+ if(armor)
+ return armor.getRating(type)
+ return FALSE
+
/mob/living/simple_animal/attackby(obj/item/O, mob/user, params)
if(!is_type_in_list(O, food_type))
..()
@@ -466,7 +478,7 @@
return //we never mate when not alone, so just abort early
if(alone && partner && children < 3)
- var/childspawn = pickweight(childtype)
+ var/childspawn = pick_weight(childtype)
var/turf/target = get_turf(loc)
if(target)
return new childspawn(target)
@@ -630,30 +642,29 @@
GLOB.simple_animals[togglestatus] += list(src)
AIStatus = togglestatus
- var/virt_z = "[virtual_z()]"
+ var/virt_z = virtual_z()
if(!virt_z)
return
switch(togglestatus)
if(AI_Z_OFF)
- LAZYADDASSOCLIST(SSidlenpcpool.idle_mobs_by_virtual_level, virt_z, src)
-
+ LAZYADDASSOCLIST(SSidlenpcpool.idle_mobs_by_virtual_level, "[virt_z]", src)
else
- LAZYREMOVEASSOC(SSidlenpcpool.idle_mobs_by_virtual_level, virt_z, src)
+ LAZYREMOVEASSOC(SSidlenpcpool.idle_mobs_by_virtual_level, "[virt_z]", src)
/mob/living/simple_animal/proc/check_should_sleep()
if (pulledby || shouldwakeup)
toggle_ai(AI_ON)
return
- var/virt_z = "[virtual_z()]"
- if(!virt_z)
- return
- var/players_on_virtual_z = LAZYACCESS(SSmobs.players_by_virtual_z, virt_z)
- if(!length(players_on_virtual_z))
- toggle_ai(AI_Z_OFF)
- else if(AIStatus == AI_Z_OFF)
- toggle_ai(AI_ON)
+ var/virt_z = virtual_z()
+ var/players_on_virtual_z = 0
+ if(virt_z)
+ players_on_virtual_z = LAZYACCESS(SSmobs.players_by_virtual_z, "[virt_z]")
+ if(!length(players_on_virtual_z))
+ toggle_ai(AI_Z_OFF)
+ else if(AIStatus == AI_Z_OFF)
+ toggle_ai(AI_ON)
/mob/living/simple_animal/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
. = ..()
@@ -665,6 +676,7 @@
. = ..()
if(previous_virtual_z)
LAZYREMOVEASSOC(SSidlenpcpool.idle_mobs_by_virtual_level, "[previous_virtual_z]", src)
- toggle_ai(initial(AIStatus))
+ if(QDELETED(src))
+ return
if(new_virtual_z)
check_should_sleep()
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index b880704c9bf..19eaa5a6f91 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -193,7 +193,7 @@
C.adjustCloneLoss(rand(2,4))
C.adjustToxLoss(rand(1,2))
- if(prob(10) && C.client)
+ if(prob(10) && C.client && !HAS_TRAIT(C, TRAIT_ANALGESIA))
to_chat(C, "[pick("You can feel your body becoming weak!", \
"You feel like you're about to die!", \
"You feel every part of your body screaming in agony!", \
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index cb4b7698356..56478ebc785 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -24,7 +24,7 @@
bubble_icon = "slime"
initial_language_holder = /datum/language_holder/slime
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
maxHealth = 150
health = 150
@@ -43,7 +43,6 @@
// for the sake of cleanliness, though, here they are.
status_flags = CANUNCONSCIOUS|CANPUSH
- var/cores = 1 // the number of /obj/item/slime_extract's the slime has left inside
var/mutation_chance = 30 // Chance of mutating, should be between 25 and 35
var/powerlevel = 0 // 1-10 controls how much electricity they are generating
@@ -71,7 +70,6 @@
///////////TIME FOR SUBSPECIES
var/colour = "grey"
- var/coretype = /obj/item/slime_extract/grey
var/list/slime_mutation[4]
var/static/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
@@ -79,13 +77,6 @@
"gold", "green", "adamantine", "oil", "light pink", "bluespace",
"cerulean", "sepia", "black", "pyrite")
- ///////////CORE-CROSSING CODE
-
- var/effectmod //What core modification is being used.
- var/crossbreed_modifier = 1 // modifies how many extracts are needed
- var/applied = 0 //How many extracts of the modtype have been applied.
-
-
/mob/living/simple_animal/slime/Initialize(mapload, new_colour="grey", new_is_adult=FALSE)
var/datum/action/innate/slime/feed/F = new
F.Grant(src)
@@ -119,8 +110,6 @@
colour = new_colour
update_name()
slime_mutation = mutation_table(colour)
- var/sanitizedcolour = replacetext(colour, " ", "")
- coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]")
regenerate_icons()
/mob/living/simple_animal/slime/update_name()
@@ -354,50 +343,9 @@
force_effect = round(W.force/2)
if(prob(10 + force_effect))
discipline_slime(user)
- if(istype(W, /obj/item/storage/bag/bio))
- var/obj/item/storage/P = W
- if(!effectmod)
- to_chat(user, "The slime is not currently being mutated.")
- return
- var/hasOutput = FALSE //Have we outputted text?
- var/hasFound = FALSE //Have we found an extract to be added?
- for(var/obj/item/slime_extract/S in P.contents)
- if(S.effectmod == effectmod)
- SEND_SIGNAL(P, COMSIG_TRY_STORAGE_TAKE, S, get_turf(src), TRUE)
- qdel(S)
- applied++
- hasFound = TRUE
- if(applied >= (SLIME_EXTRACT_CROSSING_REQUIRED * crossbreed_modifier))
- to_chat(user, "You feed the slime as many of the extracts from the bag as you can, and it mutates!")
- playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
- spawn_corecross()
- hasOutput = TRUE
- break
- if(!hasOutput)
- if(!hasFound)
- to_chat(user, "There are no extracts in the bag that this slime will accept!")
- else
- to_chat(user, "You feed the slime some extracts from the bag.")
- playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
return
..()
-/mob/living/simple_animal/slime/proc/spawn_corecross()
- var/static/list/crossbreeds = subtypesof(/obj/item/slimecross)
- visible_message("[src] shudders, its mutated core consuming the rest of its body!")
- playsound(src, 'sound/magic/smoke.ogg', 50, TRUE)
- var/crosspath
- for(var/X in crossbreeds)
- var/obj/item/slimecross/S = X
- if(initial(S.colour) == colour && initial(S.effect) == effectmod)
- crosspath = S
- break
- if(crosspath)
- new crosspath(loc)
- else
- visible_message("The mutated core shudders, and collapses into a puddle, unable to maintain its form.")
- qdel(src)
-
/mob/living/simple_animal/slime/proc/apply_water()
adjustBruteLoss(rand(15,20))
if(!client)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 06c7a9af52d..d56560a5acb 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -313,6 +313,14 @@
/mob/proc/get_item_by_slot(slot_id)
return null
+/// Gets what slot the item on the mob is held in.
+/// Returns null if the item isn't in any slots on our mob.
+/// Does not check if the passed item is null, which may result in unexpected outcoms.
+/mob/proc/get_slot_by_item(obj/item/looking_for)
+ if(looking_for in held_items)
+ return ITEM_SLOT_HANDS
+
+ return null
///Is the mob incapacitated
/mob/proc/incapacitated(ignore_restraints = FALSE, ignore_grab = FALSE, check_immobilized = FALSE)
@@ -444,8 +452,6 @@
else
client.eye = client.mob
client.perspective = MOB_PERSPECTIVE
- else
- //Do nothing
else
//Reset to common defaults: mob if on turf, otherwise current loc
if(isturf(loc))
@@ -454,7 +460,7 @@
else
client.perspective = EYE_PERSPECTIVE
client.eye = loc
- return 1
+ return TRUE
/// Show the mob's inventory to another mob
/mob/proc/show_inv(mob/user)
@@ -496,10 +502,13 @@
handle_eye_contact(examinify)
else
result = examinify.examine_more(src)
+
+ if(!LAZYLEN(result))
+ result = list(span_notice("You examine [examinify] closer, but find nothing of interest..."))
else
result = examinify.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist?
- if(result.len)
+ if(length(result))
for(var/i in 1 to (length(result) - 1))
result[i] += "\n"
@@ -529,9 +538,9 @@
visible_message(" [name] begins feeling around for \the [examined_thing.name]...")
/// how long it takes for the blind person to find the thing they're examining
- var/examine_delay_length = rand(1 SECONDS, 2 SECONDS)
+ var/examine_delay_length = rand(0.5 SECONDS, 1 SECONDS)
if(client?.recent_examines && client?.recent_examines[examined_thing]) //easier to find things we just touched
- examine_delay_length = 0.5 SECONDS
+ examine_delay_length = 0.25 SECONDS
else if(isobj(examined_thing))
examine_delay_length *= 1.5
else if(ismob(examined_thing) && examined_thing != src)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index de1cb857ed4..7848b9cbff0 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -28,6 +28,45 @@
zone = BODY_ZONE_CHEST
return zone
+/// Returns a generic path of the object based on the slot
+/proc/get_path_by_slot(slot_id)
+ switch(slot_id)
+ if(ITEM_SLOT_BACK)
+ return /obj/item/storage/backpack
+ if(ITEM_SLOT_MASK)
+ return /obj/item/clothing/mask
+ if(ITEM_SLOT_NECK)
+ return /obj/item/clothing/neck
+ if(ITEM_SLOT_HANDCUFFED)
+ return /obj/item/restraints/handcuffs
+ if(ITEM_SLOT_LEGCUFFED)
+ return /obj/item/restraints/legcuffs
+ if(ITEM_SLOT_BELT)
+ return /obj/item/storage/belt
+ if(ITEM_SLOT_ID)
+ return /obj/item/card/id
+ if(ITEM_SLOT_EARS)
+ return /obj/item/clothing/ears
+ if(ITEM_SLOT_EYES)
+ return /obj/item/clothing/glasses
+ if(ITEM_SLOT_GLOVES)
+ return /obj/item/clothing/gloves
+ if(ITEM_SLOT_HEAD)
+ return /obj/item/clothing/head
+ if(ITEM_SLOT_FEET)
+ return /obj/item/clothing/shoes
+ if(ITEM_SLOT_OCLOTHING)
+ return /obj/item/clothing/suit
+ if(ITEM_SLOT_ICLOTHING)
+ return /obj/item/clothing/under
+ if(ITEM_SLOT_LPOCKET)
+ return /obj/item
+ if(ITEM_SLOT_RPOCKET)
+ return /obj/item
+ if(ITEM_SLOT_SUITSTORE)
+ return /obj/item
+ return null
+
/**
* Return the zone or randomly, another valid zone
*
@@ -38,7 +77,7 @@
if(prob(probability))
zone = check_zone(zone)
else
- zone = pickweight(list(BODY_ZONE_HEAD = 1, BODY_ZONE_CHEST = 1, BODY_ZONE_L_ARM = 4, BODY_ZONE_R_ARM = 4, BODY_ZONE_L_LEG = 4, BODY_ZONE_R_LEG = 4))
+ zone = pick_weight(list(BODY_ZONE_HEAD = 1, BODY_ZONE_CHEST = 1, BODY_ZONE_L_ARM = 4, BODY_ZONE_R_ARM = 4, BODY_ZONE_L_LEG = 4, BODY_ZONE_R_LEG = 4))
return zone
///Would this zone be above the neck
@@ -95,11 +134,6 @@
newletter = "oo"
else if(lowerletter == "c")
newletter = "k"
- if(rand(1, 20) == 20)
- if(newletter == " ")
- newletter = "...huuuhhh..."
- else if(newletter == ".")
- newletter = " *BURP*."
switch(rand(1, 20))
if(1)
newletter += "'"
@@ -108,7 +142,7 @@
if(20)
newletter += "[newletter][newletter]"
else
- // do nothing
+ EMPTY_BLOCK_GUARD
. += "[newletter]"
return sanitize(.)
@@ -153,7 +187,7 @@
if(5)
newletter = "glor"
else
- // do nothing
+ EMPTY_BLOCK_GUARD
. += newletter
return sanitize(.)
@@ -169,13 +203,9 @@
var/static/regex/nostutter = regex(@@[aeiouAEIOU "'()[\]{}.!?,:;_`~-]@)
for(var/i = 1, i <= leng, i += length(rawchar))
rawchar = newletter = phrase[i]
- if(prob(80) && !nostutter.Find(rawchar))
- if(prob(10))
- newletter = "[newletter]-[newletter]-[newletter]-[newletter]"
- else if(prob(20))
+ if(prob(70) && !nostutter.Find(rawchar))
+ if(prob(25))
newletter = "[newletter]-[newletter]-[newletter]"
- else if (prob(5))
- newletter = ""
else
newletter = "[newletter]-[newletter]"
. += newletter
@@ -344,9 +374,6 @@
return FALSE
if(M.mind && M.mind.special_role)//If they have a mind and special role, they are some type of traitor or antagonist.
switch(SSticker.mode.config_tag)
- if("cult")
- if(M.mind in SSticker.mode.cult)
- return 2
if("nuclear")
if(M.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE))
return 2
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 59b64f63d13..ef21915e1fc 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -507,13 +507,6 @@
. = new_slime
qdel(src)
-/mob/proc/become_overmind(starting_points = 60)
- var/mob/camera/blob/B = new /mob/camera/blob(get_turf(src), starting_points)
- B.key = key
- . = B
- qdel(src)
-
-
/mob/living/carbon/human/proc/corgize()
if (notransform)
return
@@ -624,9 +617,6 @@
if(!MP)
return 0 //Sanity, this should never happen.
- if(ispath(MP, /mob/living/simple_animal/hostile/construct))
- return 0 //Verbs do not appear for players.
-
//Good mobs!
if(ispath(MP, /mob/living/simple_animal/pet/cat))
return 1
@@ -638,8 +628,6 @@
return 1
if(ispath(MP, /mob/living/simple_animal/hostile/mushroom))
return 1
- if(ispath(MP, /mob/living/simple_animal/shade))
- return 1
if(ispath(MP, /mob/living/simple_animal/hostile/killertomato))
return 1
if(ispath(MP, /mob/living/simple_animal/mouse))
diff --git a/code/modules/mob_spawner/burrow.dm b/code/modules/mob_spawner/burrow.dm
new file mode 100644
index 00000000000..f8d4c31bc87
--- /dev/null
+++ b/code/modules/mob_spawner/burrow.dm
@@ -0,0 +1,109 @@
+GLOBAL_LIST_INIT(ore_probability, list(
+ /obj/item/stack/ore/plasma = 75,
+ /obj/item/stack/ore/iron = 75,
+ /obj/item/stack/ore/titanium = 50,
+ /obj/item/stack/ore/silver = 50,
+ /obj/item/stack/ore/gold = 50,
+ /obj/item/stack/ore/uranium = 50,
+ /obj/item/stack/ore/diamond = 25,
+ /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 25,
+ /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 25,
+ /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 25
+ ))
+
+/obj/structure/spawner/burrow
+ name = "burrow entrance"
+ desc = "A hole in the ground, filled with fauna ready to defend it."
+ max_integrity = 250
+ faction = list("mining")
+ max_mobs = 3
+
+/obj/structure/spawner/burrow/Initialize()
+ . = ..()
+ clear_rock()
+
+/**
+ * Clears rocks around the spawner when it is created
+ *
+ */
+/obj/structure/spawner/burrow/proc/clear_rock()
+ for(var/turf/F in RANGE_TURFS(2, src))
+ if(abs(src.x - F.x) + abs(src.y - F.y) > 3)
+ continue
+ if(ismineralturf(F))
+ var/turf/closed/mineral/M = F
+ M.ScrapeAway(null, CHANGETURF_IGNORE_AIR)
+
+/obj/structure/spawner/burrow/deconstruct(disassembled)
+ destroy_effect()
+ drop_loot()
+ return ..()
+
+/**
+ * Effects and messages created when the spawner is destroyed
+ *
+ */
+/obj/structure/spawner/burrow/proc/destroy_effect()
+ playsound(loc,'sound/effects/explosionfar.ogg', 200, TRUE)
+ visible_message("[src] collapses, sealing everything inside!\nOres fall out of the burrow as it is destroyed!")
+
+/**
+ * Drops items after the spawner is destroyed
+ *
+ */
+/obj/structure/spawner/burrow/proc/drop_loot()
+ for(var/type in GLOB.ore_probability)
+ var/chance = GLOB.ore_probability[type]
+ if(!prob(chance))
+ continue
+ new type(loc, rand(5, 10))
+
+/obj/structure/spawner/burrow/lava_planet
+ mob_types = list(
+ /mob/living/simple_animal/hostile/asteroid/goliath/beast/nest = 27,
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest = 26,
+ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/nest = 26,
+ /mob/living/simple_animal/hostile/asteroid/brimdemon = 20,
+ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing = 1
+ )
+
+/obj/structure/spawner/burrow/sand_planet
+ mob_types = list(
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest = 40,
+ /mob/living/simple_animal/hostile/asteroid/basilisk/whitesands = 40,
+ /mob/living/simple_animal/hostile/asteroid/goliath/beast/nest = 20
+ )
+
+/obj/structure/spawner/burrow/ice_planet
+ mob_types = list(
+ /mob/living/simple_animal/hostile/asteroid/wolf,
+ /mob/living/simple_animal/hostile/asteroid/polarbear
+ )
+
+/obj/structure/spawner/burrow/ice_planet/hard
+ mob_types = list(
+ /mob/living/simple_animal/hostile/asteroid/brimdemon = 35,
+ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/nest = 35,
+ /mob/living/simple_animal/hostile/asteroid/ice_whelp = 15,
+ /mob/living/simple_animal/hostile/asteroid/ice_demon = 15
+ )
+
+/obj/structure/spawner/burrow/jungle_planet
+ mob_types = list(
+ /mob/living/simple_animal/hostile/asteroid/wolf/random,
+ /mob/living/simple_animal/hostile/retaliate/bat,
+ /mob/living/simple_animal/hostile/retaliate/poison/snake
+ )
+
+/obj/structure/spawner/burrow/rock_plant
+ mob_types = list(
+ /mob/living/simple_animal/hostile/asteroid/goliath/beast/rockplanet,
+ /mob/living/simple_animal/hostile/asteroid/elite/broodmother_child/rockplanet
+ )
+
+/obj/structure/spawner/burrow/asteroid
+ mob_types = list (
+ /mob/living/simple_animal/hostile/asteroid/goliath,
+ /mob/living/simple_animal/hostile/asteroid/hivelord,
+ /mob/living/simple_animal/hostile/carp
+ )
diff --git a/code/modules/mob_spawner/hivebot.dm b/code/modules/mob_spawner/hivebot.dm
new file mode 100644
index 00000000000..61c3d477745
--- /dev/null
+++ b/code/modules/mob_spawner/hivebot.dm
@@ -0,0 +1,51 @@
+/obj/structure/spawner/hivebot
+ name = "hivebot fabricator"
+ desc = "An active fabrication plant, electrical tendrils reaching into the ground searching for scrap metals, a hunger permeating the world around it."
+
+ icon = 'icons/obj/machines/bsm.dmi'
+ icon_state = "bsm_on"
+
+ faction = list("hivebot")
+ max_integrity = 250
+ mob_types = list(
+ /mob/living/simple_animal/hostile/hivebot = 40,
+ /mob/living/simple_animal/hostile/hivebot/ranged = 40,
+ /mob/living/simple_animal/hostile/hivebot/ranged/rapid = 10,
+ /mob/living/simple_animal/hostile/hivebot/strong = 5,
+ /mob/living/simple_animal/hostile/hivebot/mechanic = 5,
+ /mob/living/simple_animal/hostile/hivebot/defender = 1,
+ )
+ spawn_text = "emerges from within"
+ spawn_sound = list('sound/effects/suitstep2.ogg')
+ resistance_flags = FIRE_PROOF | LAVA_PROOF
+ var/obj/effect/light_emitter/hivespawner/emitted_light
+
+/obj/structure/spawner/hivebot/Initialize()
+ . = ..()
+ emitted_light = new(loc)
+
+/obj/structure/spawner/hivebot/deconstruct(disassembled)
+ destroy_effect()
+ drop_loot()
+ return ..()
+
+/obj/structure/spawner/hivebot/Destroy()
+ QDEL_NULL(emitted_light)
+ return ..()
+
+/obj/structure/spawner/hivebot/proc/destroy_effect()
+ playsound(loc,'sound/effects/explosionfar.ogg', 200, TRUE)
+ visible_message(span_boldannounce("[src] begins to rattle and shake, sparks flying off of it!"))
+
+
+/obj/structure/spawner/hivebot/proc/drop_loot()
+ var/datum/effect_system/smoke_spread/smoke = new
+ smoke.set_up(2, loc)
+ smoke.start()
+ new /obj/effect/particle_effect/sparks(loc)
+ new /obj/effect/spawner/random/waste/hivebot/beacon(loc)
+
+/obj/effect/light_emitter/hivespawner
+ set_luminosity = 4
+ set_cap = 2.5
+ light_color = COLOR_RED_LIGHT
diff --git a/code/modules/mob_spawner/spawner.dm b/code/modules/mob_spawner/spawner.dm
new file mode 100644
index 00000000000..f5cfdadd0e9
--- /dev/null
+++ b/code/modules/mob_spawner/spawner.dm
@@ -0,0 +1,40 @@
+/obj/structure/spawner
+ name = "monster nest"
+ icon = 'icons/mob/nest.dmi'
+ icon_state = "hole"
+ max_integrity = 100
+
+ move_resist = INFINITY
+ anchored = TRUE
+ density = TRUE
+
+ var/max_mobs = 5
+ var/spawn_time = 300 //30 seconds default
+ var/mob_types = list(/mob/living/simple_animal/hostile/carp)
+ var/spawn_text = "emerges from"
+ var/faction = list("hostile")
+ var/spawn_sound = list('sound/effects/break_stone.ogg')
+ var/spawner_type = /datum/component/spawner
+ var/spawn_distance_min = 1
+ var/spawn_distance_max = 1
+
+/obj/structure/spawner/Initialize()
+ . = ..()
+ AddComponent(spawner_type, mob_types, spawn_time, faction, spawn_text, max_mobs, spawn_sound, spawn_distance_min, spawn_distance_max)
+
+/obj/structure/spawner/attack_animal(mob/living/simple_animal/M)
+ if(faction_check(faction, M.faction, FALSE)&&!M.client)
+ return
+ ..()
+
+/obj/structure/spawner/carp
+ name = "carp spawn" //the non game spawn meaning
+ desc = "A puddle, which appears to be full of carp"
+ icon_state = "puddle"
+ icon = 'icons/obj/watercloset.dmi'
+ max_integrity = 150
+ max_mobs = 5
+ spawn_time = 1200
+ mob_types = list(/mob/living/simple_animal/hostile/carp)
+ spawn_text = "swims out of"
+ faction = list("carp")
diff --git a/code/datums/components/spawner.dm b/code/modules/mob_spawner/spawner_componet.dm
similarity index 98%
rename from code/datums/components/spawner.dm
rename to code/modules/mob_spawner/spawner_componet.dm
index aab5bb6ea08..637423f0b1e 100644
--- a/code/datums/components/spawner.dm
+++ b/code/modules/mob_spawner/spawner_componet.dm
@@ -14,7 +14,6 @@
var/wave_timer
var/current_timerid
-
/datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs, _spawn_sound, _spawn_distance_min, _spawn_distance_max, _wave_length, _wave_downtime)
if(_spawn_time)
spawn_time=_spawn_time
@@ -115,7 +114,7 @@
spot = pick(peel)
else
spot = pick(circleviewturfs(origin, spawn_distance_max))
- var/chosen_mob_type = pickweight(mob_types)
+ var/chosen_mob_type = pick_weight(mob_types)
var/mob/living/simple_animal/L = new chosen_mob_type(spot)
L.flags_1 |= (P.flags_1 & ADMIN_SPAWNED_1)
spawned_mobs += L
diff --git a/code/modules/mod/mod_actions.dm b/code/modules/mod/mod_actions.dm
new file mode 100644
index 00000000000..1df1f7b8894
--- /dev/null
+++ b/code/modules/mod/mod_actions.dm
@@ -0,0 +1,193 @@
+/datum/action/item_action/mod
+ background_icon_state = "bg_tech_blue"
+ icon_icon = 'icons/mob/actions/actions_mod.dmi'
+ check_flags = AB_CHECK_CONSCIOUS
+ /// Whether this action is intended for the AI. Stuff breaks a lot if this is done differently.
+ var/ai_action = FALSE
+
+/datum/action/item_action/mod/New(Target)
+ ..()
+ if(!istype(Target, /obj/item/mod/control))
+ qdel(src)
+ return
+ if(ai_action)
+ background_icon_state = ACTION_BUTTON_DEFAULT_BACKGROUND
+
+/datum/action/item_action/mod/Grant(mob/user)
+ var/obj/item/mod/control/mod = target
+ if(ai_action && user != mod.ai)
+ return
+ else if(!ai_action && user == mod.ai)
+ return
+ return ..()
+
+/datum/action/item_action/mod/Remove(mob/user)
+ var/obj/item/mod/control/mod = target
+ if(ai_action && user != mod.ai)
+ return
+ else if(!ai_action && user == mod.ai)
+ return
+ return ..()
+
+/datum/action/item_action/mod/Trigger(trigger_flags)
+ if(!IsAvailable())
+ return FALSE
+ var/obj/item/mod/control/mod = target
+ if(mod.malfunctioning && prob(75))
+ mod.balloon_alert(usr, "button malfunctions!")
+ return FALSE
+ return TRUE
+
+/datum/action/item_action/mod/deploy
+ name = "Deploy MODsuit"
+ desc = "LMB: Deploy/Undeploy part. Alt Click: Deploy/Undeploy full suit."
+ button_icon_state = "deploy"
+
+/datum/action/item_action/mod/deploy/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ var/obj/item/mod/control/mod = target
+ if(trigger_flags & TRIGGER_SECONDARY_ACTION)
+ mod.quick_deploy(usr)
+ else
+ mod.choose_deploy(usr)
+
+/datum/action/item_action/mod/deploy/ai
+ ai_action = TRUE
+
+/datum/action/item_action/mod/activate
+ name = "Activate MODsuit"
+ desc = "LMB: Activate/Deactivate suit with prompt. Alt Click: Activate/Deactivate suit skipping prompt."
+ button_icon_state = "activate"
+ /// First time clicking this will set it to TRUE, second time will activate it.
+ var/ready = FALSE
+
+/datum/action/item_action/mod/activate/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ if(!(trigger_flags & TRIGGER_SECONDARY_ACTION) && !ready)
+ ready = TRUE
+ button_icon_state = "activate-ready"
+ if(!ai_action)
+ background_icon_state = "bg_tech"
+ UpdateButtonIcon()
+ addtimer(CALLBACK(src, PROC_REF(reset_ready)), 3 SECONDS)
+ return
+ var/obj/item/mod/control/mod = target
+ reset_ready()
+ mod.toggle_activate(usr)
+
+/// Resets the state requiring to be doubleclicked again.
+/datum/action/item_action/mod/activate/proc/reset_ready()
+ ready = FALSE
+ button_icon_state = initial(button_icon_state)
+ if(!ai_action)
+ background_icon_state = initial(background_icon_state)
+ UpdateButtonIcon()
+
+/datum/action/item_action/mod/activate/ai
+ ai_action = TRUE
+
+/datum/action/item_action/mod/module
+ name = "Toggle Module"
+ desc = "Toggle a MODsuit module."
+ button_icon_state = "module"
+
+/datum/action/item_action/mod/module/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ var/obj/item/mod/control/mod = target
+ mod.quick_module(usr)
+
+/datum/action/item_action/mod/module/ai
+ ai_action = TRUE
+
+/datum/action/item_action/mod/panel
+ name = "MODsuit Panel"
+ desc = "Open the MODsuit's panel."
+ button_icon_state = "panel"
+
+/datum/action/item_action/mod/panel/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ var/obj/item/mod/control/mod = target
+ mod.ui_interact(usr)
+
+/datum/action/item_action/mod/panel/ai
+ ai_action = TRUE
+
+/datum/action/item_action/mod/pinned_module
+ desc = "Activate the module."
+ /// Overrides the icon applications.
+ var/override = FALSE
+ /// Module we are linked to.
+ var/obj/item/mod/module/module
+ /// A ref to the mob we are pinned to.
+ var/pinner_ref
+
+/datum/action/item_action/mod/pinned_module/New(Target, obj/item/mod/module/linked_module, mob/user)
+ if(isAI(user))
+ ai_action = TRUE
+ ..()
+ module = linked_module
+ name = "Activate [capitalize(linked_module.name)]"
+ desc = "Quickly activate [linked_module]."
+ icon_icon = linked_module.icon
+ button_icon_state = linked_module.icon_state
+ RegisterSignal(linked_module, COMSIG_MODULE_ACTIVATED, PROC_REF(on_module_activate))
+ RegisterSignal(linked_module, COMSIG_MODULE_DEACTIVATED, PROC_REF(on_module_deactivate))
+ RegisterSignal(linked_module, COMSIG_MODULE_USED, PROC_REF(on_module_use))
+
+/datum/action/item_action/mod/pinned_module/Destroy()
+ module.pinned_to -= pinner_ref
+ module = null
+ return ..()
+
+/datum/action/item_action/mod/pinned_module/Grant(mob/user)
+ var/user_ref = REF(user)
+ if(!pinner_ref)
+ pinner_ref = user_ref
+ module.pinned_to[pinner_ref] = src
+ else if(pinner_ref != user_ref)
+ return
+ return ..()
+
+/datum/action/item_action/mod/pinned_module/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ module.on_select()
+
+/datum/action/item_action/mod/pinned_module/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force)
+ . = ..(current_button, force = TRUE)
+ if(override)
+ return
+ var/obj/item/mod/control/mod = target
+ if(module == mod.selected_module)
+ current_button.add_overlay(image(icon = 'icons/hud/radial.dmi', icon_state = "module_selected", layer = FLOAT_LAYER-0.1))
+ else if(module.active)
+ current_button.add_overlay(image(icon = 'icons/hud/radial.dmi', icon_state = "module_active", layer = FLOAT_LAYER-0.1))
+ if(!COOLDOWN_FINISHED(module, cooldown_timer))
+ var/image/cooldown_image = image(icon = 'icons/hud/radial.dmi', icon_state = "module_cooldown")
+ current_button.add_overlay(cooldown_image)
+ addtimer(CALLBACK(current_button, TYPE_PROC_REF(/image, cut_overlay), cooldown_image), COOLDOWN_TIMELEFT(module, cooldown_timer))
+
+
+/datum/action/item_action/mod/pinned_module/proc/on_module_activate(datum/source)
+ SIGNAL_HANDLER
+
+ UpdateButtonIcon()
+
+/datum/action/item_action/mod/pinned_module/proc/on_module_deactivate(datum/source)
+ SIGNAL_HANDLER
+
+ UpdateButtonIcon()
+
+/datum/action/item_action/mod/pinned_module/proc/on_module_use(datum/source)
+ SIGNAL_HANDLER
+
+ UpdateButtonIcon()
diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm
new file mode 100644
index 00000000000..cb61728f2cb
--- /dev/null
+++ b/code/modules/mod/mod_activation.dm
@@ -0,0 +1,244 @@
+#define MOD_ACTIVATION_STEP_FLAGS IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM|IGNORE_INCAPACITATED
+
+/// Creates a radial menu from which the user chooses parts of the suit to deploy/retract. Repeats until all parts are extended or retracted.
+/obj/item/mod/control/proc/choose_deploy(mob/user)
+ if(!length(mod_parts))
+ return
+ var/list/display_names = list()
+ var/list/items = list()
+ for(var/obj/item/part as anything in mod_parts)
+ display_names[part.name] = REF(part)
+ var/image/part_image = image(icon = part.icon, icon_state = part.icon_state)
+ if(part.loc != src)
+ part_image.underlays += image(icon = 'icons/hud/radial.dmi', icon_state = "module_active")
+ items += list(part.name = part_image)
+ var/pick = show_radial_menu(user, src, items, custom_check = FALSE, require_near = TRUE, tooltips = TRUE)
+ if(!pick)
+ return
+ var/part_reference = display_names[pick]
+ var/obj/item/part = locate(part_reference) in mod_parts
+ if(!istype(part) || user.incapacitated())
+ return
+ if((active && part != helmet) || activating)
+ balloon_alert(user, "deactivate the suit first!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return
+ var/parts_to_check = mod_parts - part
+ if(part.loc == src)
+ deploy(user, part)
+ for(var/obj/item/checking_part as anything in parts_to_check)
+ if(checking_part.loc != src)
+ continue
+ choose_deploy(user)
+ break
+ else
+ retract(user, part)
+ for(var/obj/item/checking_part as anything in parts_to_check)
+ if(checking_part.loc == src)
+ continue
+ choose_deploy(user)
+ break
+
+/// Quickly deploys all parts (or retracts if all are on the wearer)
+/obj/item/mod/control/proc/quick_deploy(mob/user)
+ if(active || activating)
+ balloon_alert(user, "deactivate the suit first!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ var/deploy = FALSE
+ for(var/obj/item/part as anything in mod_parts)
+ if(part.loc != src)
+ continue
+ deploy = TRUE
+ for(var/obj/item/part as anything in mod_parts)
+ if(deploy && part.loc == src)
+ deploy(null, part)
+ else if(!deploy && part.loc != src)
+ retract(null, part)
+ wearer.visible_message(span_notice("[wearer]'s [src] [deploy ? "deploys" : "retracts"] its' parts with a mechanical hiss."),
+ span_notice("[src] [deploy ? "deploys" : "retracts"] its' parts with a mechanical hiss."),
+ span_hear("You hear a mechanical hiss."))
+ playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ return TRUE
+
+/// Deploys a part of the suit onto the user.
+/obj/item/mod/control/proc/deploy(mob/user, obj/item/part)
+ if(part.loc != src)
+ if(!user)
+ return FALSE
+ balloon_alert(user, "[part.name] already deployed!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ if(part in overslotting_parts)
+ var/obj/item/overslot = wearer.get_item_by_slot(part.slot_flags)
+ if(overslot)
+ overslotting_parts[part] = overslot
+ wearer.transferItemToLoc(overslot, part, force = TRUE)
+ RegisterSignal(part, COMSIG_ATOM_EXITED, PROC_REF(on_overslot_exit))
+ if(wearer.equip_to_slot_if_possible(part, part.slot_flags, qdel_on_fail = FALSE, disable_warning = TRUE))
+ ADD_TRAIT(part, TRAIT_NODROP, MOD_TRAIT)
+ if(!user)
+ return TRUE
+ wearer.visible_message(span_notice("[wearer]'s [part.name] deploy[part.p_s()] with a mechanical hiss."),
+ span_notice("[part] deploy[part.p_s()] with a mechanical hiss."),
+ span_hear("You hear a mechanical hiss."))
+ playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ return TRUE
+ else
+ if(!user)
+ return FALSE
+ balloon_alert(user, "bodypart clothed!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+
+/// Retract a part of the suit from the user.
+/obj/item/mod/control/proc/retract(mob/user, obj/item/part)
+ if(part.loc == src)
+ if(!user)
+ return FALSE
+ balloon_alert(user, "[part.name] already retracted!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ REMOVE_TRAIT(part, TRAIT_NODROP, MOD_TRAIT)
+ wearer.transferItemToLoc(part, src, force = TRUE)
+ if(overslotting_parts[part])
+ UnregisterSignal(part, COMSIG_ATOM_EXITED)
+ var/obj/item/overslot = overslotting_parts[part]
+ if(!wearer.equip_to_slot_if_possible(overslot, overslot.slot_flags, qdel_on_fail = FALSE, disable_warning = TRUE))
+ wearer.dropItemToGround(overslot, force = TRUE, silent = TRUE)
+ overslotting_parts[part] = null
+ if(!user)
+ return
+ wearer.visible_message(span_notice("[wearer]'s [part.name] retract[part.p_s()] back into [src] with a mechanical hiss."),
+ span_notice("[part] retract[part.p_s()] back into [src] with a mechanical hiss."),
+ span_hear("You hear a mechanical hiss."))
+ playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+
+/// Starts the activation sequence, where parts of the suit activate one by one until the whole suit is on
+/obj/item/mod/control/proc/toggle_activate(mob/user, force_deactivate = FALSE)
+ if(!wearer)
+ if(!force_deactivate)
+ balloon_alert(user, "put suit on back!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ if(!force_deactivate && (SEND_SIGNAL(src, COMSIG_MOD_ACTIVATE, user) & MOD_CANCEL_ACTIVATE))
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ for(var/obj/item/part as anything in mod_parts)
+ if(!force_deactivate && part.loc == src)
+ balloon_alert(user, "deploy all parts first!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ if(locked && !active && !allowed(user) && !force_deactivate)
+ balloon_alert(user, "access insufficient!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ if(!get_charge() && !force_deactivate)
+ balloon_alert(user, "suit not powered!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ if(open && !force_deactivate)
+ balloon_alert(user, "close the suit panel!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ if(activating)
+ if(!force_deactivate)
+ balloon_alert(user, "suit already [active ? "shutting down" : "starting up"]!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ for(var/obj/item/mod/module/module as anything in modules)
+ if(!module.active || module.allowed_inactive)
+ continue
+ module.on_deactivation(display_message = FALSE)
+ activating = TRUE
+ to_chat(wearer, span_notice("MODsuit [active ? "shutting down" : "starting up"]."))
+ if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, PROC_REF(has_wearer)), hidden = TRUE))
+ to_chat(wearer, span_notice("[boots] [active ? "relax their grip on your legs" : "seal around your feet"]."))
+ playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ seal_part(boots, seal = !active)
+ if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, PROC_REF(has_wearer)), hidden = TRUE))
+ to_chat(wearer, span_notice("[gauntlets] [active ? "become loose around your fingers" : "tighten around your fingers and wrists"]."))
+ playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ seal_part(gauntlets, seal = !active)
+ if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, PROC_REF(has_wearer)), hidden = TRUE))
+ to_chat(wearer, span_notice("[chestplate] [active ? "releases your chest" : "cinches tightly against your chest"]."))
+ playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ seal_part(chestplate, seal = !active)
+ if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, PROC_REF(has_wearer)), hidden = TRUE))
+ to_chat(wearer, span_notice("[helmet] hisses [active ? "open" : "closed"]."))
+ playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ seal_part(helmet, seal = !active)
+ if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, PROC_REF(has_wearer)), hidden = TRUE))
+ to_chat(wearer, span_notice("Systems [active ? "shut down. Parts unsealed. Goodbye" : "started up. Parts sealed. Welcome"], [wearer]."))
+ if(ai)
+ to_chat(ai, span_notice("SYSTEMS [active ? "DEACTIVATED. GOODBYE" : "ACTIVATED. WELCOME"]: \"[ai]\""))
+ finish_activation(on = !active)
+ if(active)
+ playsound(src, 'sound/machines/synth_yes.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, frequency = 6000)
+ if(!malfunctioning)
+ wearer.playsound_local(get_turf(src), 'sound/mecha/nominal.ogg', 50)
+ else
+ playsound(src, 'sound/machines/synth_no.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, frequency = 6000)
+ activating = FALSE
+ return TRUE
+
+///Seals or unseals the given part
+/obj/item/mod/control/proc/seal_part(obj/item/clothing/part, seal)
+ if(seal)
+ part.clothing_flags |= part.visor_flags
+ part.flags_inv |= part.visor_flags_inv
+ part.flags_cover |= part.visor_flags_cover
+ part.heat_protection = initial(part.heat_protection)
+ part.cold_protection = initial(part.cold_protection)
+ part.alternate_worn_layer = null
+ else
+ part.flags_cover &= ~part.visor_flags_cover
+ part.flags_inv &= ~part.visor_flags_inv
+ part.clothing_flags &= ~part.visor_flags
+ part.heat_protection = NONE
+ part.cold_protection = NONE
+ part.alternate_worn_layer = mod_parts[part]
+ if(part == boots)
+ boots.icon_state = "[skin]-boots[seal ? "-sealed" : ""]"
+ wearer.update_inv_shoes()
+ if(part == gauntlets)
+ gauntlets.icon_state = "[skin]-gauntlets[seal ? "-sealed" : ""]"
+ wearer.update_inv_gloves()
+ if(part == chestplate)
+ chestplate.icon_state = "[skin]-chestplate[seal ? "-sealed" : ""]"
+ wearer.update_inv_wear_suit()
+ wearer.update_inv_w_uniform()
+ if(part == helmet)
+ helmet.icon_state = "[skin]-helmet[seal ? "-sealed" : ""]"
+ wearer.update_inv_head()
+ wearer.update_inv_wear_mask()
+ wearer.update_inv_glasses()
+ wearer.update_hair()
+
+/// Finishes the suit's activation, starts processing
+/obj/item/mod/control/proc/finish_activation(on)
+ active = on
+ if(active)
+ for(var/obj/item/mod/module/module as anything in modules)
+ module.on_suit_activation()
+ START_PROCESSING(SSobj, src)
+ else
+ for(var/obj/item/mod/module/module as anything in modules)
+ module.on_suit_deactivation()
+ STOP_PROCESSING(SSobj, src)
+ update_speed()
+ update_icon_state()
+ wearer.update_inv_back(slot_flags)
+
+/// Quickly deploys all the suit parts and if successful, seals them and turns on the suit. Intended mostly for outfits.
+/obj/item/mod/control/proc/quick_activation()
+ var/seal = TRUE
+ for(var/obj/item/part as anything in mod_parts)
+ if(!deploy(null, part))
+ seal = FALSE
+ if(!seal)
+ return
+ for(var/obj/item/part as anything in mod_parts)
+ seal_part(part, seal = TRUE)
+ finish_activation(on = TRUE)
+
+/obj/item/mod/control/proc/has_wearer()
+ return wearer
diff --git a/code/modules/mod/mod_ai.dm b/code/modules/mod/mod_ai.dm
new file mode 100644
index 00000000000..a0571797034
--- /dev/null
+++ b/code/modules/mod/mod_ai.dm
@@ -0,0 +1,125 @@
+/**
+ * Simple proc to insert the pAI into the MODsuit.
+ *
+ * user - The person trying to put the pAI into the MODsuit.
+ * card - The pAI card we're slotting in the MODsuit.
+ */
+
+/obj/item/mod/control/proc/insert_pai(mob/user, obj/item/paicard/card)
+ if(ai)
+ balloon_alert(user, "ai already installed!")
+ return
+ if(!card.pai || !card.pai.mind)
+ balloon_alert(user, "pai unresponsive!")
+ return
+ balloon_alert(user, "transferring to suit...")
+ if(!do_after(user, 5 SECONDS, target = src))
+ balloon_alert(user, "interrupted!")
+ return FALSE
+ if(!user.transferItemToLoc(card, src))
+ return
+
+ card.pai.canholo = FALSE
+ ai = card.pai
+ balloon_alert(user, "pAI transferred to suit")
+ balloon_alert(ai, "transferred to a suit")
+ ai.remote_control = src
+ for(var/datum/action/action as anything in actions)
+ action.Grant(ai)
+ return TRUE
+
+/**
+ * Simple proc to extract the pAI from the MODsuit. It's the proc to call if you want to take it out,
+ * remove_pai() is there so atom_destruction() doesn't have any risk of sleeping.
+ *
+ * user - The person trying to take out the pAI from the MODsuit.
+ * forced - Whether or not we skip the checks and just eject the pAI. Defaults to FALSE.
+ * feedback - Whether to give feedback via balloon alerts or not. Defaults to TRUE.
+ */
+/obj/item/mod/control/proc/extract_pai(mob/user, forced = FALSE, feedback = TRUE)
+ if(!ai)
+ if(user && feedback)
+ balloon_alert(user, "no pAI to remove!")
+ return
+ if(!ispAI(ai))
+ if(user && feedback)
+ balloon_alert(user, "onboard AI cannot fit in this card!")
+ return
+ if(!forced)
+ if(!open)
+ if(user && feedback)
+ balloon_alert(user, "open the suit panel!")
+ return FALSE
+ if(!do_after(user, 5 SECONDS, target = src))
+ if(user && feedback)
+ balloon_alert(user, "interrupted!")
+ return FALSE
+
+ remove_pai(feedback)
+
+ if(feedback && user)
+ balloon_alert(user, "pAI removed from the suit")
+
+/**
+ * Simple proc that handles the safe removal of the pAI from a MOD control unit.
+ *
+ * Arguments:
+ * * feedback - Whether or not we want to give balloon alert feedback to the ai. Defaults to FALSE.
+ */
+/obj/item/mod/control/proc/remove_pai(feedback = FALSE)
+ if(!ispAI(ai))
+ return
+ var/mob/living/silicon/pai/pai = ai
+ var/turf/drop_off = get_turf(src)
+ if(drop_off) // In case there's no drop_off, the pAI will simply get deleted.
+ pai.card.forceMove(drop_off)
+
+ for(var/datum/action/action as anything in actions)
+ if(action.owner == pai)
+ action.Remove(pai)
+
+ if(feedback)
+ balloon_alert(pai, "removed from a suit")
+ pai.remote_control = null
+ pai.canholo = TRUE
+ pai = null
+
+#define MOVE_DELAY 2
+#define WEARER_DELAY 1
+#define LONE_DELAY 5
+#define CELL_PER_STEP (DEFAULT_CHARGE_DRAIN * 2.5)
+#define AI_FALL_TIME (1 SECONDS)
+
+/*obj/item/mod/control/relaymove(mob/user, direction)
+ var/cell = get_cell()
+ if((!active && wearer) || !cell || cell.charge < CELL_PER_STEP || user != ai || !COOLDOWN_FINISHED(src, cooldown_mod_move) || (wearer?.pulledby?.grab_state > GRAB_PASSIVE))
+ return FALSE
+ var/timemodifier = MOVE_DELAY * (ISDIAGONALDIR(direction) ? SQRT_2 : 1) * (wearer ? WEARER_DELAY : LONE_DELAY)
+ if(wearer && !wearer.Process_Spacemove(direction))
+ return FALSE
+ else if(!wearer && (!has_gravity() || !isturf(loc)))
+ return FALSE
+ COOLDOWN_START(src, cooldown_mod_move, movedelay * timemodifier + slowdown)
+ cell.charge = max(0, cell.charge - CELL_PER_STEP)
+ playsound(src, 'sound/mecha/mechmove01.ogg', 25, TRUE)
+ if(ismovable(wearer?.loc))
+ return wearer.loc.relaymove(wearer, direction)
+ else if(wearer)
+
+ var/atom/movable/mover = wearer || src
+ return step(mover, direction)
+
+#undef MOVE_DELAY
+#undef WEARER_DELAY
+#undef LONE_DELAY
+#undef CELL_PER_STEP
+#undef AI_FALL_TIME
+
+ return
+ REMOVE_TRAIT(wearer, TRAIT_MOBILITY_NOREST, MOD_TRAIT)
+
+/obj/item/mod/control/ui_state(mob/user)
+ if(user == ai)
+ return GLOB.contained_state
+ return ..()
+*/
diff --git a/code/modules/mod/mod_clothes.dm b/code/modules/mod/mod_clothes.dm
new file mode 100644
index 00000000000..7a9e710c938
--- /dev/null
+++ b/code/modules/mod/mod_clothes.dm
@@ -0,0 +1,56 @@
+/obj/item/clothing/head/mod
+ name = "MOD helmet"
+ desc = "A helmet for a MODsuit."
+ icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
+ icon_state = "standard-helmet"
+ base_icon_state = "helmet"
+ mob_overlay_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ body_parts_covered = HEAD
+ heat_protection = HEAD
+ cold_protection = HEAD
+ obj_flags = IMMUTABLE_SLOW
+ visor_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|ALLOWINTERNALS
+
+/obj/item/clothing/suit/mod
+ name = "MOD chestplate"
+ desc = "A chestplate for a MODsuit."
+ icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
+ icon_state = "standard-chestplate"
+ base_icon_state = "chestplate"
+ mob_overlay_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
+ blood_overlay_type = "armor"
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ body_parts_covered = CHEST|GROIN
+ heat_protection = CHEST|GROIN
+ cold_protection = CHEST|GROIN
+ obj_flags = IMMUTABLE_SLOW
+
+/obj/item/clothing/gloves/mod
+ name = "MOD gauntlets"
+ desc = "A pair of gauntlets for a MODsuit."
+ icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
+ icon_state = "standard-gauntlets"
+ base_icon_state = "gauntlets"
+ mob_overlay_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ body_parts_covered = HANDS|ARMS
+ heat_protection = HANDS|ARMS
+ cold_protection = HANDS|ARMS
+ obj_flags = IMMUTABLE_SLOW
+
+/obj/item/clothing/shoes/mod
+ name = "MOD boots"
+ desc = "A pair of boots for a MODsuit."
+ icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
+ icon_state = "standard-boots"
+ base_icon_state = "boots"
+ mob_overlay_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ body_parts_covered = FEET|LEGS
+ heat_protection = FEET|LEGS
+ cold_protection = FEET|LEGS
+ obj_flags = IMMUTABLE_SLOW
+ supports_variations = DIGITIGRADE_VARIATION
+ can_be_tied = FALSE
+ visor_flags_inv = HIDESHOES
diff --git a/code/modules/mod/mod_construction.dm b/code/modules/mod/mod_construction.dm
new file mode 100644
index 00000000000..0f37a4fd1f1
--- /dev/null
+++ b/code/modules/mod/mod_construction.dm
@@ -0,0 +1,275 @@
+/obj/item/mod/construction
+ desc = "A part used in MOD construction."
+ icon = 'icons/obj/clothing/modsuit/mod_construction.dmi'
+ item_state = "rack_parts"
+
+/obj/item/mod/construction/helmet
+ name = "MOD helmet"
+ icon_state = "helmet"
+
+/obj/item/mod/construction/helmet/examine(mob/user)
+ . = ..()
+ . += span_notice("You could insert these into a MOD shell...")
+
+/obj/item/mod/construction/chestplate
+ name = "MOD chestplate"
+ icon_state = "chestplate"
+
+/obj/item/mod/construction/chestplate/examine(mob/user)
+ . = ..()
+ . += span_notice("You could insert these into a MOD shell...")
+
+/obj/item/mod/construction/gauntlets
+ name = "MOD gauntlets"
+ icon_state = "gauntlets"
+
+/obj/item/mod/construction/gauntlets/examine(mob/user)
+ . = ..()
+ . += span_notice("You could insert these into a MOD shell...")
+
+/obj/item/mod/construction/boots
+ name = "MOD boots"
+ icon_state = "boots"
+
+/obj/item/mod/construction/boots/examine(mob/user)
+ . = ..()
+ . += span_notice("You could insert these into a MOD shell...")
+
+/obj/item/mod/construction/broken_core
+ name = "broken MOD core"
+ icon_state = "mod-core"
+ desc = "An internal power source for a Modular Outerwear Device. You don't seem to be able to source any power from this one, though."
+
+/obj/item/mod/construction/broken_core/examine(mob/user)
+ . = ..()
+ . += span_notice("You could repair it with a screwdriver...")
+
+/obj/item/mod/construction/broken_core/screwdriver_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(!tool.use_tool(src, user, 5 SECONDS, volume = 30))
+ return
+ new /obj/item/mod/core/standard(drop_location())
+ qdel(src)
+
+/obj/item/mod/construction/plating
+ name = "MOD external plating"
+ desc = "External plating used to finish a MOD control unit."
+ icon_state = "standard-plating"
+ var/datum/mod_theme/theme = /datum/mod_theme
+
+/obj/item/mod/construction/plating/Initialize(mapload)
+ . = ..()
+ var/datum/mod_theme/used_theme = GLOB.mod_themes[theme]
+ name = "MOD [used_theme.name] external plating"
+ desc = "[desc] [used_theme.desc]"
+ icon_state = "[used_theme.default_skin]-plating"
+
+/obj/item/mod/construction/plating/engineering
+ theme = /datum/mod_theme/engineering
+
+/obj/item/mod/construction/plating/atmospheric
+ theme = /datum/mod_theme/atmospheric
+
+/obj/item/mod/construction/plating/medical
+ theme = /datum/mod_theme/medical
+
+/obj/item/mod/construction/plating/security
+ theme = /datum/mod_theme/security
+
+#define START_STEP "start"
+#define CORE_STEP "core"
+#define SCREWED_CORE_STEP "screwed_core"
+#define HELMET_STEP "helmet"
+#define CHESTPLATE_STEP "chestplate"
+#define GAUNTLETS_STEP "gauntlets"
+#define BOOTS_STEP "boots"
+#define WRENCHED_ASSEMBLY_STEP "wrenched_assembly"
+#define SCREWED_ASSEMBLY_STEP "screwed_assembly"
+
+/obj/item/mod/construction/shell
+ name = "MOD shell"
+ icon_state = "mod-construction_start"
+ desc = "A MOD shell."
+ var/obj/item/core
+ var/obj/item/helmet
+ var/obj/item/chestplate
+ var/obj/item/gauntlets
+ var/obj/item/boots
+ var/step = START_STEP
+
+/obj/item/mod/construction/shell/examine(mob/user)
+ . = ..()
+ var/display_text
+ switch(step)
+ if(START_STEP)
+ display_text = "It looks like it's missing a MOD core..."
+ if(CORE_STEP)
+ display_text = "The core seems loose..."
+ if(SCREWED_CORE_STEP)
+ display_text = "It looks like it's missing a helmet..."
+ if(HELMET_STEP)
+ display_text = "It looks like it's missing a chestplate..."
+ if(CHESTPLATE_STEP)
+ display_text = "It looks like it's missing gauntlets..."
+ if(GAUNTLETS_STEP)
+ display_text = "It looks like it's missing boots..."
+ if(BOOTS_STEP)
+ display_text = "The assembly seems unsecured..."
+ if(WRENCHED_ASSEMBLY_STEP)
+ display_text = "The assembly seems loose..."
+ if(SCREWED_ASSEMBLY_STEP)
+ display_text = "All it's missing is external plating..."
+ . += span_notice(display_text)
+
+/obj/item/mod/construction/shell/attackby(obj/item/part, mob/user, params)
+ . = ..()
+ switch(step)
+ if(START_STEP)
+ if(!istype(part, /obj/item/mod/core))
+ return
+ if(!user.transferItemToLoc(part, src))
+ balloon_alert(user, "core stuck to your hand!")
+ return
+ playsound(src, 'sound/machines/click.ogg', 30, TRUE)
+ balloon_alert(user, "core inserted")
+ core = part
+ step = CORE_STEP
+ if(CORE_STEP)
+ if(part.tool_behaviour == TOOL_SCREWDRIVER) //Construct
+ if(part.use_tool(src, user, 0, volume=30))
+ balloon_alert(user, "core screwed")
+ step = SCREWED_CORE_STEP
+ else if(part.tool_behaviour == TOOL_CROWBAR) //Deconstruct
+ if(part.use_tool(src, user, 0, volume=30))
+ core.forceMove(drop_location())
+ balloon_alert(user, "core taken out")
+ step = START_STEP
+ if(SCREWED_CORE_STEP)
+ if(istype(part, /obj/item/mod/construction/helmet)) //Construct
+ if(!user.transferItemToLoc(part, src))
+ balloon_alert(user, "helmet stuck to your hand!")
+ return
+ playsound(src, 'sound/machines/click.ogg', 30, TRUE)
+ balloon_alert(user, "helmet added")
+ helmet = part
+ step = HELMET_STEP
+ else if(part.tool_behaviour == TOOL_SCREWDRIVER) //Deconstruct
+ if(part.use_tool(src, user, 0, volume=30))
+ balloon_alert(user, "core unscrewed")
+ step = CORE_STEP
+ if(HELMET_STEP)
+ if(istype(part, /obj/item/mod/construction/chestplate)) //Construct
+ if(!user.transferItemToLoc(part, src))
+ balloon_alert(user, "chestplate stuck to your hand!")
+ return
+ playsound(src, 'sound/machines/click.ogg', 30, TRUE)
+ balloon_alert(user, "chestplate added")
+ chestplate = part
+ step = CHESTPLATE_STEP
+ else if(part.tool_behaviour == TOOL_CROWBAR) //Deconstruct
+ if(part.use_tool(src, user, 0, volume=30))
+ helmet.forceMove(drop_location())
+ balloon_alert(user, "helmet removed")
+ helmet = null
+ step = SCREWED_CORE_STEP
+ if(CHESTPLATE_STEP)
+ if(istype(part, /obj/item/mod/construction/gauntlets)) //Construct
+ if(!user.transferItemToLoc(part, src))
+ balloon_alert(user, "gauntlets stuck to your hand!")
+ return
+ playsound(src, 'sound/machines/click.ogg', 30, TRUE)
+ balloon_alert(user, "gauntlets added")
+ gauntlets = part
+ step = GAUNTLETS_STEP
+ else if(part.tool_behaviour == TOOL_CROWBAR) //Deconstruct
+ if(part.use_tool(src, user, 0, volume=30))
+ chestplate.forceMove(drop_location())
+ balloon_alert(user, "chestplate removed")
+ chestplate = null
+ step = HELMET_STEP
+ if(GAUNTLETS_STEP)
+ if(istype(part, /obj/item/mod/construction/boots)) //Construct
+ if(!user.transferItemToLoc(part, src))
+ balloon_alert(user, "boots added")
+ return
+ playsound(src, 'sound/machines/click.ogg', 30, TRUE)
+ balloon_alert(user, "you fit [part] onto [src].")
+ boots = part
+ step = BOOTS_STEP
+ else if(part.tool_behaviour == TOOL_CROWBAR) //Deconstruct
+ if(part.use_tool(src, user, 0, volume=30))
+ gauntlets.forceMove(drop_location())
+ balloon_alert(user, "gauntlets removed")
+ gauntlets = null
+ step = CHESTPLATE_STEP
+ if(BOOTS_STEP)
+ if(part.tool_behaviour == TOOL_WRENCH) //Construct
+ if(part.use_tool(src, user, 0, volume=30))
+ balloon_alert(user, "assembly secured")
+ step = WRENCHED_ASSEMBLY_STEP
+ else if(part.tool_behaviour == TOOL_CROWBAR) //Deconstruct
+ if(part.use_tool(src, user, 0, volume=30))
+ boots.forceMove(drop_location())
+ balloon_alert(user, "boots removed")
+ boots = null
+ step = GAUNTLETS_STEP
+ if(WRENCHED_ASSEMBLY_STEP)
+ if(part.tool_behaviour == TOOL_SCREWDRIVER) //Construct
+ if(part.use_tool(src, user, 0, volume=30))
+ balloon_alert(user, "assembly screwed")
+ step = SCREWED_ASSEMBLY_STEP
+ else if(part.tool_behaviour == TOOL_WRENCH) //Deconstruct
+ if(part.use_tool(src, user, 0, volume=30))
+ balloon_alert(user, "assembly unsecured")
+ step = BOOTS_STEP
+ if(SCREWED_ASSEMBLY_STEP)
+ if(istype(part, /obj/item/mod/construction/plating)) //Construct
+ var/obj/item/mod/construction/plating/external_plating = part
+ if(!user.transferItemToLoc(part, src))
+ return
+ playsound(src, 'sound/machines/click.ogg', 30, TRUE)
+ balloon_alert(user, "suit finished")
+ var/obj/item/mod = new /obj/item/mod/control(drop_location(), external_plating.theme, null, core)
+ core = null
+ qdel(src)
+ user.put_in_hands(mod)
+ else if(part.tool_behaviour == TOOL_SCREWDRIVER) //Construct
+ if(part.use_tool(src, user, 0, volume=30))
+ balloon_alert(user, "assembly unscrewed")
+ step = SCREWED_ASSEMBLY_STEP
+ update_icon_state()
+
+/obj/item/mod/construction/shell/update_icon_state()
+ . = ..()
+ icon_state = "mod-construction_[step]"
+
+/obj/item/mod/construction/shell/Destroy()
+ QDEL_NULL(core)
+ QDEL_NULL(helmet)
+ QDEL_NULL(chestplate)
+ QDEL_NULL(gauntlets)
+ QDEL_NULL(boots)
+ return ..()
+
+/obj/item/mod/construction/shell/handle_atom_del(atom/deleted_atom)
+ if(deleted_atom == core)
+ core = null
+ if(deleted_atom == helmet)
+ helmet = null
+ if(deleted_atom == chestplate)
+ chestplate = null
+ if(deleted_atom == gauntlets)
+ gauntlets = null
+ if(deleted_atom == boots)
+ boots = null
+ return ..()
+
+#undef START_STEP
+#undef CORE_STEP
+#undef SCREWED_CORE_STEP
+#undef HELMET_STEP
+#undef CHESTPLATE_STEP
+#undef GAUNTLETS_STEP
+#undef BOOTS_STEP
+#undef WRENCHED_ASSEMBLY_STEP
+#undef SCREWED_ASSEMBLY_STEP
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
new file mode 100644
index 00000000000..37b9cf6e2ac
--- /dev/null
+++ b/code/modules/mod/mod_control.dm
@@ -0,0 +1,713 @@
+/// MODsuits, trade-off between armor and utility
+/obj/item/mod
+ name = "Base MOD"
+ desc = "You should not see this, yell at a coder!"
+ icon = 'icons/obj/clothing/modsuit/mod_clothing.dmi'
+
+/obj/item/mod/control
+ name = "MOD control unit"
+ desc = "The control unit of a Modular Outerwear Device, a powered, back-mounted suit that protects against various environments."
+ icon_state = "control"
+ base_icon_state = "control"
+ item_state = "mod_control"
+ mob_overlay_icon = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
+ w_class = WEIGHT_CLASS_BULKY
+ slot_flags = ITEM_SLOT_BACK
+ strip_delay = 10 SECONDS
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "fire" = 0, "acid" = 0)
+ actions_types = list(
+ /datum/action/item_action/mod/deploy,
+ /datum/action/item_action/mod/activate,
+ /datum/action/item_action/mod/panel,
+ /datum/action/item_action/mod/module,
+ /datum/action/item_action/mod/deploy/ai,
+ /datum/action/item_action/mod/activate/ai,
+ /datum/action/item_action/mod/panel/ai,
+ /datum/action/item_action/mod/module/ai,
+ )
+ resistance_flags = NONE
+ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+ min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+ siemens_coefficient = 0.5
+ //alternate_worn_layer = HAND_LAYER+0.1 //we want it to go above generally everything, but not hands
+ /// The MOD's theme, decides on some stuff like armor and statistics.
+ var/datum/mod_theme/theme = /datum/mod_theme
+ /// Looks of the MOD.
+ var/skin = "standard"
+ /// Theme of the MOD TGUI
+ var/ui_theme = "ntos"
+ /// If the suit is deployed and turned on.
+ var/active = FALSE
+ /// If the suit wire/module hatch is open.
+ var/open = FALSE
+ /// If the suit is ID locked.
+ var/locked = FALSE
+ /// If the suit is malfunctioning.
+ var/malfunctioning = FALSE
+ /// If the suit is currently activating/deactivating.
+ var/activating = FALSE
+ /// How long the MOD is electrified for.
+ var/seconds_electrified = MACHINE_NOT_ELECTRIFIED
+ /// If the suit interface is broken.
+ var/interface_break = FALSE
+ /// How much module complexity can this MOD carry.
+ var/complexity_max = DEFAULT_MAX_COMPLEXITY
+ /// How much module complexity this MOD is carrying.
+ var/complexity = 0
+ /// Power usage of the MOD.
+ var/charge_drain = DEFAULT_CHARGE_DRAIN
+ /// Slowdown of the MOD when not active.
+ var/slowdown_inactive = 1.25
+ /// Slowdown of the MOD when active.
+ var/slowdown_active = 0.75
+ /// How long this MOD takes each part to seal.
+ var/activation_step_time = MOD_ACTIVATION_STEP_TIME
+ /// Extended description of the theme.
+ var/extended_desc
+ /// MOD helmet.
+ var/obj/item/clothing/head/mod/helmet
+ /// MOD chestplate.
+ var/obj/item/clothing/suit/mod/chestplate
+ /// MOD gauntlets.
+ var/obj/item/clothing/gloves/mod/gauntlets
+ /// MOD boots.
+ var/obj/item/clothing/shoes/mod/boots
+ /// MOD core.
+ var/obj/item/mod/core/core
+ /// Associated list of parts (helmet, chestplate, gauntlets, boots) to their unsealed worn layer.
+ var/list/mod_parts = list()
+ /// Associated list of parts that can overslot to their overslot (overslot means the part can cover another layer of clothing).
+ var/list/overslotting_parts = list()
+ /// Modules the MOD should spawn with.
+ var/list/initial_modules = list()
+ /// Modules the MOD currently possesses.
+ var/list/modules = list()
+ /// Currently used module.
+ var/obj/item/mod/module/selected_module
+ /// AI mob inhabiting the MOD.
+ var/mob/living/silicon/ai/ai
+ /// Delay between moves as AI.
+ var/movedelay = 0
+ /// Cooldown for AI moves.
+ COOLDOWN_DECLARE(cooldown_mod_move)
+ /// Person wearing the MODsuit.
+ var/mob/living/carbon/human/wearer
+
+/obj/item/mod/control/Initialize(mapload, datum/mod_theme/new_theme, new_skin, obj/item/mod/core/new_core)
+ . = ..()
+ if(new_theme)
+ theme = new_theme
+ theme = GLOB.mod_themes[theme]
+ slot_flags = theme.slot_flags
+ extended_desc = theme.extended_desc
+ slowdown_inactive = theme.slowdown_inactive
+ slowdown_active = theme.slowdown_active
+ complexity_max = theme.complexity_max
+ ui_theme = theme.ui_theme
+ charge_drain = theme.charge_drain
+ initial_modules += theme.inbuilt_modules
+ wires = new /datum/wires/mod(src)
+ if(length(req_access))
+ locked = TRUE
+ new_core?.install(src)
+ helmet = new /obj/item/clothing/head/mod(src)
+ mod_parts += helmet
+ chestplate = new /obj/item/clothing/suit/mod(src)
+ chestplate.allowed = typecacheof(theme.allowed_suit_storage)
+ mod_parts += chestplate
+ gauntlets = new /obj/item/clothing/gloves/mod(src)
+ mod_parts += gauntlets
+ boots = new /obj/item/clothing/shoes/mod(src)
+ mod_parts += boots
+ var/list/all_parts = mod_parts + src
+ for(var/obj/item/part as anything in all_parts)
+ part.name = "[theme.name] [part.name]"
+ part.desc = "[part.desc] [theme.desc]"
+ part.armor = getArmor(arglist(theme.armor))
+ part.resistance_flags = theme.resistance_flags
+ part.flags_1 |= theme.atom_flags //flags like initialization or admin spawning are here, so we cant set, have to add
+ part.heat_protection = NONE
+ part.cold_protection = NONE
+ part.max_heat_protection_temperature = theme.max_heat_protection_temperature
+ part.min_cold_protection_temperature = theme.min_cold_protection_temperature
+ part.siemens_coefficient = theme.siemens_coefficient
+ for(var/obj/item/part as anything in mod_parts)
+ RegisterSignal(part, COMSIG_OBJ_DESTRUCTION, PROC_REF(on_part_destruction))
+ RegisterSignal(part, COMSIG_PARENT_QDELETING, PROC_REF(on_part_deletion))
+ set_mod_skin(new_skin || theme.default_skin)
+ update_speed()
+ for(var/obj/item/mod/module/module as anything in initial_modules)
+ module = new module(src)
+ install(module)
+ RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit))
+ movedelay = CONFIG_GET(number/movedelay/run_delay)
+
+/obj/item/mod/control/Destroy()
+ if(active)
+ STOP_PROCESSING(SSobj, src)
+ for(var/obj/item/mod/module/module as anything in modules)
+ uninstall(module, deleting = TRUE)
+ for(var/obj/item/part as anything in mod_parts)
+ overslotting_parts -= part
+ var/atom/deleting_atom
+ if(!QDELETED(helmet))
+ deleting_atom = helmet
+ helmet = null
+ mod_parts -= deleting_atom
+ qdel(deleting_atom)
+ if(!QDELETED(chestplate))
+ deleting_atom = chestplate
+ chestplate = null
+ mod_parts -= deleting_atom
+ qdel(deleting_atom)
+ if(!QDELETED(gauntlets))
+ deleting_atom = gauntlets
+ gauntlets = null
+ mod_parts -= deleting_atom
+ qdel(deleting_atom)
+ if(!QDELETED(boots))
+ deleting_atom = boots
+ boots = null
+ mod_parts -= deleting_atom
+ qdel(deleting_atom)
+ if(core)
+ QDEL_NULL(core)
+ QDEL_NULL(wires)
+ return ..()
+
+/obj/item/mod/control/obj_destruction(damage_flag)
+ for(var/obj/item/mod/module/module as anything in modules)
+ uninstall(module)
+ for(var/obj/item/part as anything in mod_parts)
+ if(!overslotting_parts[part])
+ continue
+ var/obj/item/overslot = overslotting_parts[part]
+ overslot.forceMove(drop_location())
+ overslotting_parts[part] = null
+ /*if(ai)
+ ai.controlled_equipment = null
+ ai.remote_control = null
+ for(var/datum/action/action as anything in actions)
+ if(action.owner == ai)
+ action.Remove(ai)
+ new /obj/item/mod/ai_minicard(drop_location(), ai)*/
+ return ..()
+
+/obj/item/mod/control/examine(mob/user)
+ . = ..()
+ if(active)
+ . += span_notice("Charge: [core ? "[get_charge_percent()]%" : "No core"].")
+ . += span_notice("Selected module: [selected_module || "None"].")
+ if(!open && !active)
+ . += span_notice("You could put it on your back to turn it on.")
+ . += span_notice("You could open the cover with a screwdriver.")
+ else if(open)
+ . += span_notice("You could close the cover with a screwdriver.")
+ . += span_notice("You could use modules on it to install them.")
+ . += span_notice("You could remove modules with a crowbar.")
+ . += span_notice("You could update the access lock with an ID.")
+ . += span_notice("You could access the wire panel with a wire tool.")
+ if(core)
+ . += span_notice("You could remove [core] with a wrench.")
+ else
+ . += span_notice("You could use a MOD core on it to install one.")
+ if(ai)
+ . += span_notice("You could remove [ai] with an intellicard.")
+ else
+ . += span_notice("You could install an AI with an intellicard.")
+
+/obj/item/mod/control/examine_more(mob/user)
+ . = ..()
+ . += "[extended_desc]"
+
+/obj/item/mod/control/process(delta_time)
+ if(seconds_electrified > MACHINE_NOT_ELECTRIFIED)
+ seconds_electrified--
+ if(!get_charge() && active && !activating)
+ power_off()
+ return PROCESS_KILL
+ var/malfunctioning_charge_drain = 0
+ if(malfunctioning)
+ malfunctioning_charge_drain = rand(1,20)
+ subtract_charge((charge_drain + malfunctioning_charge_drain)*delta_time)
+ update_charge_alert()
+ for(var/obj/item/mod/module/module as anything in modules)
+ if(malfunctioning && module.active && DT_PROB(5, delta_time))
+ module.on_deactivation(display_message = TRUE)
+ module.on_process(delta_time)
+
+/obj/item/mod/control/equipped(mob/user, slot)
+ ..()
+ if(slot == slot_flags)
+ set_wearer(user)
+ else if(wearer)
+ unset_wearer()
+
+/obj/item/mod/control/dropped(mob/user)
+ . = ..()
+ if(!wearer)
+ return
+ clean_up()
+
+/obj/item/mod/control/item_action_slot_check(slot)
+ if(slot & slot_flags)
+ return TRUE
+
+/obj/item/mod/control/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
+ . = ..()
+ if(!wearer || old_loc != wearer || loc == wearer)
+ return
+ clean_up()
+
+/obj/item/mod/control/allow_attack_hand_drop(mob/user)
+ if(user != wearer)
+ return ..()
+ for(var/obj/item/part as anything in mod_parts)
+ if(part.loc != src)
+ balloon_alert(user, "retract parts first!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+
+/obj/item/mod/control/MouseDrop(atom/over_object)
+ if(usr != wearer || !istype(over_object, /atom/movable/screen/inventory/hand))
+ return ..()
+ for(var/obj/item/part as anything in mod_parts)
+ if(part.loc != src)
+ balloon_alert(wearer, "retract parts first!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE)
+ return
+ if(!wearer.incapacitated())
+ var/atom/movable/screen/inventory/hand/ui_hand = over_object
+ if(wearer.putItemFromInventoryInHandIfPossible(src, ui_hand.held_index))
+ add_fingerprint(usr)
+ return ..()
+
+/obj/item/mod/control/wrench_act(mob/living/user, obj/item/wrench)
+ if(..())
+ return TRUE
+ if(seconds_electrified && get_charge() && shock(user))
+ return TRUE
+ if(open)
+ if(!core)
+ balloon_alert(user, "no core!")
+ return TRUE
+ balloon_alert(user, "removing core...")
+ wrench.play_tool_sound(src, 100)
+ if(!wrench.use_tool(src, user, 3 SECONDS) || !open)
+ balloon_alert(user, "interrupted!")
+ return TRUE
+ wrench.play_tool_sound(src, 100)
+ balloon_alert(user, "core removed")
+ core.forceMove(drop_location())
+ update_charge_alert()
+ return TRUE
+ return ..()
+
+/obj/item/mod/control/screwdriver_act(mob/living/user, obj/item/screwdriver)
+ if(..())
+ return TRUE
+ if(active || activating)// || ai_controller)
+ balloon_alert(user, "deactivate suit first!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ balloon_alert(user, "[open ? "closing" : "opening"] cover...")
+ screwdriver.play_tool_sound(src, 100)
+ if(screwdriver.use_tool(src, user, 1 SECONDS))
+ if(active || activating)
+ balloon_alert(user, "deactivate suit first!")
+ screwdriver.play_tool_sound(src, 100)
+ balloon_alert(user, "cover [open ? "closed" : "opened"]")
+ open = !open
+ else
+ balloon_alert(user, "interrupted!")
+ return TRUE
+
+/obj/item/mod/control/crowbar_act(mob/living/user, obj/item/crowbar)
+ . = ..()
+ if(!open)
+ balloon_alert(user, "open the cover first!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ if(!allowed(user))
+ balloon_alert(user, "insufficient access!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return
+ if(SEND_SIGNAL(src, COMSIG_MOD_MODULE_REMOVAL, user) & MOD_CANCEL_REMOVAL)
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ if(length(modules))
+ var/list/removable_modules = list()
+ for(var/obj/item/mod/module/module as anything in modules)
+ if(!module.removable)
+ continue
+ removable_modules += module
+ var/obj/item/mod/module/module_to_remove = tgui_input_list(user, "Which module to remove?", "Module Removal", removable_modules)
+ if(!module_to_remove?.mod)
+ return FALSE
+ uninstall(module_to_remove)
+ module_to_remove.forceMove(drop_location())
+ crowbar.play_tool_sound(src, 100)
+ return TRUE
+ balloon_alert(user, "no modules!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+
+/obj/item/mod/control/attackby(obj/item/attacking_item, mob/living/user, params)
+ if(istype(attacking_item, /obj/item/mod/module))
+ if(!open)
+ balloon_alert(user, "open the cover first!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ install(attacking_item, user)
+ return TRUE
+ else if(istype(attacking_item, /obj/item/mod/core))
+ if(!open)
+ balloon_alert(user, "open the cover first!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ if(core)
+ balloon_alert(user, "core already installed!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ var/obj/item/mod/core/attacking_core = attacking_item
+ attacking_core.install(src)
+ balloon_alert(user, "core installed")
+ playsound(src, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE)
+ update_charge_alert()
+ return TRUE
+ else if(is_wire_tool(attacking_item) && open)
+ wires.interact(user)
+ return TRUE
+ else if(open && attacking_item.GetID())
+ update_access(user, attacking_item.GetID())
+ return TRUE
+ else if(open && istype(attacking_item, /obj/item/stock_parts/cell) && istype(core, /obj/item/mod/core/standard))
+ var/obj/item/mod/core/standard/attacked_core = core
+ attacked_core.on_attackby(src, attacking_item, wearer)
+ return TRUE
+ return ..()
+
+/obj/item/mod/control/get_cell()
+ if(!open)
+ return
+ var/obj/item/stock_parts/cell/cell = get_charge_source()
+ if(!istype(cell))
+ return
+ return cell
+
+/obj/item/mod/control/GetAccess()
+ /*if(ai_controller)
+ return req_access.Copy()
+ else */
+ return ..()
+
+/obj/item/mod/control/emag_act(mob/user)
+ locked = !locked
+ balloon_alert(user, "suit access [locked ? "locked" : "unlocked"]")
+
+/obj/item/mod/control/emp_act(severity)
+ . = ..()
+ if(!active || !wearer)
+ return
+ to_chat(wearer, span_notice("[severity > 1 ? "Light" : "Strong"] electromagnetic pulse detected!"))
+ if(. & EMP_PROTECT_CONTENTS)
+ return
+ selected_module?.on_deactivation(display_message = TRUE)
+ wearer.apply_damage(10 / severity, BURN, spread_damage=TRUE)
+ to_chat(wearer, span_danger("You feel [src] heat up from the EMP, burning you slightly."))
+ if(wearer.stat < UNCONSCIOUS && prob(10))
+ wearer.force_scream()
+
+/*obj/item/mod/control/on_outfit_equip(mob/living/carbon/human/outfit_wearer, visuals_only, item_slot)
+ if(visuals_only)
+ set_wearer(outfit_wearer) //we need to set wearer manually since it doesnt call equipped
+ quick_activation()*/
+
+/obj/item/mod/control/doStrip(mob/stripper, mob/owner)
+ if(active && !toggle_activate(stripper, force_deactivate = TRUE))
+ return
+ for(var/obj/item/part as anything in mod_parts)
+ if(part.loc == src)
+ continue
+ retract(null, part)
+ return ..()
+
+/obj/item/mod/control/worn_overlays(isinhands = FALSE, icon_file)
+ . = ..()
+ for(var/obj/item/mod/module/module as anything in modules)
+ var/list/module_icons = module.generate_worn_overlay(src.layer)
+ if(!length(module_icons))
+ continue
+ . += module_icons
+
+/obj/item/mod/control/update_icon_state()
+ item_state = "[skin]-control[active ? "-sealed" : ""]"
+ return ..()
+
+/obj/item/mod/control/proc/set_wearer(mob/user)
+ wearer = user
+ SEND_SIGNAL(src, COMSIG_MOD_WEARER_SET, wearer)
+ RegisterSignal(wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit))
+ RegisterSignal(wearer, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain))
+ update_charge_alert()
+ for(var/obj/item/mod/module/module as anything in modules)
+ module.on_equip()
+
+/obj/item/mod/control/proc/unset_wearer()
+ for(var/obj/item/mod/module/module as anything in modules)
+ module.on_unequip()
+ UnregisterSignal(wearer, list(COMSIG_ATOM_EXITED, COMSIG_SPECIES_GAIN))
+ wearer.clear_alert("mod_charge")
+ SEND_SIGNAL(src, COMSIG_MOD_WEARER_UNSET, wearer)
+ wearer = null
+
+/obj/item/mod/control/proc/clean_up()
+ if(active || activating)
+ for(var/obj/item/mod/module/module as anything in modules)
+ if(!module.active)
+ continue
+ module.on_deactivation(display_message = FALSE)
+ for(var/obj/item/part as anything in mod_parts)
+ seal_part(part, seal = FALSE)
+ for(var/obj/item/part as anything in mod_parts)
+ retract(null, part)
+ if(active)
+ finish_activation(on = FALSE)
+ var/mob/old_wearer = wearer
+ unset_wearer()
+ old_wearer.temporarilyRemoveItemFromInventory(src)
+
+/obj/item/mod/control/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species)
+ SIGNAL_HANDLER
+
+ var/list/all_parts = mod_parts + src
+ for(var/obj/item/part in all_parts)
+ if(!(part.slot_flags in new_species.no_equip) || is_type_in_list(new_species, part.species_exception))
+ continue
+ forceMove(drop_location())
+ return
+
+/obj/item/mod/control/proc/quick_module(mob/user)
+ if(!length(modules))
+ return
+ var/list/display_names = list()
+ var/list/items = list()
+ for(var/obj/item/mod/module/module as anything in modules)
+ if(module.module_type == MODULE_PASSIVE)
+ continue
+ display_names[module.name] = REF(module)
+ var/image/module_image = image(icon = module.icon, icon_state = module.icon_state)
+ if(module == selected_module)
+ module_image.underlays += image(icon = 'icons/hud/radial.dmi', icon_state = "module_selected")
+ else if(module.active)
+ module_image.underlays += image(icon = 'icons/hud/radial.dmi', icon_state = "module_active")
+ if(!COOLDOWN_FINISHED(module, cooldown_timer))
+ module_image.add_overlay(image(icon = 'icons/hud/radial.dmi', icon_state = "module_cooldown"))
+ items += list(module.name = module_image)
+ if(!length(items))
+ return
+ var/radial_anchor = src
+ if(istype(user.loc, /obj/effect/dummy/phased_mob))
+ radial_anchor = get_turf(user.loc) //they're phased out via some module, anchor the radial on the turf so it may still display
+ var/pick = show_radial_menu(user, radial_anchor, items, custom_check = FALSE, require_near = TRUE, tooltips = TRUE)
+ if(!pick)
+ return
+ var/module_reference = display_names[pick]
+ var/obj/item/mod/module/picked_module = locate(module_reference) in modules
+ if(!istype(picked_module))
+ return
+ picked_module.on_select()
+
+/obj/item/mod/control/proc/shock(mob/living/user)
+ if(!istype(user) || get_charge() < 1)
+ return FALSE
+ do_sparks(5, TRUE, src)
+ var/check_range = TRUE
+ return electrocute_mob(user, get_charge_source(), src, 0.7, check_range)
+
+/obj/item/mod/control/proc/install(obj/item/mod/module/new_module, mob/user)
+ for(var/obj/item/mod/module/old_module as anything in modules)
+ if(is_type_in_list(new_module, old_module.incompatible_modules) || is_type_in_list(old_module, new_module.incompatible_modules))
+ if(user)
+ balloon_alert(user, "[new_module] incompatible with [old_module]!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return
+ if(is_type_in_list(new_module, theme.module_blacklist))
+ if(user)
+ balloon_alert(user, "[src] doesn't accept [new_module]!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return
+ var/complexity_with_module = complexity
+ complexity_with_module += new_module.complexity
+ if(complexity_with_module > complexity_max)
+ if(user)
+ balloon_alert(user, "[new_module] would make [src] too complex!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return
+ new_module.forceMove(src)
+ modules += new_module
+ complexity += new_module.complexity
+ new_module.mod = src
+ new_module.on_install()
+ if(wearer)
+ new_module.on_equip()
+
+ if(user)
+ balloon_alert(user, "[new_module] added")
+ playsound(src, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE)
+
+/obj/item/mod/control/proc/uninstall(obj/item/mod/module/old_module, deleting = FALSE)
+ modules -= old_module
+ complexity -= old_module.complexity
+ if(active)
+ old_module.on_suit_deactivation(deleting = deleting)
+ if(old_module.active)
+ old_module.on_deactivation(display_message = !deleting, deleting = deleting)
+ old_module.on_uninstall(deleting = deleting)
+ QDEL_LIST_ASSOC_VAL(old_module.pinned_to)
+ old_module.mod = null
+
+/// Intended for callbacks, don't use normally, just get wearer by itself.
+/obj/item/mod/control/proc/get_wearer()
+ return wearer
+
+/obj/item/mod/control/proc/update_access(mob/user, obj/item/card/id/card)
+ if(!allowed(user))
+ balloon_alert(user, "insufficient access!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return
+ req_access = card.access.Copy()
+ balloon_alert(user, "access updated")
+
+/obj/item/mod/control/proc/get_charge_source()
+ return core?.charge_source()
+
+/obj/item/mod/control/proc/get_charge()
+ return core?.charge_amount() || 0
+
+/obj/item/mod/control/proc/get_max_charge()
+ return core?.max_charge_amount() || 1 //avoid dividing by 0
+
+/obj/item/mod/control/proc/get_charge_percent()
+ return ROUND_UP((get_charge() / get_max_charge()) * 100)
+
+/obj/item/mod/control/proc/add_charge(amount)
+ return core?.add_charge(amount) || FALSE
+
+/obj/item/mod/control/proc/subtract_charge(amount)
+ return core?.subtract_charge(amount) || FALSE
+
+/obj/item/mod/control/proc/check_charge(amount)
+ return core?.check_charge(amount) || FALSE
+
+/obj/item/mod/control/proc/update_charge_alert()
+ if(!wearer)
+ return
+ if(!core)
+ wearer.throw_alert("mod_charge", /atom/movable/screen/alert/nocore)
+ return
+ core.update_charge_alert()
+
+/obj/item/mod/control/proc/update_speed()
+ var/list/all_parts = mod_parts + src
+ for(var/obj/item/part as anything in all_parts)
+ part.slowdown = (active ? slowdown_active : slowdown_inactive) / length(all_parts)
+ wearer?.update_equipment_speed_mods()
+
+/obj/item/mod/control/proc/power_off()
+ balloon_alert(wearer, "Нет энергии!")
+ toggle_activate(wearer, force_deactivate = TRUE)
+
+/obj/item/mod/control/proc/set_mod_color(new_color)
+ var/list/all_parts = mod_parts + src
+ for(var/obj/item/part as anything in all_parts)
+ part.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
+ part.add_atom_colour(new_color, FIXED_COLOUR_PRIORITY)
+ wearer?.regenerate_icons()
+
+/obj/item/mod/control/proc/set_mod_skin(new_skin)
+ if(active)
+ CRASH("[src] tried to set skin while active!")
+ skin = new_skin
+ var/list/used_skin = theme.skins[new_skin]
+ if(used_skin[CONTROL_LAYER])
+ alternate_worn_layer = used_skin[CONTROL_LAYER]
+ var/list/skin_updating = mod_parts + src
+ for(var/obj/item/part as anything in skin_updating)
+ part.icon = used_skin[MOD_ICON_OVERRIDE] || 'icons/obj/clothing/modsuit/mod_clothing.dmi'
+ //part.mob_overlay_icon = used_skin[MOD_WORN_ICON_OVERRIDE] || 'icons/mob/clothing/modsuit/mod_clothing.dmi'
+ part.icon_state = "[skin]-[part.base_icon_state]"
+ for(var/obj/item/clothing/part as anything in mod_parts)
+ var/used_category
+ if(part == helmet)
+ used_category = HELMET_FLAGS
+ if(part == chestplate)
+ used_category = CHESTPLATE_FLAGS
+ if(part == gauntlets)
+ used_category = GAUNTLETS_FLAGS
+ if(part == boots)
+ used_category = BOOTS_FLAGS
+ var/list/category = used_skin[used_category]
+ part.clothing_flags = category[UNSEALED_CLOTHING] || NONE
+ part.visor_flags = category[SEALED_CLOTHING] || NONE
+ part.flags_inv = category[UNSEALED_INVISIBILITY] || NONE
+ part.visor_flags_inv = category[SEALED_INVISIBILITY] || NONE
+ part.flags_cover = category[UNSEALED_COVER] || NONE
+ part.visor_flags_cover = category[SEALED_COVER] || NONE
+ part.alternate_worn_layer = category[UNSEALED_LAYER]
+ mod_parts[part] = part.alternate_worn_layer
+ if(!category[CAN_OVERSLOT])
+ if(overslotting_parts[part])
+ var/obj/item/overslot = overslotting_parts[part]
+ overslot.forceMove(drop_location())
+ overslotting_parts -= part
+ continue
+ overslotting_parts |= part
+ wearer?.regenerate_icons()
+
+/obj/item/mod/control/proc/on_exit(datum/source, atom/movable/part, direction)
+ SIGNAL_HANDLER
+
+ if(part.loc == src)
+ return
+ if(part == core)
+ core.uninstall()
+ update_charge_alert()
+ return
+ if(part.loc == wearer)
+ return
+ if(part in modules)
+ uninstall(part)
+ return
+ if(part in mod_parts)
+ if(!wearer)
+ part.forceMove(src)
+ return
+ retract(wearer, part)
+ if(active)
+ INVOKE_ASYNC(src, PROC_REF(toggle_activate), wearer, TRUE)
+
+/obj/item/mod/control/proc/on_part_destruction(obj/item/part, damage_flag)
+ SIGNAL_HANDLER
+
+ if(overslotting_parts[part])
+ var/obj/item/overslot = overslotting_parts[part]
+ overslot.forceMove(drop_location())
+ overslotting_parts[part] = null
+ if(QDELETED(src))
+ return
+ obj_destruction(damage_flag)
+
+/obj/item/mod/control/proc/on_part_deletion(obj/item/part)
+ SIGNAL_HANDLER
+
+ if(QDELETED(src))
+ return
+ qdel(src)
+
+/obj/item/mod/control/proc/on_overslot_exit(datum/source, atom/movable/overslot, direction)
+ SIGNAL_HANDLER
+
+ if(overslot != overslotting_parts[source])
+ return
+ overslotting_parts[source] = null
diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm
new file mode 100644
index 00000000000..4c9d16ef7b7
--- /dev/null
+++ b/code/modules/mod/mod_core.dm
@@ -0,0 +1,357 @@
+/obj/item/mod/core
+ name = "MOD core"
+ desc = "A non-functional MOD core. Inform the admins if you see this."
+ icon = 'icons/obj/clothing/modsuit/mod_construction.dmi'
+ icon_state = "mod-core"
+ item_state = "electronic"
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ /// MOD unit we are powering.
+ var/obj/item/mod/control/mod
+
+/obj/item/mod/core/Destroy()
+ if(mod)
+ uninstall()
+ return ..()
+
+/obj/item/mod/core/proc/install(obj/item/mod/control/mod_unit)
+ mod = mod_unit
+ mod.core = src
+ forceMove(mod)
+
+/obj/item/mod/core/proc/uninstall()
+ mod.core = null
+ mod = null
+
+/obj/item/mod/core/proc/charge_source()
+ return
+
+/obj/item/mod/core/proc/charge_amount()
+ return 0
+
+/obj/item/mod/core/proc/max_charge_amount()
+ return 1
+
+/obj/item/mod/core/proc/add_charge(amount)
+ return FALSE
+
+/obj/item/mod/core/proc/subtract_charge(amount)
+ return FALSE
+
+/obj/item/mod/core/proc/check_charge(amount)
+ return FALSE
+
+/obj/item/mod/core/proc/update_charge_alert()
+ mod.wearer.clear_alert("mod_charge")
+
+/obj/item/mod/core/infinite
+ name = "MOD infinite core"
+ icon_state = "mod-core-infinite"
+ desc = "A fusion core using the rare Fixium to sustain enough energy for the lifetime of the MOD's user. \
+ This might be because of the slowly killing poison inside, but those are just rumors."
+
+/obj/item/mod/core/infinite/charge_source()
+ return src
+
+/obj/item/mod/core/infinite/charge_amount()
+ return INFINITY
+
+/obj/item/mod/core/infinite/max_charge_amount()
+ return INFINITY
+
+/obj/item/mod/core/infinite/add_charge(amount)
+ return TRUE
+
+/obj/item/mod/core/infinite/subtract_charge(amount)
+ return TRUE
+
+/obj/item/mod/core/infinite/check_charge(amount)
+ return TRUE
+
+/obj/item/mod/core/standard
+ name = "MOD standard core"
+ icon_state = "mod-core-standard"
+ desc = "Growing in the most lush, fertile areas of the planet Sprout, there is a crystal known as the Heartbloom. \
+ These rare, organic piezoelectric crystals are of incredible cultural significance to the artist castes of the \
+ Ethereals, owing to their appearance; which is exactly similar to that of an Ethereal's heart.\n\
+ Which one you have in your suit is unclear, but either way, \
+ it's been repurposed to be an internal power source for a Modular Outerwear Device."
+ /// Installed cell.
+ var/obj/item/stock_parts/cell/cell
+
+/obj/item/mod/core/standard/Destroy()
+ if(cell)
+ QDEL_NULL(cell)
+ return ..()
+
+/obj/item/mod/core/standard/install(obj/item/mod/control/mod_unit)
+ . = ..()
+ if(cell)
+ install_cell(cell)
+ RegisterSignal(mod, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(mod, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
+ RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby))
+ RegisterSignal(mod, COMSIG_MOD_WEARER_SET, PROC_REF(on_wearer_set))
+ if(mod.wearer)
+ on_wearer_set(mod, mod.wearer)
+
+/obj/item/mod/core/standard/uninstall()
+ if(!QDELETED(cell))
+ cell.forceMove(drop_location())
+ UnregisterSignal(mod, list(COMSIG_PARENT_EXAMINE, COMSIG_ATOM_ATTACK_HAND, COMSIG_PARENT_ATTACKBY, COMSIG_MOD_WEARER_SET))
+ if(mod.wearer)
+ on_wearer_unset(mod, mod.wearer)
+ return ..()
+
+/obj/item/mod/core/standard/charge_source()
+ return cell
+
+/obj/item/mod/core/standard/charge_amount()
+ var/obj/item/stock_parts/cell/charge_source = charge_source()
+ return charge_source?.charge || 0
+
+/obj/item/mod/core/standard/max_charge_amount(amount)
+ var/obj/item/stock_parts/cell/charge_source = charge_source()
+ return charge_source?.maxcharge || 1
+
+/obj/item/mod/core/standard/add_charge(amount)
+ var/obj/item/stock_parts/cell/charge_source = charge_source()
+ if(!charge_source)
+ return FALSE
+ return charge_source.give(amount)
+
+/obj/item/mod/core/standard/subtract_charge(amount)
+ var/obj/item/stock_parts/cell/charge_source = charge_source()
+ if(!charge_source)
+ return FALSE
+ return charge_source.use(amount, TRUE)
+
+/obj/item/mod/core/standard/check_charge(amount)
+ return charge_amount() >= amount
+
+/obj/item/mod/core/standard/update_charge_alert()
+ var/obj/item/stock_parts/cell/charge_source = charge_source()
+ if(!charge_source)
+ mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/nocell)
+ return
+ var/remaining_cell = charge_amount() / max_charge_amount()
+ switch(remaining_cell)
+ if(0.75 to INFINITY)
+ mod.wearer.clear_alert("mod_charge")
+ if(0.5 to 0.75)
+ mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell, 1)
+ if(0.25 to 0.5)
+ mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell, 2)
+ if(0.01 to 0.25)
+ mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell, 3)
+ else
+ mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/emptycell)
+
+/obj/item/mod/core/standard/proc/install_cell(new_cell)
+ cell = new_cell
+ cell.forceMove(src)
+ RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit))
+
+/obj/item/mod/core/standard/proc/uninstall_cell()
+ if(!cell)
+ return
+ cell = null
+ UnregisterSignal(src, COMSIG_ATOM_EXITED)
+
+/obj/item/mod/core/standard/proc/on_exit(datum/source, obj/item/stock_parts/cell, direction)
+ SIGNAL_HANDLER
+
+ if(!istype(cell) || cell.loc == src)
+ return
+ uninstall_cell()
+
+/obj/item/mod/core/standard/proc/on_examine(datum/source, mob/examiner, list/examine_text)
+ SIGNAL_HANDLER
+
+ if(!mod.open)
+ return
+ examine_text += cell ? "You could remove the cell with an empty hand." : "You could use a cell on it to install one."
+
+/obj/item/mod/core/standard/proc/on_attack_hand(datum/source, mob/living/user)
+ SIGNAL_HANDLER
+
+ if(mod.seconds_electrified && charge_amount() && mod.shock(user))
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+ if(mod.open && mod.loc == user)
+ INVOKE_ASYNC(src, PROC_REF(mod_uninstall_cell), user)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+ return NONE
+
+/obj/item/mod/core/standard/proc/mod_uninstall_cell(mob/living/user)
+ if(!cell)
+ mod.balloon_alert(user, "no cell!")
+ return
+ mod.balloon_alert(user, "removing cell...")
+ if(!do_after(user, 1.5 SECONDS, target = mod))
+ mod.balloon_alert(user, "interrupted!")
+ return
+ mod.balloon_alert(user, "cell removed")
+ playsound(mod, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE)
+ var/obj/item/cell_to_move = cell
+ cell_to_move.forceMove(drop_location())
+ user.put_in_hands(cell_to_move)
+ mod.update_charge_alert()
+
+/obj/item/mod/core/standard/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
+ SIGNAL_HANDLER
+
+ if(istype(attacking_item, /obj/item/stock_parts/cell))
+ if(!mod.open)
+ mod.balloon_alert(user, "open the cover first!")
+ playsound(mod, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return NONE
+ if(cell)
+ mod.balloon_alert(user, "cell already installed!")
+ playsound(mod, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return COMPONENT_NO_AFTERATTACK
+ install_cell(attacking_item)
+ mod.balloon_alert(user, "cell installed")
+ playsound(mod, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE)
+ mod.update_charge_alert()
+ return COMPONENT_NO_AFTERATTACK
+ return NONE
+
+/obj/item/mod/core/standard/proc/on_wearer_set(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ RegisterSignal(mod.wearer, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(on_borg_charge))
+ RegisterSignal(mod, COMSIG_MOD_WEARER_UNSET, PROC_REF(on_wearer_unset))
+
+/obj/item/mod/core/standard/proc/on_wearer_unset(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ UnregisterSignal(mod.wearer, COMSIG_PROCESS_BORGCHARGER_OCCUPANT)
+ UnregisterSignal(mod, COMSIG_MOD_WEARER_UNSET)
+
+/obj/item/mod/core/standard/proc/on_borg_charge(datum/source, amount)
+ SIGNAL_HANDLER
+
+ add_charge(amount)
+ mod.update_charge_alert()
+
+/obj/item/mod/core/ethereal
+ name = "MOD ethereal core"
+ icon_state = "mod-core-ethereal"
+ desc = "A reverse engineered core of a Modular Outerwear Device. Using natural liquid electricity from Ethereals, \
+ preventing the need to use external sources to convert electric charge."
+ /// A modifier to all charge we use, ethereals don't need to spend as much energy as normal suits.
+ var/charge_modifier = 0.1
+
+/obj/item/mod/core/ethereal/charge_source()
+ var/obj/item/organ/stomach/ethereal/ethereal_stomach = mod.wearer.getorganslot(ORGAN_SLOT_STOMACH)
+ if(!istype(ethereal_stomach))
+ return
+ return ethereal_stomach
+
+/obj/item/mod/core/ethereal/charge_amount()
+ var/obj/item/organ/stomach/ethereal/charge_source = charge_source()
+ return charge_source?.crystal_charge || ELZUOSE_CHARGE_NONE
+
+/obj/item/mod/core/ethereal/max_charge_amount()
+ return ELZUOSE_CHARGE_FULL
+
+/obj/item/mod/core/ethereal/add_charge(amount)
+ var/obj/item/organ/stomach/ethereal/charge_source = charge_source()
+ if(!charge_source)
+ return FALSE
+ charge_source.adjust_charge(amount*charge_modifier)
+ return TRUE
+
+/obj/item/mod/core/ethereal/subtract_charge(amount)
+ var/obj/item/organ/stomach/ethereal/charge_source = charge_source()
+ if(!charge_source)
+ return FALSE
+ charge_source.adjust_charge(-amount*charge_modifier)
+ return TRUE
+
+/obj/item/mod/core/ethereal/check_charge(amount)
+ return charge_amount() >= amount*charge_modifier
+
+/obj/item/mod/core/ethereal/update_charge_alert()
+ var/obj/item/organ/stomach/ethereal/charge_source = charge_source()
+ if(charge_source)
+ mod.wearer.clear_alert("mod_charge")
+ return
+ mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/nocell)
+
+/obj/item/mod/core/plasma
+ name = "MOD plasma core"
+ icon_state = "mod-core-plasma"
+ desc = "Nanotrasen's attempt at capitalizing on their plasma research. These plasma cores are refueled \
+ through plasma ore, allowing for easy continued use by their mining squads."
+ /// How much charge we can store.
+ var/maxcharge = 10000
+ /// How much charge we are currently storing.
+ var/charge = 10000
+ /// Associated list of charge sources and how much they charge, only stacks allowed.
+ var/list/charger_list = list(/obj/item/stack/ore/plasma = 1500, /obj/item/stack/sheet/mineral/plasma = 2000)
+
+/obj/item/mod/core/plasma/install(obj/item/mod/control/mod_unit)
+ . = ..()
+ RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby))
+
+/obj/item/mod/core/plasma/uninstall()
+ UnregisterSignal(mod, COMSIG_PARENT_ATTACKBY)
+ return ..()
+
+/obj/item/mod/core/plasma/attackby(obj/item/attacking_item, mob/user, params)
+ if(charge_plasma(attacking_item, user))
+ return TRUE
+ return ..()
+
+/obj/item/mod/core/plasma/charge_source()
+ return src
+
+/obj/item/mod/core/plasma/charge_amount()
+ return charge
+
+/obj/item/mod/core/plasma/max_charge_amount()
+ return maxcharge
+
+/obj/item/mod/core/plasma/add_charge(amount)
+ charge = min(maxcharge, charge + amount)
+ return TRUE
+
+/obj/item/mod/core/plasma/subtract_charge(amount)
+ charge = max(0, charge - amount)
+ return TRUE
+
+/obj/item/mod/core/plasma/check_charge(amount)
+ return charge_amount() >= amount
+
+/obj/item/mod/core/plasma/update_charge_alert()
+ var/remaining_plasma = charge_amount() / max_charge_amount()
+ switch(remaining_plasma)
+ if(0.75 to INFINITY)
+ mod.wearer.clear_alert("mod_charge")
+ if(0.5 to 0.75)
+ mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell/plasma, 1)
+ if(0.25 to 0.5)
+ mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell/plasma, 2)
+ if(0.01 to 0.25)
+ mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell/plasma, 3)
+ else
+ mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/emptycell/plasma)
+
+/obj/item/mod/core/plasma/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
+ SIGNAL_HANDLER
+
+ if(charge_plasma(attacking_item, user))
+ return COMPONENT_NO_AFTERATTACK
+ return NONE
+
+/obj/item/mod/core/plasma/proc/charge_plasma(obj/item/stack/plasma, mob/user)
+ var/charge_given = is_type_in_list(plasma, charger_list, zebra = TRUE)
+ if(!charge_given)
+ return FALSE
+ var/uses_needed = min(plasma.amount, ROUND_UP((max_charge_amount() - charge_amount()) / charge_given))
+ if(!plasma.use(uses_needed))
+ return FALSE
+ add_charge(uses_needed * charge_given)
+ balloon_alert(user, "core refueled")
+ return TRUE
diff --git a/code/modules/mod/mod_paint.dm b/code/modules/mod/mod_paint.dm
new file mode 100644
index 00000000000..aead577224b
--- /dev/null
+++ b/code/modules/mod/mod_paint.dm
@@ -0,0 +1,192 @@
+#define MODPAINT_MAX_COLOR_VALUE 1.25
+#define MODPAINT_MIN_COLOR_VALUE 0
+#define MODPAINT_MAX_SECTION_COLORS 2
+#define MODPAINT_MIN_SECTION_COLORS 0.25
+#define MODPAINT_MAX_OVERALL_COLORS 4
+#define MODPAINT_MIN_OVERALL_COLORS 1.5
+
+/obj/item/mod/paint
+ name = "MOD paint kit"
+ desc = "This kit will repaint your MODsuit to something unique."
+ icon = 'icons/obj/clothing/modsuit/mod_construction.dmi'
+ icon_state = "paintkit"
+ var/obj/item/mod/control/editing_mod
+ var/atom/movable/screen/map_view/proxy_view
+ var/list/current_color
+
+/obj/item/mod/paint/Initialize(mapload)
+ . = ..()
+ current_color = color_matrix_identity()
+
+/obj/item/mod/paint/examine(mob/user)
+ . = ..()
+ . += span_notice("Left-click a MODsuit to change skin.")
+ //. += span_notice("Right-click a MODsuit to recolor.")
+
+/obj/item/mod/paint/pre_attack(atom/attacked_atom, mob/living/user, params)
+ if(!istype(attacked_atom, /obj/item/mod/control))
+ return ..()
+ var/obj/item/mod/control/mod = attacked_atom
+ if(mod.active || mod.activating)
+ balloon_alert(user, "suit is active!")
+ return TRUE
+ paint_skin(mod, user)
+
+/*obj/item/mod/paint/pre_attack_secondary(atom/attacked_atom, mob/living/user, params)
+ if(!istype(attacked_atom, /obj/item/mod/control))
+ return .()
+ var/obj/item/mod/control/mod = attacked_atom
+ if(mod.active || mod.activating)
+ balloon_alert(user, "suit is active!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ if(editing_mod)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ editing_mod = mod
+ proxy_view = new()
+ proxy_view.generate_view("color_matrix_proxy_[REF(user.client)]")
+
+ proxy_view.appearance = editing_mod.appearance
+ proxy_view.color = null
+ proxy_view.display_to(user)
+ ui_interact(user)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN*/
+
+/obj/item/mod/paint/ui_interact(mob/user, datum/tgui/ui)
+ if(!editing_mod)
+ return
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "MODpaint", name)
+ ui.open()
+
+/obj/item/mod/paint/ui_host()
+ return editing_mod
+
+/obj/item/mod/paint/ui_close(mob/user)
+ . = ..()
+ editing_mod = null
+ QDEL_NULL(proxy_view)
+ current_color = color_matrix_identity()
+
+/obj/item/mod/paint/ui_status(mob/user)
+ if(check_menu(editing_mod, user))
+ return ..()
+ return UI_CLOSE
+
+/obj/item/mod/paint/ui_static_data(mob/user)
+ var/list/data = list()
+ data["mapRef"] = proxy_view.assigned_map
+ return data
+
+/obj/item/mod/paint/ui_data(mob/user)
+ var/list/data = list()
+ data["currentColor"] = current_color
+ return data
+
+/obj/item/mod/paint/ui_act(action, list/params)
+ . = ..()
+ if(.)
+ return
+ switch(action)
+ if("transition_color")
+ current_color = params["color"]
+ animate(proxy_view, time = 0.5 SECONDS, color = current_color)
+ if("confirm")
+ if(length(current_color) != 20) //20 is the length of a matrix identity list
+ return
+ for(var/color_value in current_color)
+ if(isnum(color_value))
+ continue
+ return
+ var/total_color_value = 0
+ var/list/total_colors = current_color.Copy()
+ total_colors.Cut(13, length(total_colors)) // 13 to 20 are just a and c, dont want to count them
+ var/red_value = current_color[1] + current_color[5] + current_color[9] //rr + gr + br
+ var/green_value = current_color[2] + current_color[6] + current_color[10] //rg + gg + bg
+ var/blue_value = current_color[3] + current_color[7] + current_color[11] //rb + gb + bb
+ if(red_value > MODPAINT_MAX_SECTION_COLORS)
+ balloon_alert(usr, "total red too high! ([red_value*100]%/[MODPAINT_MAX_SECTION_COLORS*100]%)")
+ return
+ else if(red_value < MODPAINT_MIN_SECTION_COLORS)
+ balloon_alert(usr, "total red too low! ([red_value*100]%/[MODPAINT_MIN_SECTION_COLORS*100]%)")
+ return
+ if(green_value > MODPAINT_MAX_SECTION_COLORS)
+ balloon_alert(usr, "total green too high! ([green_value*100]%/[MODPAINT_MAX_SECTION_COLORS*100]%)")
+ return
+ else if(green_value < MODPAINT_MIN_SECTION_COLORS)
+ balloon_alert(usr, "total green too low! ([green_value*100]%/[MODPAINT_MIN_SECTION_COLORS*100]%)")
+ return
+ if(blue_value > MODPAINT_MAX_SECTION_COLORS)
+ balloon_alert(usr, "total blue too high! ([blue_value*100]%/[MODPAINT_MAX_SECTION_COLORS*100]%)")
+ return
+ else if(blue_value < MODPAINT_MIN_SECTION_COLORS)
+ balloon_alert(usr, "total blue too low! ([blue_value*100]%/[MODPAINT_MIN_SECTION_COLORS*100]%)")
+ return
+ for(var/color_value in total_colors)
+ total_color_value += color_value
+ if(color_value > MODPAINT_MAX_COLOR_VALUE)
+ balloon_alert(usr, "one of colors too high! ([color_value*100]%/[MODPAINT_MAX_COLOR_VALUE*100]%")
+ return
+ else if(color_value < MODPAINT_MIN_COLOR_VALUE)
+ balloon_alert(usr, "one of colors too low! ([color_value*100]%/[MODPAINT_MIN_COLOR_VALUE*100]%")
+ return
+ if(total_color_value > MODPAINT_MAX_OVERALL_COLORS)
+ balloon_alert(usr, "total colors too high! ([total_color_value*100]%/[MODPAINT_MAX_OVERALL_COLORS*100]%)")
+ return
+ else if(total_color_value < MODPAINT_MIN_OVERALL_COLORS)
+ balloon_alert(usr, "total colors too low! ([total_color_value*100]%/[MODPAINT_MIN_OVERALL_COLORS*100]%)")
+ return
+ editing_mod.set_mod_color(current_color)
+ SStgui.close_uis(src)
+
+/obj/item/mod/paint/proc/paint_skin(obj/item/mod/control/mod, mob/user)
+ if(length(mod.theme.skins) <= 1)
+ balloon_alert(user, "no alternate skins!")
+ return
+ var/list/skins = list()
+ for(var/mod_skin in mod.theme.skins)
+ skins[mod_skin] = image(icon = mod.icon, icon_state = "[mod_skin]-control")
+ var/pick = show_radial_menu(user, mod, skins, custom_check = CALLBACK(src, PROC_REF(check_menu), mod, user), require_near = TRUE)
+ if(!pick)
+ balloon_alert(user, "no skin picked!")
+ return
+ mod.set_mod_skin(pick)
+
+/obj/item/mod/paint/proc/check_menu(obj/item/mod/control/mod, mob/user)
+ if(user.incapacitated() || !user.is_holding(src) || !mod || mod.active || mod.activating)
+ return FALSE
+ return TRUE
+
+#undef MODPAINT_MAX_COLOR_VALUE
+#undef MODPAINT_MIN_COLOR_VALUE
+#undef MODPAINT_MAX_SECTION_COLORS
+#undef MODPAINT_MIN_SECTION_COLORS
+#undef MODPAINT_MAX_OVERALL_COLORS
+#undef MODPAINT_MIN_OVERALL_COLORS
+
+/obj/item/mod/skin_applier
+ name = "MOD skin applier"
+ desc = "This one-use skin applier will add a skin to MODsuits of a specific type."
+ icon = 'icons/obj/clothing/modsuit/mod_construction.dmi'
+ icon_state = "skinapplier"
+ var/skin = "civilian"
+ var/compatible_theme = /datum/mod_theme
+
+/obj/item/mod/skin_applier/Initialize(mapload)
+ . = ..()
+ name = "MOD [skin] skin applier"
+
+/obj/item/mod/skin_applier/pre_attack(atom/attacked_atom, mob/living/user, params)
+ if(!istype(attacked_atom, /obj/item/mod/control))
+ return ..()
+ var/obj/item/mod/control/mod = attacked_atom
+ if(mod.active || mod.activating)
+ balloon_alert(user, "suit is active!")
+ return TRUE
+ if(!istype(mod.theme, compatible_theme))
+ balloon_alert(user, "incompatible theme!")
+ return TRUE
+ mod.set_mod_skin(skin)
+ balloon_alert(user, "skin applied")
+ qdel(src)
+ return TRUE
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
new file mode 100644
index 00000000000..4643fa93920
--- /dev/null
+++ b/code/modules/mod/mod_theme.dm
@@ -0,0 +1,1154 @@
+/// Global proc that sets up all MOD themes as singletons in a list and returns it.
+/proc/setup_mod_themes()
+ . = list()
+ for(var/path in typesof(/datum/mod_theme))
+ var/datum/mod_theme/new_theme = new path()
+ .[path] = new_theme
+
+/// MODsuit theme, instanced once and then used by MODsuits to grab various statistics.
+/datum/mod_theme
+ /// Theme name for the MOD.
+ var/name = "standard"
+ /// Description added to the MOD.
+ var/desc = "A MOD suit. Placeholder Desc"
+ /// Extended description on examine_more
+ var/extended_desc = "Placeholder Desc"
+ /// Default skin of the MOD.
+ var/default_skin = "standard"
+ /// The slot this mod theme fits on
+ var/slot_flags = ITEM_SLOT_BACK
+ /// Armor shared across the MOD parts.
+ var/armor = list("melee" = 10, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 0, "bio" = 100, "fire" = 25, "acid" = 25)
+ /// Resistance flags shared across the MOD parts.
+ var/resistance_flags = NONE
+ /// Atom flags shared across the MOD parts.
+ var/atom_flags = NONE
+ /// Max heat protection shared across the MOD parts.
+ var/max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+ /// Max cold protection shared across the MOD parts.
+ var/min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+ /// Siemens shared across the MOD parts.
+ var/siemens_coefficient = 0.5
+ /// How much modules can the MOD carry without malfunctioning.
+ var/complexity_max = DEFAULT_MAX_COMPLEXITY
+ /// How much battery power the MOD uses by just being on
+ var/charge_drain = DEFAULT_CHARGE_DRAIN
+ /// Slowdown of the MOD when not active.
+ var/slowdown_inactive = 1.25
+ /// Slowdown of the MOD when active.
+ var/slowdown_active = 0.75
+ /// Theme used by the MOD TGUI.
+ var/ui_theme = "ntos"
+ /// List of inbuilt modules. These are different from the pre-equipped suits, you should mainly use these for unremovable modules with 0 complexity.
+ var/list/inbuilt_modules = list()
+ /// Modules blacklisted from the MOD.
+ var/list/module_blacklist = list()
+ /// Allowed items in the chestplate's suit storage.
+ var/list/allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ )
+ /// List of skins with their appropriate clothing flags.
+ var/list/skins = list(
+ "standard" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ "civilian" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/engineering
+ name = "engineering"
+ default_skin = "engineering"
+ armor = list("melee" = 10, "bullet" = 5, "laser" = 20, "energy" = 10, "bomb" = 10, "bio" = 100, "fire" = 100, "acid" = 25)
+ resistance_flags = FIRE_PROOF
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ siemens_coefficient = 0
+ slowdown_inactive = 1.5
+ slowdown_active = 1
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/construction/rcd,
+ /obj/item/storage/bag/construction,
+ )
+ skins = list(
+ "engineering" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/atmospheric
+ name = "atmospheric"
+ default_skin = "atmospheric"
+ armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 15, "bomb" = 10, "bio" = 100, "fire" = 100, "acid" = 75)
+ resistance_flags = FIRE_PROOF
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ slowdown_inactive = 1.5
+ slowdown_active = 1
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/analyzer,
+ /obj/item/t_scanner,
+ /obj/item/pipe_dispenser,
+ )
+ skins = list(
+ "atmospheric" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDESNOUT,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR,
+ UNSEALED_COVER = HEADCOVERSMOUTH,
+ SEALED_COVER = HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/advanced
+ name = "advanced"
+ default_skin = "advanced"
+ armor = list("melee" = 15, "bullet" = 5, "laser" = 20, "energy" = 15, "bomb" = 50, "bio" = 100, "fire" = 100, "acid" = 90)
+ resistance_flags = FIRE_PROOF
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ siemens_coefficient = 0
+ slowdown_inactive = 1
+ slowdown_active = 0.5
+ inbuilt_modules = list(/obj/item/mod/module/magboot/advanced)
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/analyzer,
+ /obj/item/t_scanner,
+ /obj/item/pipe_dispenser,
+ /obj/item/construction/rcd,
+ /obj/item/storage/bag/construction,
+ /obj/item/melee/classic_baton/telescopic,
+ )
+ skins = list(
+ "advanced" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/mining
+ name = "mining"
+ default_skin = "mining"
+ armor = list("melee" = 15, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 30, "bio" = 100, "fire" = 100, "acid" = 75)
+ resistance_flags = FIRE_PROOF|LAVA_PROOF
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ complexity_max = DEFAULT_MAX_COMPLEXITY - 5
+ charge_drain = DEFAULT_CHARGE_DRAIN * 2
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/resonator,
+ /obj/item/mining_scanner,
+ /obj/item/t_scanner/adv_mining_scanner,
+ /obj/item/pickaxe,
+ /obj/item/kinetic_crusher,
+ /obj/item/stack/ore/plasma,
+ /obj/item/storage/bag/ore,
+ )
+ inbuilt_modules = list()
+ skins = list(
+ "mining" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEEARS|HIDEHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ "asteroid" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/loader
+ name = "loader"
+ default_skin = "loader"
+ armor = list("melee" = 15, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 10, "bio" = 10, "fire" = 25, "acid" = 25)
+ max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
+ min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
+ siemens_coefficient = 0.25
+ complexity_max = DEFAULT_MAX_COMPLEXITY - 5
+ slowdown_inactive = 0.5
+ slowdown_active = 0
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/paper
+ )
+ inbuilt_modules = list(/obj/item/mod/module/clamp/loader, /obj/item/mod/module/magnet)
+ skins = list(
+ "loader" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ UNSEALED_INVISIBILITY = HIDEEARS|HIDEHAIR,
+ SEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEYES|HIDEFACE|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ ),
+ GAUNTLETS_FLAGS = list(
+ SEALED_CLOTHING = THICKMATERIAL,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ SEALED_CLOTHING = THICKMATERIAL,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/medical
+ name = "medical"
+ default_skin = "medical"
+ armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 10, "bio" = 100, "fire" = 60, "acid" = 75)
+ charge_drain = DEFAULT_CHARGE_DRAIN * 1.5
+ slowdown_inactive = 1
+ slowdown_active = 0.5
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/healthanalyzer,
+ /obj/item/reagent_containers/dropper,
+ /obj/item/reagent_containers/glass/beaker,
+ /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/hypospray,
+ /obj/item/reagent_containers/pill,
+ /obj/item/reagent_containers/syringe,
+ /obj/item/stack/medical,
+ /obj/item/sensor_device,
+ /obj/item/storage/pill_bottle,
+ /obj/item/storage/bag/chemistry,
+ /obj/item/storage/bag/bio,
+ )
+ skins = list(
+ "medical" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ "corpsman" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/rescue
+ name = "rescue"
+ default_skin = "rescue"
+ armor = list("melee" = 10, "bullet" = 10, "laser" = 5, "energy" = 5, "bomb" = 10, "bio" = 100, "fire" = 100, "acid" = 100)
+ resistance_flags = FIRE_PROOF|ACID_PROOF
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ charge_drain = DEFAULT_CHARGE_DRAIN * 1.5
+ slowdown_inactive = 0.75
+ slowdown_active = 0.25
+ inbuilt_modules = list(/obj/item/mod/module/quick_carry/advanced)
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/healthanalyzer,
+ /obj/item/reagent_containers/dropper,
+ /obj/item/reagent_containers/glass/beaker,
+ /obj/item/reagent_containers/glass/bottle,
+ /obj/item/reagent_containers/hypospray,
+ /obj/item/reagent_containers/pill,
+ /obj/item/reagent_containers/syringe,
+ /obj/item/stack/medical,
+ /obj/item/sensor_device,
+ /obj/item/storage/pill_bottle,
+ /obj/item/storage/bag/chemistry,
+ /obj/item/storage/bag/bio,
+ /obj/item/melee/classic_baton/telescopic,
+ )
+ skins = list(
+ "rescue" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/research
+ name = "research"
+ default_skin = "research"
+ armor = list("melee" = 20, "bullet" = 15, "laser" = 5, "energy" = 5, "bomb" = 100, "bio" = 100, "fire" = 100, "acid" = 100)
+ resistance_flags = FIRE_PROOF|ACID_PROOF
+ atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ complexity_max = DEFAULT_MAX_COMPLEXITY + 5
+ slowdown_inactive = 1.75
+ slowdown_active = 1.25
+ inbuilt_modules = list(/obj/item/mod/module/reagent_scanner/advanced)
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/analyzer,
+ /obj/item/dnainjector,
+ /obj/item/storage/bag/bio,
+ /obj/item/melee/classic_baton/telescopic,
+ )
+ skins = list(
+ "research" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/security
+ name = "security"
+ default_skin = "security"
+ armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 15, "bomb" = 25, "bio" = 100, "fire" = 75, "acid" = 75)
+ complexity_max = DEFAULT_MAX_COMPLEXITY - 3
+ slowdown_inactive = 1
+ slowdown_active = 0.5
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/reagent_containers/spray/pepper,
+ /obj/item/restraints/handcuffs,
+ /obj/item/assembly/flash,
+ /obj/item/melee/baton,
+ )
+ skins = list(
+ "security" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE,
+ UNSEALED_COVER = HEADCOVERSMOUTH,
+ SEALED_COVER = HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/safeguard
+ name = "safeguard"
+ default_skin = "safeguard"
+ armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 15, "bomb" = 40, "bio" = 100, "fire" = 100, "acid" = 95)
+ resistance_flags = FIRE_PROOF
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ slowdown_inactive = 0.75
+ slowdown_active = 0.25
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/reagent_containers/spray/pepper,
+ /obj/item/restraints/handcuffs,
+ /obj/item/assembly/flash,
+ /obj/item/melee/baton,
+ )
+ skins = list(
+ "safeguard" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/magnate
+ name = "magnate"
+ default_skin = "magnate"
+ armor = list("melee" = 20, "bullet" = 15, "laser" = 15, "energy" = 15, "bomb" = 50, "bio" = 100, "fire" = 100, "acid" = 100)
+ resistance_flags = FIRE_PROOF|ACID_PROOF
+ atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ siemens_coefficient = 0
+ complexity_max = DEFAULT_MAX_COMPLEXITY + 5
+ slowdown_inactive = 0.75
+ slowdown_active = 0.25
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/restraints/handcuffs,
+ /obj/item/assembly/flash,
+ /obj/item/melee/baton,
+ )
+ skins = list(
+ "magnate" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/syndicate
+ name = "syndicate"
+ default_skin = "syndicate"
+ armor = list("melee" = 15, "bullet" = 20, "laser" = 15, "energy" = 15, "bomb" = 35, "bio" = 100, "fire" = 50, "acid" = 90)
+ atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ siemens_coefficient = 0
+ slowdown_inactive = 1
+ slowdown_active = 0.5
+ ui_theme = "syndicate"
+ inbuilt_modules = list(/obj/item/mod/module/armor_booster)
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/restraints/handcuffs,
+ /obj/item/assembly/flash,
+ /obj/item/melee/baton,
+ /obj/item/melee/energy/sword,
+ /obj/item/shield/energy,
+ )
+ skins = list(
+ "syndicate" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/elite
+ name = "elite"
+ default_skin = "elite"
+ armor = list("melee" = 35, "bullet" = 30, "laser" = 35, "energy" = 35, "bomb" = 55, "bio" = 100, "fire" = 100, "acid" = 100)
+ resistance_flags = FIRE_PROOF|ACID_PROOF
+ atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ siemens_coefficient = 0
+ slowdown_inactive = 1
+ slowdown_active = 0.5
+ ui_theme = "syndicate"
+ inbuilt_modules = list(/obj/item/mod/module/armor_booster)
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/restraints/handcuffs,
+ /obj/item/assembly/flash,
+ /obj/item/melee/baton,
+ /obj/item/melee/energy/sword,
+ /obj/item/shield/energy,
+ )
+ skins = list(
+ "elite" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/ninja
+ name = "ninja"
+ default_skin = "ninja"
+ armor = list("melee" = 40, "bullet" = 30, "laser" = 20, "energy" = 30, "bomb" = 30, "bio" = 100, "fire" = 100, "acid" = 100)
+ resistance_flags = LAVA_PROOF|FIRE_PROOF|ACID_PROOF
+ charge_drain = DEFAULT_CHARGE_DRAIN * 0.5
+ siemens_coefficient = 0
+ slowdown_inactive = 0.5
+ slowdown_active = 0
+ ui_theme = "hackerman"
+ inbuilt_modules = list(/obj/item/mod/module/welding/camera_vision, /obj/item/mod/module/hacker, /obj/item/mod/module/weapon_recall, /obj/item/mod/module/adrenaline_boost, /obj/item/mod/module/energy_net)
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/gun,
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/melee/baton,
+ /obj/item/restraints/handcuffs,
+ )
+ skins = list(
+ "ninja" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEEARS|HIDEHAIR,
+ SEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEYES|HIDEFACE|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/prototype
+ name = "prototype"
+ default_skin = "prototype"
+ armor = list("melee" = 20, "bullet" = 5, "laser" = 10, "energy" = 10, "bomb" = 50, "bio" = 100, "fire" = 100, "acid" = 75)
+ resistance_flags = FIRE_PROOF
+ siemens_coefficient = 0
+ complexity_max = DEFAULT_MAX_COMPLEXITY + 5
+ charge_drain = DEFAULT_CHARGE_DRAIN * 2
+ slowdown_inactive = 2
+ slowdown_active = 1.5
+ ui_theme = "hackerman"
+ //inbuilt_modules = list(/obj/item/mod/module/anomaly_locked/kinesis/prebuilt/prototype)
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/analyzer,
+ /obj/item/t_scanner,
+ /obj/item/pipe_dispenser,
+ /obj/item/construction/rcd,
+ )
+ skins = list(
+ "prototype" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/responsory
+ name = "responsory"
+ default_skin = "responsory"
+ armor = list("melee" = 50, "bullet" = 40, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "fire" = 100, "acid" = 90)
+ atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+ resistance_flags = FIRE_PROOF
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ siemens_coefficient = 0
+ slowdown_inactive = 0.5
+ slowdown_active = 0
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/restraints/handcuffs,
+ /obj/item/assembly/flash,
+ /obj/item/melee/baton,
+ )
+ skins = list(
+ "responsory" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ "inquisitory" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/apocryphal
+ name = "apocryphal"
+ default_skin = "apocryphal"
+ armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 60, "bomb" = 100, "bio" = 100, "fire" = 100, "acid" = 100)
+ resistance_flags = FIRE_PROOF|ACID_PROOF
+ atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ siemens_coefficient = 0
+ complexity_max = DEFAULT_MAX_COMPLEXITY + 10
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/restraints/handcuffs,
+ /obj/item/assembly/flash,
+ /obj/item/melee/baton,
+ /obj/item/melee/energy/sword,
+ /obj/item/shield/energy,
+ )
+ skins = list(
+ "apocryphal" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEEARS|HIDEHAIR,
+ SEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEYES|HIDEFACE|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/corporate
+ name = "corporate"
+ default_skin = "corporate"
+ armor = list("melee" = 50, "bullet" = 40, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "fire" = 100, "acid" = 100)
+ resistance_flags = FIRE_PROOF|ACID_PROOF
+ atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ siemens_coefficient = 0
+ slowdown_inactive = 0.5
+ slowdown_active = 0
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/restraints/handcuffs,
+ /obj/item/assembly/flash,
+ /obj/item/melee/baton,
+ )
+ skins = list(
+ "corporate" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/chrono
+ name = "chrono"
+ default_skin = "chrono"
+ armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 60, "bomb" = 30, "bio" = 100, "fire" = 100, "acid" = 100)
+ resistance_flags = FIRE_PROOF|ACID_PROOF
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ complexity_max = DEFAULT_MAX_COMPLEXITY - 10
+ slowdown_inactive = 0
+ slowdown_active = 0
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/restraints/handcuffs,
+ )
+ skins = list(
+ "chrono" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = NECK_LAYER,
+ UNSEALED_CLOTHING = SNUG_FIT,
+ SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/debug
+ name = "debug"
+ default_skin = "debug"
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 100, "bio" = 100, "fire" = 100, "acid" = 100)
+ resistance_flags = FIRE_PROOF|ACID_PROOF
+ atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+ max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ complexity_max = 50
+ siemens_coefficient = 0
+ slowdown_inactive = 0.5
+ slowdown_active = 0
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/gun,
+ )
+ skins = list(
+ "debug" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE,
+ UNSEALED_COVER = HEADCOVERSMOUTH,
+ SEALED_COVER = HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
+/datum/mod_theme/administrative
+ name = "administrative"
+ default_skin = "debug"
+ armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 100, "bio" = 100, "fire" = 100, "acid" = 100)
+ resistance_flags = INDESTRUCTIBLE|LAVA_PROOF|FIRE_PROOF|UNACIDABLE|ACID_PROOF
+ atom_flags = PREVENT_CONTENTS_EXPLOSION_1
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ complexity_max = 1000
+ charge_drain = DEFAULT_CHARGE_DRAIN * 0
+ siemens_coefficient = 0
+ slowdown_inactive = 0
+ slowdown_active = 0
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/gun,
+ )
+ skins = list(
+ "debug" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCK_GAS_SMOKE_EFFECT,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT,
+ SEALED_INVISIBILITY = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE,
+ UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|BLOCKS_SHOVE_KNOCKDOWN,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
new file mode 100644
index 00000000000..6cd33197e42
--- /dev/null
+++ b/code/modules/mod/mod_types.dm
@@ -0,0 +1,331 @@
+/obj/item/mod/control/pre_equipped
+ /// The skin we apply to the suit, defaults to the default_skin of the theme.
+ var/applied_skin
+ /// The MOD core we apply to the suit.
+ var/applied_core = /obj/item/mod/core/standard
+ /// The cell we apply to the core. Only applies to standard core suits.
+ var/applied_cell = /obj/item/stock_parts/cell/high
+
+/obj/item/mod/control/pre_equipped/Initialize(mapload, new_theme, new_skin, new_core)
+ new_skin = applied_skin
+ new_core = new applied_core(src)
+ if(istype(new_core, /obj/item/mod/core/standard))
+ var/obj/item/mod/core/standard/cell_core = new_core
+ cell_core.cell = new applied_cell()
+ return ..()
+
+/obj/item/mod/control/pre_equipped/standard
+ initial_modules = list(
+ /obj/item/mod/module/storage,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/flashlight,
+ )
+
+/obj/item/mod/control/pre_equipped/engineering
+ theme = /datum/mod_theme/engineering
+ initial_modules = list(
+ /obj/item/mod/module/storage,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/magboot,
+ )
+
+/obj/item/mod/control/pre_equipped/atmospheric
+ theme = /datum/mod_theme/atmospheric
+ initial_modules = list(
+ /obj/item/mod/module/storage,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/t_ray,
+ )
+
+/obj/item/mod/control/pre_equipped/advanced
+ theme = /datum/mod_theme/advanced
+ applied_cell = /obj/item/stock_parts/cell/super
+ initial_modules = list(
+ /obj/item/mod/module/storage/large_capacity,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/jetpack,
+ )
+
+/obj/item/mod/control/pre_equipped/loader
+ theme = /datum/mod_theme/loader
+ initial_modules = list(
+ /obj/item/mod/module/storage/large_capacity,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/paper_dispenser,
+ /obj/item/mod/module/stamp,
+ )
+
+/obj/item/mod/control/pre_equipped/mining
+ theme = /datum/mod_theme/mining
+ applied_core = /obj/item/mod/core/plasma
+ initial_modules = list(
+ /obj/item/mod/module/storage,
+ /obj/item/mod/module/gps,
+ /obj/item/mod/module/orebag,
+ /obj/item/mod/module/clamp,
+ /obj/item/mod/module/drill,
+ )
+
+/obj/item/mod/control/pre_equipped/medical
+ theme = /datum/mod_theme/medical
+ initial_modules = list(
+ /obj/item/mod/module/storage,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/health_analyzer,
+ /obj/item/mod/module/quick_carry,
+ )
+
+/obj/item/mod/control/pre_equipped/rescue
+ theme = /datum/mod_theme/rescue
+ applied_cell = /obj/item/stock_parts/cell/super
+ initial_modules = list(
+ /obj/item/mod/module/storage/large_capacity,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/health_analyzer,
+ /obj/item/mod/module/injector,
+ )
+
+/obj/item/mod/control/pre_equipped/research
+ theme = /datum/mod_theme/research
+ applied_cell = /obj/item/stock_parts/cell/super
+ initial_modules = list(
+ /obj/item/mod/module/storage/large_capacity,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/flashlight,
+ //obj/item/mod/module/circuit,
+ /obj/item/mod/module/t_ray,
+ )
+
+/obj/item/mod/control/pre_equipped/security
+ theme = /datum/mod_theme/security
+ initial_modules = list(
+ /obj/item/mod/module/storage,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/flashlight,
+ )
+
+/obj/item/mod/control/pre_equipped/safeguard
+ theme = /datum/mod_theme/safeguard
+ applied_cell = /obj/item/stock_parts/cell/super
+ initial_modules = list(
+ /obj/item/mod/module/storage/large_capacity,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/jetpack,
+ /obj/item/mod/module/megaphone,
+ )
+
+/obj/item/mod/control/pre_equipped/magnate
+ theme = /datum/mod_theme/magnate
+ applied_cell = /obj/item/stock_parts/cell/hyper
+ initial_modules = list(
+ /obj/item/mod/module/storage/large_capacity,
+ /obj/item/mod/module/hat_stabilizer,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/jetpack/advanced,
+ )
+
+/obj/item/mod/control/pre_equipped/traitor
+ theme = /datum/mod_theme/syndicate
+ applied_cell = /obj/item/stock_parts/cell/super
+ initial_modules = list(
+ /obj/item/mod/module/storage/syndicate,
+ /obj/item/mod/module/emp_shield,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/jetpack,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/dna_lock,
+ )
+
+/obj/item/mod/control/pre_equipped/traitor_elite
+ theme = /datum/mod_theme/elite
+ applied_cell = /obj/item/stock_parts/cell/bluespace
+ initial_modules = list(
+ /obj/item/mod/module/storage/syndicate,
+ /obj/item/mod/module/emp_shield,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/dna_lock,
+ )
+
+/obj/item/mod/control/pre_equipped/nuclear
+ theme = /datum/mod_theme/syndicate
+ applied_cell = /obj/item/stock_parts/cell/hyper
+ req_access = list(ACCESS_SYNDICATE)
+ initial_modules = list(
+ /obj/item/mod/module/storage/syndicate,
+ /obj/item/mod/module/emp_shield,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/flashlight,
+ )
+
+/obj/item/mod/control/pre_equipped/elite
+ theme = /datum/mod_theme/elite
+ applied_cell = /obj/item/stock_parts/cell/bluespace
+ req_access = list(ACCESS_SYNDICATE)
+ initial_modules = list(
+ /obj/item/mod/module/storage/syndicate,
+ /obj/item/mod/module/emp_shield,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/flashlight,
+ )
+
+/obj/item/mod/control/pre_equipped/elite/flamethrower
+ initial_modules = list(
+ /obj/item/mod/module/storage/syndicate,
+ /obj/item/mod/module/emp_shield,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/thermal_regulator,
+ /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/flamethrower,
+ )
+
+/obj/item/mod/control/pre_equipped/ninja
+ theme = /datum/mod_theme/ninja
+ applied_cell = /obj/item/stock_parts/cell/super
+ initial_modules = list(
+ /obj/item/mod/module/storage,
+ /obj/item/mod/module/noslip,
+ /obj/item/mod/module/status_readout,
+ /obj/item/mod/module/stealth/ninja,
+ /obj/item/mod/module/dispenser/ninja,
+ /obj/item/mod/module/dna_lock/reinforced,
+ /obj/item/mod/module/emp_shield/pulse,
+ )
+
+/obj/item/mod/control/pre_equipped/prototype
+ theme = /datum/mod_theme/prototype
+ req_access = list(ACCESS_AWAY_GENERAL)
+ initial_modules = list(
+ /obj/item/mod/module/storage,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/tether,
+ )
+
+/obj/item/mod/control/pre_equipped/responsory
+ theme = /datum/mod_theme/responsory
+ applied_cell = /obj/item/stock_parts/cell/hyper
+ req_access = list(ACCESS_CENT_GENERAL)
+ initial_modules = list(
+ /obj/item/mod/module/storage/large_capacity,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/emp_shield,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/flashlight,
+ )
+ /// The insignia type, insignias show what sort of member of the ERT you're dealing with.
+ var/insignia_type = /obj/item/mod/module/insignia
+ /// Additional module we add, as a treat.
+ var/additional_module = /obj/item/mod/module
+
+/obj/item/mod/control/pre_equipped/responsory/Initialize(mapload, new_theme, new_skin, new_core)
+ initial_modules.Insert(1, insignia_type)
+ initial_modules.Add(additional_module)
+ return ..()
+
+/obj/item/mod/control/pre_equipped/responsory/commander
+ insignia_type = /obj/item/mod/module/insignia/commander
+ additional_module = /obj/item/mod/module/power_kick
+
+/obj/item/mod/control/pre_equipped/responsory/security
+ insignia_type = /obj/item/mod/module/insignia/security
+ additional_module = /obj/item/mod/module/megaphone
+
+/obj/item/mod/control/pre_equipped/responsory/engineer
+ insignia_type = /obj/item/mod/module/insignia/engineer
+ additional_module = /obj/item/mod/module/magboot
+
+/obj/item/mod/control/pre_equipped/responsory/medic
+ insignia_type = /obj/item/mod/module/insignia/medic
+ additional_module = /obj/item/mod/module/quick_carry
+
+/obj/item/mod/control/pre_equipped/responsory/janitor
+ insignia_type = /obj/item/mod/module/insignia/janitor
+ additional_module = /obj/item/mod/module/clamp
+
+/obj/item/mod/control/pre_equipped/responsory/chaplain
+ insignia_type = /obj/item/mod/module/insignia/chaplain
+ additional_module = /obj/item/mod/module/injector
+
+/obj/item/mod/control/pre_equipped/apocryphal
+ theme = /datum/mod_theme/apocryphal
+ applied_cell = /obj/item/stock_parts/cell/bluespace
+ req_access = list(ACCESS_CENT_SPECOPS)
+ initial_modules = list(
+ /obj/item/mod/module/storage/bluespace,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/emp_shield/advanced,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/jetpack,
+ )
+
+/obj/item/mod/control/pre_equipped/corporate
+ theme = /datum/mod_theme/corporate
+ applied_core = /obj/item/mod/core/infinite
+ req_access = list(ACCESS_CENT_SPECOPS)
+ initial_modules = list(
+ /obj/item/mod/module/storage/bluespace,
+ /obj/item/mod/module/hat_stabilizer,
+ /obj/item/mod/module/magnetic_harness,
+ /obj/item/mod/module/emp_shield/advanced,
+ )
+
+/*obj/item/mod/control/pre_equipped/chrono
+ theme = /datum/mod_theme/chrono
+ applied_core = /obj/item/mod/core/infinite
+ initial_modules = list(
+ /obj/item/mod/module/eradication_lock,
+ /obj/item/mod/module/emp_shield,
+ /obj/item/mod/module/timeline_jumper,
+ /obj/item/mod/module/timestopper,
+ /obj/item/mod/module/rewinder,
+ /obj/item/mod/module/tem,
+ /obj/item/mod/module/anomaly_locked/kinesis/plus,
+ )*/
+
+/obj/item/mod/control/pre_equipped/debug
+ theme = /datum/mod_theme/debug
+ applied_core = /obj/item/mod/core/infinite
+ initial_modules = list(
+ /obj/item/mod/module/storage/bluespace,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/tether,
+ /obj/item/mod/module/injector,
+ )
+
+/obj/item/mod/control/pre_equipped/administrative
+ theme = /datum/mod_theme/administrative
+ applied_core = /obj/item/mod/core/infinite
+ initial_modules = list(
+ /obj/item/mod/module/storage/bluespace,
+ /obj/item/mod/module/emp_shield/advanced,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/stealth/ninja,
+ /obj/item/mod/module/quick_carry/advanced,
+ /obj/item/mod/module/magboot/advanced,
+ /obj/item/mod/module/jetpack/advanced,
+ //obj/item/mod/module/anomaly_locked/kinesis/plus,
+ )
+
+//these exist for the prefs menu
+/obj/item/mod/control/pre_equipped/empty
+
+/obj/item/mod/control/pre_equipped/empty/syndicate
+ theme = /datum/mod_theme/syndicate
+
+/obj/item/mod/control/pre_equipped/empty/elite
+ theme = /datum/mod_theme/elite
+
+/obj/item/mod/control/pre_equipped/empty/ninja
+ theme = /datum/mod_theme/ninja
+
+INITIALIZE_IMMEDIATE(/obj/item/mod/control/pre_equipped/empty)
diff --git a/code/modules/mod/mod_ui.dm b/code/modules/mod/mod_ui.dm
new file mode 100644
index 00000000000..3bfa930dea7
--- /dev/null
+++ b/code/modules/mod/mod_ui.dm
@@ -0,0 +1,86 @@
+/obj/item/mod/control/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "MODsuit", name)
+ ui.open()
+
+/obj/item/mod/control/ui_data(mob/user)
+ var/data = list()
+ data["interface_break"] = interface_break
+ data["malfunctioning"] = malfunctioning
+ data["open"] = open
+ data["active"] = active
+ data["locked"] = locked
+ data["complexity"] = complexity
+ data["selected_module"] = selected_module?.name
+ data["wearer_name"] = wearer ? (wearer.get_authentification_name("Unknown") || "Unknown") : "No Occupant"
+ data["wearer_job"] = wearer ? wearer.get_assignment("Unknown", "Unknown", FALSE) : "No Job"
+ //data[JOB_AI] = ai?.name
+ data["core"] = core?.name
+ data["charge"] = get_charge_percent()
+ data["modules"] = list()
+ for(var/obj/item/mod/module/module as anything in modules)
+ var/list/module_data = list(
+ "module_name" = module.name,
+ "description" = module.desc,
+ "module_type" = module.module_type,
+ "module_active" = module.active,
+ "pinned" = module.pinned_to[user],
+ "idle_power" = module.idle_power_cost,
+ "active_power" = module.active_power_cost,
+ "use_power" = module.use_power_cost,
+ "module_complexity" = module.complexity,
+ "cooldown_time" = module.cooldown_time,
+ "cooldown" = round(COOLDOWN_TIMELEFT(module, cooldown_timer), 1 SECONDS),
+ "id" = module.tgui_id,
+ "ref" = REF(module),
+ "configuration_data" = module.get_configuration()
+ )
+ module_data += module.add_ui_data()
+ data["modules"] += list(module_data)
+ return data
+
+/obj/item/mod/control/ui_static_data(mob/user)
+ var/data = list()
+ data["ui_theme"] = ui_theme
+ data["control"] = name
+ data["complexity_max"] = complexity_max
+ data["helmet"] = helmet?.name
+ data["chestplate"] = chestplate?.name
+ data["gauntlets"] = gauntlets?.name
+ data["boots"] = boots?.name
+ return data
+
+/obj/item/mod/control/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+ if(locked && !allowed(usr))
+ balloon_alert(usr, "insufficient access!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return
+ if(malfunctioning && prob(75))
+ balloon_alert(usr, "button malfunctions!")
+ return
+ switch(action)
+ if("lock")
+ locked = !locked
+ balloon_alert(usr, "[locked ? "locked" : "unlocked"]!")
+ if("activate")
+ toggle_activate(usr)
+ if("select")
+ var/obj/item/mod/module/module = locate(params["ref"]) in modules
+ if(!module)
+ return
+ module.on_select()
+ if("configure")
+ var/obj/item/mod/module/module = locate(params["ref"]) in modules
+ if(!module)
+ return
+ module.configure_edit(params["key"], params["value"])
+ if("pin")
+ var/obj/item/mod/module/module = locate(params["ref"]) in modules
+ if(!module)
+ return
+ module.pin(usr)
+ return TRUE
diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm
new file mode 100644
index 00000000000..7264066e5d1
--- /dev/null
+++ b/code/modules/mod/modules/_module.dm
@@ -0,0 +1,399 @@
+///MOD Module - A special device installed in a MODsuit allowing the suit to do new stuff.
+/obj/item/mod/module
+ name = "MOD module"
+ icon = 'icons/obj/clothing/modsuit/mod_modules.dmi'
+ icon_state = "module"
+ /// If it can be removed
+ var/removable = TRUE
+ /// If it's passive, togglable, usable or active
+ var/module_type = MODULE_PASSIVE
+ /// Is the module active
+ var/active = FALSE
+ /// How much space it takes up in the MOD
+ var/complexity = 0
+ /// Power use when idle
+ var/idle_power_cost = DEFAULT_CHARGE_DRAIN * 0
+ /// Power use when active
+ var/active_power_cost = DEFAULT_CHARGE_DRAIN * 0
+ /// Power use when used, we call it manually
+ var/use_power_cost = DEFAULT_CHARGE_DRAIN * 0
+ /// ID used by their TGUI
+ var/tgui_id
+ /// Linked MODsuit
+ var/obj/item/mod/control/mod
+ /// If we're an active module, what item are we?
+ var/obj/item/device
+ /// Overlay given to the user when the module is inactive
+ var/overlay_state_inactive
+ /// Overlay given to the user when the module is active
+ var/overlay_state_active
+ /// Overlay given to the user when the module is used, lasts until cooldown finishes
+ var/overlay_state_use
+ /// Icon file for the overlay.
+ var/overlay_icon_file = 'icons/mob/clothing/modsuit/mod_modules.dmi'
+ /// Does the overlay use the control unit's colors?
+ var/use_mod_colors = FALSE
+ /// What modules are we incompatible with?
+ var/list/incompatible_modules = list()
+ /// Cooldown after use
+ var/cooldown_time = 0
+ /// The mouse button needed to use this module
+ var/used_signal
+ /// List of REF()s mobs we are pinned to, linked with their action buttons
+ var/list/pinned_to = list()
+ /// If we're allowed to use this module while phased out.
+ var/allowed_in_phaseout = FALSE
+ /// If we're allowed to use this module while the suit is disabled.
+ var/allowed_inactive = FALSE
+ /// Timer for the cooldown
+ COOLDOWN_DECLARE(cooldown_timer)
+
+/obj/item/mod/module/Initialize(mapload)
+ . = ..()
+ if(module_type != MODULE_ACTIVE)
+ return
+ if(ispath(device))
+ device = new device(src)
+ ADD_TRAIT(device, TRAIT_NODROP, MOD_TRAIT)
+ RegisterSignal(device, COMSIG_PARENT_QDELETING, PROC_REF(on_device_deletion))
+ RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit))
+
+/obj/item/mod/module/Destroy()
+ mod?.uninstall(src)
+ if(device)
+ UnregisterSignal(device, COMSIG_PARENT_QDELETING)
+ QDEL_NULL(device)
+ return ..()
+
+/obj/item/mod/module/examine(mob/user)
+ . = ..()
+ if(HAS_TRAIT(user, TRAIT_DIAGNOSTIC_HUD))
+ . += span_notice("Complexity level: [complexity]")
+
+
+/// Called when the module is selected from the TGUI, radial or the action button
+/obj/item/mod/module/proc/on_select()
+ if(((!mod.active || mod.activating) && !allowed_inactive) || module_type == MODULE_PASSIVE)
+ if(mod.wearer)
+ balloon_alert(mod.wearer, "not active!")
+ return
+ if(module_type != MODULE_USABLE)
+ if(active)
+ on_deactivation()
+ else
+ on_activation()
+ else
+ on_use()
+ SEND_SIGNAL(mod, COMSIG_MOD_MODULE_SELECTED, src)
+
+/// Called when the module is activated
+/obj/item/mod/module/proc/on_activation()
+ if(!COOLDOWN_FINISHED(src, cooldown_timer))
+ balloon_alert(mod.wearer, "on cooldown!")
+ return FALSE
+ if(!mod.active || mod.activating || !mod.get_charge())
+ balloon_alert(mod.wearer, "unpowered!")
+ return FALSE
+ if(!allowed_in_phaseout && istype(mod.wearer.loc, /obj/effect/dummy/phased_mob))
+ //specifically a to_chat because the user is phased out.
+ to_chat(mod.wearer, span_warning("You cannot activate this right now."))
+ return FALSE
+ if(SEND_SIGNAL(src, COMSIG_MODULE_TRIGGERED) & MOD_ABORT_USE)
+ return FALSE
+ if(module_type == MODULE_ACTIVE)
+ if(mod.selected_module && !mod.selected_module.on_deactivation(display_message = FALSE))
+ return FALSE
+ mod.selected_module = src
+ if(device)
+ if(mod.wearer.put_in_hands(device))
+ balloon_alert(mod.wearer, "[device] extended")
+ RegisterSignal(mod.wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit))
+ RegisterSignal(mod.wearer, COMSIG_KB_MOB_DROPITEM_DOWN, PROC_REF(dropkey))
+ else
+ balloon_alert(mod.wearer, "can't extend [device]!")
+ mod.wearer.transferItemToLoc(device, src, force = TRUE)
+ return FALSE
+ else
+ var/used_button = MIDDLE_CLICK
+ update_signal(used_button)
+ balloon_alert(mod.wearer, "[src] activated, [used_button]-click to use")
+ active = TRUE
+ COOLDOWN_START(src, cooldown_timer, cooldown_time)
+ mod.wearer.update_inv_back(mod.slot_flags)
+ SEND_SIGNAL(src, COMSIG_MODULE_ACTIVATED)
+ return TRUE
+
+/// Called when the module is deactivated
+/obj/item/mod/module/proc/on_deactivation(display_message = TRUE, deleting = FALSE)
+ active = FALSE
+ if(module_type == MODULE_ACTIVE)
+ mod.selected_module = null
+ if(display_message)
+ balloon_alert(mod.wearer, device ? "[device] retracted" : "[src] deactivated")
+ if(device)
+ mod.wearer.transferItemToLoc(device, src, force = TRUE)
+ UnregisterSignal(mod.wearer, COMSIG_ATOM_EXITED)
+ UnregisterSignal(mod.wearer, COMSIG_KB_MOB_DROPITEM_DOWN)
+ else
+ UnregisterSignal(mod.wearer, used_signal)
+ used_signal = null
+ mod.wearer.update_inv_back(mod.slot_flags)
+ SEND_SIGNAL(src, COMSIG_MODULE_DEACTIVATED)
+ return TRUE
+
+/// Called when the module is used
+/obj/item/mod/module/proc/on_use()
+ if(!COOLDOWN_FINISHED(src, cooldown_timer))
+ balloon_alert(mod.wearer, "on cooldown!")
+ return FALSE
+ if(!check_power(use_power_cost))
+ balloon_alert(mod.wearer, "not enough charge!")
+ return FALSE
+ if(!allowed_in_phaseout && istype(mod.wearer.loc, /obj/effect/dummy/phased_mob))
+ //specifically a to_chat because the user is phased out.
+ to_chat(mod.wearer, span_warning("You cannot activate this right now."))
+ return FALSE
+ if(SEND_SIGNAL(src, COMSIG_MODULE_TRIGGERED) & MOD_ABORT_USE)
+ return FALSE
+ COOLDOWN_START(src, cooldown_timer, cooldown_time)
+ addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/mob, update_inv_back), mod.slot_flags), cooldown_time+1) //need to run it a bit after the cooldown starts to avoid conflicts
+ mod.wearer.update_inv_back(mod.slot_flags)
+ SEND_SIGNAL(src, COMSIG_MODULE_USED)
+ return TRUE
+
+/// Called when an activated module without a device is used
+/obj/item/mod/module/proc/on_select_use(atom/target)
+ if(mod.wearer.incapacitated(IGNORE_GRAB))
+ return FALSE
+ mod.wearer.face_atom(target)
+ if(!on_use())
+ return FALSE
+ return TRUE
+
+/// Called when an activated module without a device is active and the user alt/middle-clicks
+/obj/item/mod/module/proc/on_special_click(mob/source, atom/target)
+ SIGNAL_HANDLER
+ on_select_use(target)
+ return COMSIG_MOB_CANCEL_CLICKON
+
+/// Called on the MODsuit's process
+/obj/item/mod/module/proc/on_process(delta_time)
+ if(active)
+ if(!drain_power(active_power_cost * delta_time))
+ on_deactivation()
+ return FALSE
+ on_active_process(delta_time)
+ else
+ drain_power(idle_power_cost * delta_time)
+ return TRUE
+
+/// Called on the MODsuit's process if it is an active module
+/obj/item/mod/module/proc/on_active_process(delta_time)
+ return
+
+/// Called from MODsuit's install() proc, so when the module is installed.
+/obj/item/mod/module/proc/on_install()
+ return
+
+/// Called from MODsuit's uninstall() proc, so when the module is uninstalled.
+/obj/item/mod/module/proc/on_uninstall(deleting = FALSE)
+ return
+
+/// Called when the MODsuit is activated
+/obj/item/mod/module/proc/on_suit_activation()
+ return
+
+/// Called when the MODsuit is deactivated
+/obj/item/mod/module/proc/on_suit_deactivation(deleting = FALSE)
+ return
+
+/// Called when the MODsuit is equipped
+/obj/item/mod/module/proc/on_equip()
+ return
+
+/// Called when the MODsuit is unequipped
+/obj/item/mod/module/proc/on_unequip()
+ return
+
+/// Drains power from the suit charge
+/obj/item/mod/module/proc/drain_power(amount)
+ if(!check_power(amount))
+ return FALSE
+ mod.subtract_charge(amount)
+ mod.update_charge_alert()
+ return TRUE
+
+/// Checks if there is enough power in the suit
+/obj/item/mod/module/proc/check_power(amount)
+ return mod.check_charge(amount)
+
+/// Adds additional things to the MODsuit ui_data()
+/obj/item/mod/module/proc/add_ui_data()
+ return list()
+
+/// Creates a list of configuring options for this module
+/obj/item/mod/module/proc/get_configuration()
+ return list()
+
+/// Generates an element of the get_configuration list with a display name, type and value
+/obj/item/mod/module/proc/add_ui_configuration(display_name, type, value, list/values)
+ return list("display_name" = display_name, "type" = type, "value" = value, "values" = values)
+
+/// Receives configure edits from the TGUI and edits the vars
+/obj/item/mod/module/proc/configure_edit(key, value)
+ return
+
+/// Called when the device moves to a different place on active modules
+/obj/item/mod/module/proc/on_exit(datum/source, atom/movable/part, direction)
+ SIGNAL_HANDLER
+
+ if(!active)
+ return
+ if(part.loc == src)
+ return
+ if(part.loc == mod.wearer)
+ return
+ if(part == device)
+ on_deactivation(display_message = FALSE)
+
+/// Called when the device gets deleted on active modules
+/obj/item/mod/module/proc/on_device_deletion(datum/source)
+ SIGNAL_HANDLER
+
+ if(source == device)
+ device = null
+ qdel(src)
+
+/// Generates an icon to be used for the suit's worn overlays
+/obj/item/mod/module/proc/generate_worn_overlay(mod_layer)
+ . = list()
+ if(!mod.active)
+ return
+ var/used_overlay
+ if(overlay_state_use && !COOLDOWN_FINISHED(src, cooldown_timer))
+ used_overlay = overlay_state_use
+ else if(overlay_state_active && active)
+ used_overlay = overlay_state_active
+ else if(overlay_state_inactive)
+ used_overlay = overlay_state_inactive
+ else
+ return
+ var/mutable_appearance/module_icon = mutable_appearance(overlay_icon_file, used_overlay, layer = mod_layer + 0.1)
+ if(!use_mod_colors)
+ module_icon.appearance_flags |= RESET_COLOR
+ . += module_icon
+
+/// Updates the signal used by active modules to be activated
+/obj/item/mod/module/proc/update_signal(value)
+ switch(value)
+ if(MIDDLE_CLICK)
+ mod.selected_module.used_signal = COMSIG_MOB_MIDDLECLICKON
+ if(ALT_CLICK)
+ mod.selected_module.used_signal = COMSIG_MOB_ALTCLICKON
+ RegisterSignal(mod.wearer, mod.selected_module.used_signal, TYPE_PROC_REF(/obj/item/mod/module, on_special_click))
+
+/// Pins the module to the user's action buttons
+/obj/item/mod/module/proc/pin(mob/user)
+ var/datum/action/item_action/mod/pinned_module/existing_action = pinned_to[REF(user)]
+ if(existing_action)
+ mod.remove_item_action(existing_action)
+ return
+
+ var/datum/action/item_action/mod/pinned_module/new_action = new(mod, src, user)
+ mod.add_item_action(new_action)
+
+/// On drop key, concels a device item.
+/obj/item/mod/module/proc/dropkey(mob/living/user)
+ SIGNAL_HANDLER
+
+ if(user.get_active_held_item() != device)
+ return
+ on_deactivation()
+ return COMSIG_KB_ACTIVATED
+
+///Anomaly Locked - Causes the module to not function without an anomaly.
+/obj/item/mod/module/anomaly_locked
+ name = "MOD anomaly locked module"
+ desc = "A form of a module, locked behind an anomalous core to function."
+ incompatible_modules = list(/obj/item/mod/module/anomaly_locked)
+ /// The core item the module runs off.
+ var/obj/item/assembly/signaler/anomaly/core
+ /// Accepted types of anomaly cores.
+ var/list/accepted_anomalies = list(/obj/item/assembly/signaler/anomaly)
+ /// If this one starts with a core in.
+ var/prebuilt = FALSE
+
+/obj/item/mod/module/anomaly_locked/Initialize(mapload)
+ . = ..()
+ if(!prebuilt || !length(accepted_anomalies))
+ return
+ var/core_path = pick(accepted_anomalies)
+ core = new core_path(src)
+ update_icon_state()
+
+/obj/item/mod/module/anomaly_locked/Destroy()
+ QDEL_NULL(core)
+ return ..()
+
+/obj/item/mod/module/anomaly_locked/examine(mob/user)
+ . = ..()
+ if(!length(accepted_anomalies))
+ return
+ if(core)
+ . += span_notice("There is a [core.name] installed in it. You could remove it with a screwdriver...")
+ else
+ var/list/core_list = list()
+ for(var/path in accepted_anomalies)
+ var/atom/core_path = path
+ core_list += initial(core_path.name)
+ . += span_notice("You need to insert \a [english_list(core_list, and_text = " or ")] for this module to function.")
+
+/obj/item/mod/module/anomaly_locked/on_select()
+ if(!core)
+ balloon_alert(mod.wearer, "no core!")
+ return
+ return ..()
+
+/obj/item/mod/module/anomaly_locked/on_process(delta_time)
+ . = ..()
+ if(!core)
+ return FALSE
+
+/obj/item/mod/module/anomaly_locked/on_active_process(delta_time)
+ if(!core)
+ return FALSE
+ return TRUE
+
+/obj/item/mod/module/anomaly_locked/attackby(obj/item/item, mob/living/user, params)
+ if(item.type in accepted_anomalies)
+ if(core)
+ balloon_alert(user, "core already in!")
+ return
+ if(!user.transferItemToLoc(item, src))
+ return
+ core = item
+ balloon_alert(user, "core installed")
+ playsound(src, 'sound/machines/click.ogg', 30, TRUE)
+ update_icon_state()
+ else
+ return ..()
+
+/obj/item/mod/module/anomaly_locked/screwdriver_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(!core)
+ balloon_alert(user, "no core!")
+ return
+ balloon_alert(user, "removing core...")
+ if(!do_after(user, 3 SECONDS, target = src))
+ balloon_alert(user, "interrupted!")
+ return
+ balloon_alert(user, "core removed")
+ core.forceMove(drop_location())
+ if(Adjacent(user) && !issilicon(user))
+ user.put_in_hands(core)
+ core = null
+ update_icon_state()
+
+/obj/item/mod/module/anomaly_locked/update_icon_state()
+ icon_state = initial(icon_state) + (core ? "-core" : "")
+ return ..()
diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm
new file mode 100644
index 00000000000..33edd75e173
--- /dev/null
+++ b/code/modules/mod/modules/modules_antag.dm
@@ -0,0 +1,398 @@
+//Antag modules for MODsuits
+
+///Armor Booster - Grants your suit more armor and speed in exchange for EVA protection. Also acts as a welding screen.
+/obj/item/mod/module/armor_booster
+ name = "MOD armor booster module"
+ desc = "A retrofitted series of retractable armor plates, allowing the suit to function as essentially power armor, \
+ giving the user incredible protection against conventional firearms, or everyday attacks in close-quarters. \
+ However, the additional plating cannot deploy alongside parts of the suit used for vacuum sealing, \
+ so this extra armor provides zero ability for extravehicular activity while deployed."
+ icon_state = "armor_booster"
+ module_type = MODULE_TOGGLE
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ removable = TRUE
+ incompatible_modules = list(/obj/item/mod/module/armor_booster, /obj/item/mod/module/welding)
+ cooldown_time = 0.5 SECONDS
+ overlay_state_inactive = "module_armorbooster_off"
+ overlay_state_active = "module_armorbooster_on"
+ use_mod_colors = TRUE
+ /// Whether or not this module removes pressure protection.
+ var/remove_pressure_protection = TRUE
+ /// Speed added to the control unit.
+ var/speed_added = 0.5
+ /// Speed that we actually added.
+ var/actual_speed_added = 0
+ /// Armor values added to the suit parts.
+ var/list/armor_values = list("melee" = 25, "bullet" = 30, "laser" = 15, "energy" = 15)
+ /// List of parts of the suit that are spaceproofed, for giving them back the pressure protection.
+ var/list/spaceproofed = list()
+
+/obj/item/mod/module/armor_booster/on_suit_activation()
+ mod.helmet.flash_protect = FLASH_PROTECTION_WELDER
+
+/obj/item/mod/module/armor_booster/on_suit_deactivation(deleting = FALSE)
+ if(deleting)
+ return
+ mod.helmet.flash_protect = initial(mod.helmet.flash_protect)
+
+/obj/item/mod/module/armor_booster/on_activation()
+ . = ..()
+ if(!.)
+ return
+ playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ actual_speed_added = max(0, min(mod.slowdown_active, speed_added))
+ mod.slowdown -= actual_speed_added
+ mod.wearer.update_equipment_speed_mods()
+ var/list/parts = mod.mod_parts + mod
+ for(var/obj/item/part as anything in parts)
+ part.armor = part.armor.modifyRating(arglist(armor_values))
+ if(!remove_pressure_protection || !isclothing(part))
+ continue
+ var/obj/item/clothing/clothing_part = part
+ if(clothing_part.clothing_flags & STOPSPRESSUREDAMAGE)
+ clothing_part.clothing_flags &= ~STOPSPRESSUREDAMAGE
+ spaceproofed[clothing_part] = TRUE
+
+/obj/item/mod/module/armor_booster/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ if(!deleting)
+ playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ mod.slowdown += actual_speed_added
+ mod.wearer.update_equipment_speed_mods()
+ var/list/parts = mod.mod_parts + mod
+ var/list/removed_armor = armor_values.Copy()
+ for(var/armor_type in removed_armor)
+ removed_armor[armor_type] = -removed_armor[armor_type]
+ for(var/obj/item/part as anything in parts)
+ part.armor = part.armor.modifyRating(arglist(removed_armor))
+ if(!remove_pressure_protection || !isclothing(part))
+ continue
+ var/obj/item/clothing/clothing_part = part
+ if(spaceproofed[clothing_part])
+ clothing_part.clothing_flags |= STOPSPRESSUREDAMAGE
+ spaceproofed = list()
+
+/obj/item/mod/module/armor_booster/generate_worn_overlay(mutable_appearance/standing)
+ overlay_state_inactive = "[initial(overlay_state_inactive)]-[mod.skin]"
+ overlay_state_active = "[initial(overlay_state_active)]-[mod.skin]"
+ return ..()
+
+///Energy Shield - Gives you a rechargeable energy shield that nullifies attacks.
+/obj/item/mod/module/energy_shield
+ name = "MOD energy shield module"
+ desc = "A personal, protective forcefield typically seen in military applications. \
+ This advanced deflector shield is essentially a scaled down version of those seen on starships, \
+ and the power cost can be an easy indicator of this. However, it is capable of blocking nearly any incoming attack, \
+ though with its' low amount of separate charges, the user remains mortal."
+ icon_state = "energy_shield"
+ complexity = 3
+ idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 2
+ incompatible_modules = list(/obj/item/mod/module/energy_shield)
+ /// Max charges of the shield.
+ var/max_charges = 3
+ /// The time it takes for the first charge to recover.
+ var/recharge_start_delay = 20 SECONDS
+ /// How much time it takes for charges to recover after they started recharging.
+ var/charge_increment_delay = 1 SECONDS
+ /// How much charge is recovered per recovery.
+ var/charge_recovery = 1
+ /// Whether or not this shield can lose multiple charges.
+ var/lose_multiple_charges = FALSE
+ /// The item path to recharge this shielkd.
+ var/recharge_path = null
+ /// The icon file of the shield.
+ var/shield_icon_file = 'icons/effects/effects.dmi'
+ /// The icon_state of the shield.
+ var/shield_icon = "shield-red"
+ /// Charges the shield should start with.
+ var/charges
+
+/obj/item/mod/module/energy_shield/Initialize(mapload)
+ . = ..()
+ charges = max_charges
+
+/obj/item/mod/module/energy_shield/on_suit_activation()
+ mod.AddComponent(/datum/component/shielded, max_charges = max_charges, recharge_start_delay = recharge_start_delay, charge_increment_delay = charge_increment_delay, \
+ charge_recovery = charge_recovery, lose_multiple_charges = lose_multiple_charges, recharge_path = recharge_path, starting_charges = charges, shield_icon_file = shield_icon_file, shield_icon = shield_icon)
+ RegisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(shield_reaction))
+
+/obj/item/mod/module/energy_shield/on_suit_deactivation(deleting = FALSE)
+ var/datum/component/shielded/shield = mod.GetComponent(/datum/component/shielded)
+ charges = shield.current_charges
+ qdel(shield)
+ UnregisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS)
+
+/obj/item/mod/module/energy_shield/proc/shield_reaction(mob/living/carbon/human/owner, atom/movable/hitby, damage = 0, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0)
+ if(SEND_SIGNAL(mod, COMSIG_ITEM_HIT_REACT, owner, hitby, attack_text, 0, damage, attack_type) & COMPONENT_HIT_REACTION_BLOCK)
+ drain_power(use_power_cost)
+ return SHIELD_BLOCK
+ return NONE
+
+///Insignia - Gives you a skin specific stripe.
+/obj/item/mod/module/insignia
+ name = "MOD insignia module"
+ desc = "Despite the existence of IFF systems, radio communique, and modern methods of deductive reasoning involving \
+ the wearer's own eyes, colorful paint jobs remain a popular way for different factions in the galaxy to display who \
+ they are. This system utilizes a series of tiny moving paint sprayers to both apply and remove different \
+ color patterns to and from the suit."
+ icon_state = "insignia"
+ removable = FALSE
+ incompatible_modules = list(/obj/item/mod/module/insignia)
+ overlay_state_inactive = "module_insignia"
+
+/obj/item/mod/module/insignia/generate_worn_overlay(mutable_appearance/standing)
+ overlay_state_inactive = "[initial(overlay_state_inactive)]-[mod.skin]"
+ . = ..()
+ for(var/mutable_appearance/appearance as anything in .)
+ appearance.color = color
+
+/obj/item/mod/module/insignia/commander
+ color = "#4980a5"
+
+/obj/item/mod/module/insignia/security
+ color = "#b30d1e"
+
+/obj/item/mod/module/insignia/engineer
+ color = "#e9c80e"
+
+/obj/item/mod/module/insignia/medic
+ color = "#ebebf5"
+
+/obj/item/mod/module/insignia/janitor
+ color = "#7925c7"
+
+/obj/item/mod/module/insignia/chaplain
+ color = "#f0a00c"
+
+///Anti Slip - Prevents you from slipping on water.
+/obj/item/mod/module/noslip
+ name = "MOD anti slip module"
+ desc = "These are a modified variant of standard magnetic boots, utilizing piezoelectric crystals on the soles. \
+ The two plates on the bottom of the boots automatically extend and magnetize as the user steps; \
+ a pull that's too weak to offer them the ability to affix to a hull, but just strong enough to \
+ protect against the fact that you didn't read the wet floor sign. Honk Co. has come out numerous times \
+ in protest of these modules being legal."
+ icon_state = "noslip"
+ complexity = 1
+ idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.1
+ incompatible_modules = list(/obj/item/mod/module/noslip)
+
+/obj/item/mod/module/noslip/on_suit_activation()
+ mod.boots.clothing_flags |= NOSLIP
+
+/obj/item/mod/module/noslip/on_suit_deactivation(deleting = FALSE)
+ mod.boots.clothing_flags &= ~NOSLIP
+
+//Bite of 87 Springlock - Equips faster, disguised as DNA lock.
+/obj/item/mod/module/springlock/bite_of_87
+
+/obj/item/mod/module/springlock/bite_of_87/Initialize(mapload)
+ . = ..()
+ var/obj/item/mod/module/dna_lock/the_dna_lock_behind_the_slaughter = /obj/item/mod/module/dna_lock
+ name = initial(the_dna_lock_behind_the_slaughter.name)
+ desc = initial(the_dna_lock_behind_the_slaughter.desc)
+ icon_state = initial(the_dna_lock_behind_the_slaughter.icon_state)
+ complexity = initial(the_dna_lock_behind_the_slaughter.complexity)
+ use_power_cost = initial(the_dna_lock_behind_the_slaughter.use_power_cost)
+
+/obj/item/mod/module/springlock/bite_of_87/on_install()
+ mod.activation_step_time *= 0.1
+
+/obj/item/mod/module/springlock/bite_of_87/on_uninstall(deleting = FALSE)
+ mod.activation_step_time *= 10
+
+/obj/item/mod/module/springlock/bite_of_87/on_suit_activation()
+ ..()
+ if(SSevents.holidays && SSevents.holidays[APRIL_FOOLS] || prob(1))
+ mod.set_mod_color("#b17f00")
+ mod.wearer.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) // turns purple guy purple
+ mod.wearer.add_atom_colour("#704b96", FIXED_COLOUR_PRIORITY)
+
+///Flamethrower - Launches fire across the area.
+/obj/item/mod/module/flamethrower
+ name = "MOD flamethrower module"
+ desc = "A custom-manufactured flamethrower, used to burn through your path. Burn well."
+ icon_state = "flamethrower"
+ module_type = MODULE_ACTIVE
+ complexity = 3
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 3
+ incompatible_modules = list(/obj/item/mod/module/flamethrower)
+ cooldown_time = 2.5 SECONDS
+ overlay_state_inactive = "module_flamethrower"
+ overlay_state_active = "module_flamethrower_on"
+
+/obj/item/mod/module/flamethrower/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ var/obj/projectile/flame = new /obj/projectile/bullet/incendiary(mod.wearer.loc)
+ flame.preparePixelProjectile(target, mod.wearer)
+ flame.firer = mod.wearer
+ playsound(src, 'sound/items/modsuit/flamethrower.ogg', 75, TRUE)
+ INVOKE_ASYNC(flame, TYPE_PROC_REF(/obj/projectile, fire))
+ drain_power(use_power_cost)
+
+///Power kick - Lets the user launch themselves at someone to kick them.
+/obj/item/mod/module/power_kick
+ name = "MOD power kick module"
+ desc = "This module uses high-power myomer to generate an incredible amount of energy, transferred into the power of a kick."
+ icon_state = "power_kick"
+ module_type = MODULE_ACTIVE
+ removable = FALSE
+ use_power_cost = DEFAULT_CHARGE_DRAIN*5
+ incompatible_modules = list(/obj/item/mod/module/power_kick)
+ cooldown_time = 5 SECONDS
+ /// Damage on kick.
+ var/damage = 20
+ /// The wound bonus of the kick.
+ var/wounding_power = 35
+ /// How long we knockdown for on the kick.
+ var/knockdown_time = 2 SECONDS
+
+/obj/item/mod/module/power_kick/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ mod.wearer.visible_message(span_warning("[mod.wearer] starts charging a kick!"), \
+ blind_message = span_hear("You hear a charging sound."))
+ playsound(src, 'sound/items/modsuit/loader_charge.ogg', 75, TRUE)
+ balloon_alert(mod.wearer, "you start charging...")
+ animate(mod.wearer, 0.3 SECONDS, pixel_z = 16, flags = ANIMATION_RELATIVE, easing = SINE_EASING|EASE_OUT)
+ addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/atom, SpinAnimation), 3, 2), 0.3 SECONDS)
+ if(!do_after(mod.wearer, 1 SECONDS, target = mod))
+ animate(mod.wearer, 0.2 SECONDS, pixel_z = -16, flags = ANIMATION_RELATIVE, easing = SINE_EASING|EASE_OUT)
+ return
+ animate(mod.wearer)
+ drain_power(use_power_cost)
+ playsound(src, 'sound/items/modsuit/loader_launch.ogg', 75, TRUE)
+ var/angle = get_angle(mod.wearer, target) + 180
+ mod.wearer.transform = mod.wearer.transform.Turn(angle)
+ RegisterSignal(mod.wearer, COMSIG_MOVABLE_IMPACT, PROC_REF(on_throw_impact))
+ mod.wearer.throw_at(target, range = 7, speed = 2, thrower = mod.wearer, spin = FALSE, gentle = TRUE, callback = CALLBACK(src, PROC_REF(on_throw_end), mod.wearer, -angle))
+
+/obj/item/mod/module/power_kick/proc/on_throw_end(mob/user, angle)
+ if(!user)
+ return
+ user.transform = user.transform.Turn(angle)
+ animate(user, 0.2 SECONDS, pixel_z = -16, flags = ANIMATION_RELATIVE, easing = SINE_EASING|EASE_OUT)
+
+/obj/item/mod/module/power_kick/proc/on_throw_impact(mob/living/source, obj/target, datum/thrownthing/thrownthing)
+ SIGNAL_HANDLER
+
+ UnregisterSignal(source, COMSIG_MOVABLE_IMPACT)
+ if(!mod?.wearer)
+ return
+ if(isliving(target))
+ var/mob/living/living_target = target
+ living_target.apply_damage(damage, BRUTE, mod.wearer.zone_selected)
+ living_target.Knockdown(knockdown_time)
+ else if(target.obj_integrity)
+ target.take_damage(damage, BRUTE)
+ else
+ return
+ mod.wearer.do_attack_animation(target, ATTACK_EFFECT_SMASH)
+
+///Chameleon - lets the suit disguise as any item that would fit on that slot.
+/obj/item/mod/module/chameleon
+ name = "MOD chameleon module"
+ desc = "A module using chameleon technology to disguise the suit as another object."
+ icon_state = "chameleon"
+ module_type = MODULE_USABLE
+ complexity = 2
+ incompatible_modules = list(/obj/item/mod/module/chameleon)
+ cooldown_time = 0.5 SECONDS
+ allowed_inactive = TRUE
+ /// A list of all the items the suit can disguise as.
+ var/list/possible_disguises = list()
+ /// The path of the item we're disguised as.
+ var/obj/item/current_disguise
+
+/obj/item/mod/module/chameleon/on_install()
+ var/list/all_disguises = sortList(subtypesof(get_path_by_slot(mod.slot_flags)), GLOBAL_PROC_REF(cmp_typepaths_asc))
+ for(var/clothing_path in all_disguises)
+ var/obj/item/clothing = clothing_path
+ if(!initial(clothing.icon_state))
+ continue
+ var/chameleon_item_name = "[initial(clothing.name)] ([initial(clothing.icon_state)])"
+ possible_disguises[chameleon_item_name] = clothing_path
+
+/obj/item/mod/module/chameleon/on_uninstall(deleting = FALSE)
+ if(current_disguise)
+ return_look()
+ possible_disguises = null
+
+/obj/item/mod/module/chameleon/on_use()
+ if(mod.active || mod.activating)
+ balloon_alert(mod.wearer, "suit active!")
+ return
+ . = ..()
+ if(!.)
+ return
+ if(current_disguise)
+ return_look()
+ return
+ var/picked_name = tgui_input_list(mod.wearer, "Select look to change into", "Chameleon Settings", possible_disguises)
+ if(!possible_disguises[picked_name] || mod.active || mod.activating)
+ return
+ current_disguise = possible_disguises[picked_name]
+ update_look()
+
+/obj/item/mod/module/chameleon/proc/update_look()
+ mod.name = initial(current_disguise.name)
+ mod.desc = initial(current_disguise.desc)
+ mod.icon_state = initial(current_disguise.icon_state)
+ mod.icon = initial(current_disguise.icon)
+ mod.mob_overlay_icon = initial(current_disguise.mob_overlay_icon)
+ mod.alternate_worn_layer = initial(current_disguise.alternate_worn_layer)
+ mod.lefthand_file = initial(current_disguise.lefthand_file)
+ mod.righthand_file = initial(current_disguise.righthand_file)
+ //mod.mob_overlay_state = initial(current_disguise.mob_overlay_state)
+ mod.item_state = initial(current_disguise.item_state)
+ mod.wearer.update_inv_back(mod.slot_flags)
+ RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(return_look))
+
+/obj/item/mod/module/chameleon/proc/return_look()
+ mod.name = "[mod.theme.name] [initial(mod.name)]"
+ mod.desc = "[initial(mod.desc)] [mod.theme.desc]"
+ mod.icon_state = "[mod.skin]-[initial(mod.icon_state)]"
+ var/list/mod_skin = mod.theme.skins[mod.skin]
+ mod.icon = mod_skin[MOD_ICON_OVERRIDE] || 'icons/obj/clothing/modsuit/mod_clothing.dmi'
+ mod.mob_overlay_icon = mod_skin[MOD_WORN_ICON_OVERRIDE] || 'icons/mob/clothing/modsuit/mod_clothing.dmi'
+ mod.alternate_worn_layer = mod_skin[CONTROL_LAYER]
+ mod.lefthand_file = initial(mod.lefthand_file)
+ mod.righthand_file = initial(mod.righthand_file)
+ //___callbacknewmod.worn_icon_state = null
+ mod.item_state = null
+ mod.wearer.update_inv_back(mod.slot_flags)
+ current_disguise = null
+ UnregisterSignal(mod, COMSIG_MOD_ACTIVATE)
+
+///Plate Compression - Compresses the suit to normal size
+/obj/item/mod/module/plate_compression
+ name = "MOD plate compression module"
+ desc = "A module that keeps the suit in a very tightly fit state, lowering the overall size. \
+ Due to the pressure on all the parts, typical storage modules do not fit."
+ icon_state = "plate_compression"
+ complexity = 2
+ incompatible_modules = list(/obj/item/mod/module/plate_compression, /obj/item/mod/module/storage)
+ /// The size we set the suit to.
+ var/new_size = WEIGHT_CLASS_NORMAL
+ /// The suit's size before the module is installed.
+ var/old_size
+
+/obj/item/mod/module/plate_compression/on_install()
+ old_size = mod.w_class
+ mod.w_class = new_size
+
+/obj/item/mod/module/plate_compression/on_uninstall(deleting = FALSE)
+ mod.w_class = old_size
+ old_size = null
+ if(!mod.loc)
+ return
+ var/datum/component/storage/concrete/holding_storage = mod.GetComponent(/datum/component/storage/concrete)
+ if(!holding_storage || holding_storage.max_combined_w_class >= mod.w_class)
+ return
+ mod.forceMove(drop_location())
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
new file mode 100644
index 00000000000..4905b3ae691
--- /dev/null
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -0,0 +1,169 @@
+//Engineering modules for MODsuits
+
+///Welding Protection - Makes the helmet protect from flashes and welding.
+/obj/item/mod/module/welding
+ name = "MOD welding protection module"
+ desc = "A module installed into the visor of the suit, this projects a \
+ polarized, holographic overlay in front of the user's eyes. It's rated high enough for \
+ immunity against extremities such as spot and arc welding, solar eclipses, and handheld flashlights."
+ icon_state = "welding"
+ complexity = 1
+ incompatible_modules = list(/obj/item/mod/module/welding, /obj/item/mod/module/armor_booster)
+ overlay_state_inactive = "module_welding"
+
+/obj/item/mod/module/welding/on_suit_activation()
+ mod.helmet.flash_protect = FLASH_PROTECTION_WELDER
+
+/obj/item/mod/module/welding/on_suit_deactivation(deleting = FALSE)
+ if(deleting)
+ return
+ mod.helmet.flash_protect = initial(mod.helmet.flash_protect)
+
+///T-Ray Scan - Scans the terrain for undertile objects.
+/obj/item/mod/module/t_ray
+ name = "MOD t-ray scan module"
+ desc = "A module installed into the visor of the suit, allowing the user to use a pulse of terahertz radiation \
+ to essentially echolocate things beneath the floor, mostly cables and pipes. \
+ A staple of atmospherics work, and counter-smuggling work."
+ icon_state = "tray"
+ module_type = MODULE_TOGGLE
+ complexity = 1
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
+ incompatible_modules = list(/obj/item/mod/module/t_ray)
+ cooldown_time = 0.5 SECONDS
+ /// T-ray scan range.
+ var/range = 4
+
+/obj/item/mod/module/t_ray/on_active_process(delta_time)
+ t_ray_scan(mod.wearer, 0.8 SECONDS, range)
+
+///Magnetic Stability - Gives the user a slowdown but makes them negate gravity and be immune to slips.
+/obj/item/mod/module/magboot
+ name = "MOD magnetic stability module"
+ desc = "These are powerful electromagnets fitted into the suit's boots, allowing users both \
+ excellent traction no matter the condition indoors, and to essentially hitch a ride on the exterior of a hull. \
+ However, these basic models do not feature computerized systems to automatically toggle them on and off, \
+ so numerous users report a certain stickiness to their steps."
+ icon_state = "magnet"
+ module_type = MODULE_TOGGLE
+ complexity = 2
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
+ incompatible_modules = list(/obj/item/mod/module/magboot)
+ cooldown_time = 0.5 SECONDS
+ /// Slowdown added onto the suit.
+ var/slowdown_active = 0.5
+
+/obj/item/mod/module/magboot/on_activation()
+ . = ..()
+ if(!.)
+ return
+ ADD_TRAIT(mod.wearer, TRAIT_NOSLIPWATER, MOD_TRAIT)
+ mod.slowdown += slowdown_active
+ mod.wearer.update_gravity(mod.wearer.has_gravity())
+ mod.wearer.update_equipment_speed_mods()
+
+/obj/item/mod/module/magboot/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ REMOVE_TRAIT(mod.wearer, TRAIT_NOSLIPWATER, MOD_TRAIT)
+ mod.slowdown -= slowdown_active
+ mod.wearer.update_gravity(mod.wearer.has_gravity())
+ mod.wearer.update_equipment_speed_mods()
+
+/obj/item/mod/module/magboot/advanced
+ name = "MOD advanced magnetic stability module"
+ removable = FALSE
+ complexity = 0
+ slowdown_active = 0
+
+///Emergency Tether - Shoots a grappling hook projectile in 0g that throws the user towards it.
+/obj/item/mod/module/tether
+ name = "MOD emergency tether module"
+ desc = "A custom-built grappling-hook powered by a winch capable of hauling the user. \
+ While some older models of cargo-oriented grapples have capacities of a few tons, \
+ these are only capable of working in zero-gravity environments, a blessing to some Engineers."
+ icon_state = "tether"
+ module_type = MODULE_ACTIVE
+ complexity = 3
+ use_power_cost = DEFAULT_CHARGE_DRAIN
+ incompatible_modules = list(/obj/item/mod/module/tether)
+ cooldown_time = 1.5 SECONDS
+
+/obj/item/mod/module/tether/on_use()
+ if(mod.wearer.has_gravity(get_turf(src)))
+ balloon_alert(mod.wearer, "too much gravity!!")
+ playsound(src, 'sound/weapons/gun/general/dry_fire.ogg', 25, TRUE)
+ return FALSE
+ return ..()
+
+/obj/item/mod/module/tether/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ var/obj/projectile/tether = new /obj/projectile/tether(mod.wearer.loc)
+ tether.preparePixelProjectile(target, mod.wearer)
+ tether.firer = mod.wearer
+ playsound(src, 'sound/weapons/batonextend.ogg', 25, TRUE)
+ INVOKE_ASYNC(tether, TYPE_PROC_REF(/obj/projectile, fire))
+ drain_power(use_power_cost)
+
+/obj/projectile/tether
+ name = "tether"
+ icon_state = "tether_projectile"
+ icon = 'icons/obj/clothing/modsuit/mod_modules.dmi'
+ damage = 0
+ nodamage = TRUE
+ range = 10
+ hitsound = 'sound/weapons/batonextend.ogg'
+ suppressed = SUPPRESSED_VERY
+ //hit_threshhold = LATTICE_LAYER
+ /// Reference to the beam following the projectile.
+ var/line
+
+/obj/projectile/tether/fire(setAngle)
+ if(firer)
+ line = firer.Beam(src, "line", 'icons/obj/clothing/modsuit/mod_modules.dmi')
+ ..()
+
+/obj/projectile/tether/on_hit(atom/target)
+ . = ..()
+ if(firer)
+ firer.throw_at(target, 10, 1, firer, FALSE, FALSE, null, MOVE_FORCE_NORMAL, TRUE)
+
+/obj/projectile/tether/Destroy()
+ QDEL_NULL(line)
+ return ..()
+
+///Mister - Sprays water over an area.
+/obj/item/mod/module/mister
+ name = "MOD water mister module"
+ desc = "A module containing a mister, able to spray it over areas."
+ icon_state = "mister"
+ module_type = MODULE_ACTIVE
+ complexity = 2
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ device = /obj/item/reagent_containers/spray/mister
+ incompatible_modules = list(/obj/item/mod/module/mister)
+ cooldown_time = 0.5 SECONDS
+ /// Volume of our reagent holder.
+ var/volume = 500
+
+/obj/item/mod/module/mister/Initialize(mapload)
+ create_reagents(volume, OPENCONTAINER)
+ return ..()
+
+///Resin Mister - Sprays resin over an area.
+/obj/item/mod/module/mister/atmos
+ name = "MOD resin mister module"
+ desc = "An atmospheric resin mister, able to fix up areas quickly."
+ device = /obj/item/extinguisher/mini/nozzle/mod
+ volume = 250
+
+/obj/item/mod/module/mister/atmos/Initialize(mapload)
+ . = ..()
+ reagents.add_reagent(/datum/reagent/water, volume)
+
+/obj/item/extinguisher/mini/nozzle/mod
+ name = "MOD atmospheric mister"
+ desc = "An atmospheric resin mister with three modes, mounted as a module."
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
new file mode 100644
index 00000000000..17f72271b31
--- /dev/null
+++ b/code/modules/mod/modules/modules_general.dm
@@ -0,0 +1,441 @@
+//General modules for MODsuits
+
+///Ion Jetpack - Lets the user fly freely through space using battery charge.
+/obj/item/mod/module/jetpack
+ name = "MOD ion jetpack module"
+ desc = "A series of electric thrusters installed across the suit, this is a module highly anticipated by trainee Engineers. \
+ Rather than using gasses for combustion thrust, these jets are capable of accelerating ions using \
+ charge from the suit's charge. Some say this isn't Nakamura Engineering's first foray into jet-enabled suits."
+ icon_state = "jetpack"
+ module_type = MODULE_TOGGLE
+ complexity = 3
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
+ use_power_cost = DEFAULT_CHARGE_DRAIN
+ incompatible_modules = list(/obj/item/mod/module/jetpack)
+ cooldown_time = 0.5 SECONDS
+ overlay_state_inactive = "module_jetpack"
+ overlay_state_active = "module_jetpack_on"
+ /// Do we stop the wearer from gliding in space.
+ var/stabilizers = FALSE
+ /// Do we give the wearer a speed buff.
+ var/full_speed = FALSE
+ var/datum/callback/get_mover
+ var/datum/callback/check_on_move
+
+/obj/item/mod/module/jetpack/Initialize(mapload)
+ . = ..()
+ get_mover = CALLBACK(src, PROC_REF(get_user))
+ check_on_move = CALLBACK(src, PROC_REF(allow_thrust))
+ refresh_jetpack()
+
+/obj/item/mod/module/jetpack/Destroy()
+ get_mover = null
+ check_on_move = null
+ return ..()
+
+/obj/item/mod/module/jetpack/proc/refresh_jetpack()
+ AddComponent(/datum/component/jetpack, stabilizers, COMSIG_MODULE_TRIGGERED, COMSIG_MODULE_DEACTIVATED, MOD_ABORT_USE, get_mover, check_on_move, /datum/effect_system/trail_follow/ion/grav_allowed)
+
+/obj/item/mod/module/jetpack/proc/set_stabilizers(new_stabilizers)
+ if(stabilizers == new_stabilizers)
+ return
+ stabilizers = new_stabilizers
+ refresh_jetpack()
+
+/obj/item/mod/module/jetpack/on_activation()
+ . = ..()
+ if(!.)
+ return
+ if(full_speed)
+ mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
+
+/obj/item/mod/module/jetpack/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(full_speed)
+ mod.wearer.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
+
+/obj/item/mod/module/jetpack/get_configuration()
+ . = ..()
+ .["stabilizers"] = add_ui_configuration("Stabilizers", "bool", stabilizers)
+
+/obj/item/mod/module/jetpack/configure_edit(key, value)
+ switch(key)
+ if("stabilizers")
+ set_stabilizers(text2num(value))
+
+/obj/item/mod/module/jetpack/proc/allow_thrust(use_fuel = TRUE)
+ if(!use_fuel)
+ return check_power(use_power_cost)
+ if(!drain_power(use_power_cost))
+ return FALSE
+ return TRUE
+
+/obj/item/mod/module/jetpack/proc/get_user()
+ return mod.wearer
+
+/obj/item/mod/module/jetpack/advanced
+ name = "MOD advanced ion jetpack module"
+ desc = "An improvement on the previous model of electric thrusters. This one achieves higher speeds through \
+ mounting of more jets and a red paint applied on it."
+ icon_state = "jetpack_advanced"
+ overlay_state_inactive = "module_jetpackadv"
+ overlay_state_active = "module_jetpackadv_on"
+ full_speed = TRUE
+
+///Eating Apparatus - Lets the user eat/drink with the suit on.
+/obj/item/mod/module/mouthhole
+ name = "MOD eating apparatus module"
+ desc = "A favorite by Miners, this modification to the helmet utilizes a nanotechnology barrier infront of the mouth \
+ to allow eating and drinking while retaining protection and atmosphere. However, it won't free you from masks, \
+ and it will do nothing to improve the taste of a goliath steak."
+ icon_state = "apparatus"
+ complexity = 1
+ incompatible_modules = list(/obj/item/mod/module/mouthhole)
+ overlay_state_inactive = "module_apparatus"
+ /// Former flags of the helmet.
+ var/former_flags = NONE
+ /// Former visor flags of the helmet.
+ var/former_visor_flags = NONE
+
+/obj/item/mod/module/mouthhole/on_install()
+ former_flags = mod.helmet.flags_cover
+ former_visor_flags = mod.helmet.visor_flags_cover
+ mod.helmet.flags_cover &= ~HEADCOVERSMOUTH|PEPPERPROOF
+ mod.helmet.visor_flags_cover &= ~HEADCOVERSMOUTH|PEPPERPROOF
+
+/obj/item/mod/module/mouthhole/on_uninstall(deleting = FALSE)
+ if(deleting)
+ return
+ mod.helmet.flags_cover |= former_flags
+ mod.helmet.visor_flags_cover |= former_visor_flags
+
+///EMP Shield - Protects the suit from EMPs.
+/obj/item/mod/module/emp_shield
+ name = "MOD EMP shield module"
+ desc = "A field inhibitor installed into the suit, protecting it against feedback such as \
+ electromagnetic pulses that would otherwise damage the electronic systems of the suit or devices on the wearer. \
+ However, it will take from the suit's power to do so. Luckily, your PDA already has one of these."
+ icon_state = "empshield"
+ complexity = 1
+ idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ incompatible_modules = list(/obj/item/mod/module/emp_shield)
+
+/obj/item/mod/module/emp_shield/on_install()
+ mod.AddElement(/datum/element/empprotection, EMP_PROTECT_SELF|EMP_PROTECT_WIRES|EMP_PROTECT_CONTENTS)
+
+/obj/item/mod/module/emp_shield/on_uninstall(deleting = FALSE)
+ mod.RemoveElement(/datum/element/empprotection, EMP_PROTECT_SELF|EMP_PROTECT_WIRES|EMP_PROTECT_CONTENTS)
+
+/obj/item/mod/module/emp_shield/advanced
+ name = "MOD advanced EMP shield module"
+ desc = "An enhnanced field inhibitor installed into the suit, protecting it against feedback such as \
+ electromagnetic pulses that would otherwise damage the electronic systems of the suit or devices on the wearer \
+ including augmentations. However, it will take from the suit's power to do so. Luckily, your PDA already has one of these."
+ complexity = 2
+
+/obj/item/mod/module/emp_shield/advanced/on_suit_activation()
+ mod.wearer.AddElement(/datum/element/empprotection, EMP_PROTECT_SELF|EMP_PROTECT_CONTENTS)
+
+/obj/item/mod/module/emp_shield/advanced/on_suit_deactivation(deleting)
+ mod.wearer.RemoveElement(/datum/element/empprotection, EMP_PROTECT_SELF|EMP_PROTECT_CONTENTS)
+
+///Flashlight - Gives the suit a customizable flashlight.
+/obj/item/mod/module/flashlight
+ name = "MOD flashlight module"
+ desc = "A simple pair of flashlights installed on the left and right sides of the helmet."
+ icon_state = "flashlight"
+ module_type = MODULE_TOGGLE
+ complexity = 1
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ incompatible_modules = list(/obj/item/mod/module/flashlight)
+ cooldown_time = 0.5 SECONDS
+ overlay_state_inactive = "module_light"
+ light_system = MOVABLE_LIGHT_DIRECTIONAL
+ light_color = COLOR_WHITE
+ light_range = 4
+ light_power = 1
+ light_on = FALSE
+ /// Charge drain per range amount.
+ var/base_power = DEFAULT_CHARGE_DRAIN * 0.1
+
+/obj/item/mod/module/flashlight/on_activation()
+ . = ..()
+ if(!.)
+ return
+ set_light_flags(light_flags | LIGHT_ATTACHED)
+ set_light_on(active)
+ active_power_cost = base_power * light_range
+
+/obj/item/mod/module/flashlight/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ set_light_flags(light_flags & ~LIGHT_ATTACHED)
+ set_light_on(active)
+
+/obj/item/mod/module/flashlight/on_process(delta_time)
+ active_power_cost = base_power * light_range
+ return ..()
+
+/obj/item/mod/module/flashlight/generate_worn_overlay(mutable_appearance/standing)
+ . = ..()
+ if(!active)
+ return
+ var/mutable_appearance/light_icon = mutable_appearance(overlay_icon_file, "module_light_on", layer = standing + 0.2)
+ light_icon.appearance_flags = RESET_COLOR
+ light_icon.color = light_color
+ . += light_icon
+
+///Dispenser - Dispenses an item after a time passes.
+/obj/item/mod/module/dispenser
+ name = "MOD burger dispenser module"
+ desc = "A rare piece of technology reverse-engineered from a prototype found in a Donk Corporation vessel. \
+ This can draw incredible amounts of power from the suit's charge to create edible organic matter in the \
+ palm of the wearer's glove; however, research seemed to have entirely stopped at burgers. \
+ Notably, all attempts to get it to dispense Earl Grey tea have failed."
+ icon_state = "dispenser"
+ module_type = MODULE_USABLE
+ complexity = 3
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 2
+ incompatible_modules = list(/obj/item/mod/module/dispenser)
+ cooldown_time = 5 SECONDS
+ /// Path we dispense.
+ var/dispense_type = /obj/item/reagent_containers/food/snacks/burger
+ /// Time it takes for us to dispense.
+ var/dispense_time = 0 SECONDS
+
+/obj/item/mod/module/dispenser/on_use()
+ . = ..()
+ if(!.)
+ return
+ if(dispense_time && !do_after(mod.wearer, dispense_time, target = mod))
+ balloon_alert(mod.wearer, "interrupted!")
+ return FALSE
+ var/obj/item/dispensed = new dispense_type(mod.wearer.loc)
+ mod.wearer.put_in_hands(dispensed)
+ balloon_alert(mod.wearer, "[dispensed] dispensed")
+ playsound(src, 'sound/machines/click.ogg', 100, TRUE)
+ drain_power(use_power_cost)
+ return dispensed
+
+///Thermal Regulator - Regulates the wearer's core temperature.
+/obj/item/mod/module/thermal_regulator
+ name = "MOD thermal regulator module"
+ desc = "Advanced climate control, using an inner body glove interwoven with thousands of tiny, \
+ flexible cooling lines. This circulates coolant at various user-controlled temperatures, \
+ ensuring they're comfortable; even if they're some that like it hot."
+ icon_state = "regulator"
+ module_type = MODULE_TOGGLE
+ complexity = 2
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ incompatible_modules = list(/obj/item/mod/module/thermal_regulator)
+ cooldown_time = 0.5 SECONDS
+ /// The temperature we are regulating to.
+ var/temperature_setting = BODYTEMP_NORMAL
+ /// Minimum temperature we can set.
+ var/min_temp = 293.15
+ /// Maximum temperature we can set.
+ var/max_temp = 318.15
+
+/obj/item/mod/module/thermal_regulator/get_configuration()
+ . = ..()
+ .["temperature_setting"] = add_ui_configuration("Temperature", "number", temperature_setting - T0C)
+
+/obj/item/mod/module/thermal_regulator/configure_edit(key, value)
+ switch(key)
+ if("temperature_setting")
+ temperature_setting = clamp(value + T0C, min_temp, max_temp)
+
+/obj/item/mod/module/thermal_regulator/on_active_process(delta_time)
+ mod.wearer.adjust_bodytemperature(get_temp_change_amount((temperature_setting - mod.wearer.bodytemperature), 0.08 * delta_time))
+
+///DNA Lock - Prevents people without the set DNA from activating the suit.
+/obj/item/mod/module/dna_lock
+ name = "MOD DNA lock module"
+ desc = "A module which engages with the various locks and seals tied to the suit's systems, \
+ enabling it to only be worn by someone corresponding with the user's exact DNA profile; \
+ however, this incredibly sensitive module is shorted out by EMPs. Luckily, cloning has been outlawed."
+ icon_state = "dnalock"
+ module_type = MODULE_USABLE
+ complexity = 2
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 3
+ incompatible_modules = list(/obj/item/mod/module/dna_lock/*, obj/item/mod/module/eradication_lock*/)
+ cooldown_time = 0.5 SECONDS
+ /// The DNA we lock with.
+ var/dna = null
+
+/obj/item/mod/module/dna_lock/on_install()
+ RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_mod_activation))
+ RegisterSignal(mod, COMSIG_MOD_MODULE_REMOVAL, PROC_REF(on_mod_removal))
+ RegisterSignal(mod, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp))
+ RegisterSignal(mod, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag))
+
+/obj/item/mod/module/dna_lock/on_uninstall(deleting = FALSE)
+ UnregisterSignal(mod, COMSIG_MOD_ACTIVATE)
+ UnregisterSignal(mod, COMSIG_MOD_MODULE_REMOVAL)
+ UnregisterSignal(mod, COMSIG_ATOM_EMP_ACT)
+ UnregisterSignal(mod, COMSIG_ATOM_EMAG_ACT)
+
+/obj/item/mod/module/dna_lock/on_use()
+ . = ..()
+ if(!.)
+ return
+ dna = mod.wearer.dna.unique_enzymes
+ balloon_alert(mod.wearer, "dna updated")
+ drain_power(use_power_cost)
+
+/obj/item/mod/module/dna_lock/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
+ on_emp(src, severity)
+
+/obj/item/mod/module/dna_lock/emag_act(mob/user, obj/item/card/emag/emag_card)
+ . = ..()
+ on_emag(src, user, emag_card)
+
+/obj/item/mod/module/dna_lock/proc/dna_check(mob/user)
+ if(!iscarbon(user))
+ return FALSE
+ var/mob/living/carbon/carbon_user = user
+ if(!dna || (carbon_user.has_dna() && carbon_user.dna.unique_enzymes == dna))
+ return TRUE
+ balloon_alert(user, "dna locked!")
+ return FALSE
+
+/obj/item/mod/module/dna_lock/proc/on_emp(datum/source, severity)
+ SIGNAL_HANDLER
+
+ dna = null
+
+/obj/item/mod/module/dna_lock/proc/on_emag(datum/source, mob/user, obj/item/card/emag/emag_card)
+ SIGNAL_HANDLER
+
+ dna = null
+
+/obj/item/mod/module/dna_lock/proc/on_mod_activation(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ if(!dna_check(user))
+ return MOD_CANCEL_ACTIVATE
+
+/obj/item/mod/module/dna_lock/proc/on_mod_removal(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ if(!dna_check(user))
+ return MOD_CANCEL_REMOVAL
+
+///Plasma Stabilizer - Prevents plasmamen from igniting in the suit
+/obj/item/mod/module/plasma_stabilizer
+ name = "MOD plasma stabilizer module"
+ desc = "This system essentially forms an atmosphere of its' own inside the suit, \
+ safely ejecting oxygen from the inside and allowing the wearer, a plasmaman, \
+ to have their internal plasma circulate around them somewhat like a sauna. \
+ This prevents them from self-igniting, and leads to greater comfort overall. \
+ The purple glass of the visor seems to be constructed for nostalgic purposes."
+ icon_state = "plasma_stabilizer"
+ complexity = 1
+ idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ incompatible_modules = list(/obj/item/mod/module/plasma_stabilizer)
+ overlay_state_inactive = "module_plasma"
+
+/obj/item/mod/module/plasma_stabilizer/on_equip()
+ ADD_TRAIT(mod.wearer, TRAIT_NOSELFIGNITION_HEAD_ONLY, MOD_TRAIT)
+
+/obj/item/mod/module/plasma_stabilizer/on_unequip()
+ REMOVE_TRAIT(mod.wearer, TRAIT_NOSELFIGNITION_HEAD_ONLY, MOD_TRAIT)
+
+
+//Finally, https://pipe.miroware.io/5b52ba1d94357d5d623f74aa/mspfa/Nuke%20Ops/Panels/0648.gif can be real:
+///Hat Stabilizer - Allows displaying a hat over the MOD-helmet, à la plasmamen helmets.
+/obj/item/mod/module/hat_stabilizer
+ name = "MOD hat stabilizer module"
+ desc = "A simple set of deployable stands, directly atop one's head; \
+ these will deploy under a select few hats to keep them from falling off, allowing them to be worn atop the sealed helmet. \
+ You still need to take the hat off your head while the helmet deploys, though. \
+ This is a must-have for Nanotrasen Captains, enabling them to show off their authoritative hat even while in their MODsuit."
+ icon_state = "hat_holder"
+ incompatible_modules = list(/obj/item/mod/module/hat_stabilizer)
+ /*Intentionally left inheriting 0 complexity and removable = TRUE;
+ even though it comes inbuilt into the Magnate/Corporate MODS and spawns in maints, I like the idea of stealing them*/
+ /// Currently "stored" hat. No armor or function will be inherited, ONLY the icon.
+ var/obj/item/clothing/head/attached_hat
+ /// Whitelist of attachable hats, read note in Initialize() below this line
+ var/static/list/attachable_hats_list
+
+/obj/item/mod/module/hat_stabilizer/Initialize(mapload)
+ . = ..()
+ attachable_hats_list = typecacheof(
+ //List of attachable hats. Make sure these and their subtypes are all tested, so they dont appear janky.
+ //This list should also be gimmicky, so captains can have fun. I.E. the Santahat, Pirate hat, Tophat, Chefhat...
+ //Yes, I said it, the captain should have fun.
+ list(
+ /obj/item/clothing/head/caphat,
+ /obj/item/clothing/head/crown,
+ /obj/item/clothing/head/centhat,
+ /obj/item/clothing/head/pirate,
+ /obj/item/clothing/head/santa,
+ /obj/item/clothing/head/kitty,
+ /obj/item/clothing/head/festive,
+ /obj/item/clothing/head/that,
+ /obj/item/clothing/head/nursehat,
+ /obj/item/clothing/head/chefhat,
+ /obj/item/clothing/head/papersack,
+ ))
+
+/obj/item/mod/module/hat_stabilizer/on_suit_activation()
+ RegisterSignal(mod.helmet, COMSIG_PARENT_EXAMINE, PROC_REF(add_examine))
+ RegisterSignal(mod.helmet, COMSIG_PARENT_ATTACKBY, PROC_REF(place_hat))
+ RegisterSignal(mod.helmet, COMSIG_CLICK_ALT, PROC_REF(remove_hat))
+
+/obj/item/mod/module/hat_stabilizer/on_suit_deactivation(deleting = FALSE)
+ if(deleting)
+ return
+ if(attached_hat) //knock off the helmet if its on their head. Or, technically, auto-rightclick it for them; that way it saves us code, AND gives them the bubble
+ remove_hat(src, mod.wearer)
+ UnregisterSignal(mod.helmet, COMSIG_PARENT_EXAMINE)
+ UnregisterSignal(mod.helmet, COMSIG_PARENT_ATTACKBY)
+ UnregisterSignal(mod.helmet, COMSIG_CLICK_ALT)
+
+/obj/item/mod/module/hat_stabilizer/proc/add_examine(datum/source, mob/user, list/base_examine)
+ SIGNAL_HANDLER
+ if(attached_hat)
+ base_examine += span_notice("There's \a [attached_hat] placed on the helmet. Alt-click to remove it.")
+ else
+ base_examine += span_notice("There's nothing placed on the helmet. Yet.")
+
+/obj/item/mod/module/hat_stabilizer/proc/place_hat(datum/source, obj/item/hitting_item, mob/user)
+ SIGNAL_HANDLER
+ if(!istype(hitting_item, /obj/item/clothing/head))
+ return
+ if(!mod.active)
+ balloon_alert(user, "suit must be active!")
+ return
+ if(!is_type_in_typecache(hitting_item, attachable_hats_list))
+ balloon_alert(user, "this hat won't fit!")
+ return
+ if(attached_hat)
+ balloon_alert(user, "hat already attached!")
+ return
+ if(mod.wearer.transferItemToLoc(hitting_item, src, force = FALSE, silent = TRUE))
+ attached_hat = hitting_item
+ balloon_alert(user, "hat attached, alt-click to remove")
+ mod.wearer.update_inv_back(mod.slot_flags)
+
+/obj/item/mod/module/hat_stabilizer/generate_worn_overlay()
+ . = ..()
+ if(attached_hat)
+ . += attached_hat.build_worn_icon(default_layer = ABOVE_MOB_LAYER, default_icon_file = 'icons/mob/clothing/head.dmi')
+
+/obj/item/mod/module/hat_stabilizer/proc/remove_hat(datum/source, mob/user)
+ SIGNAL_HANDLER
+ . = SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ if(!attached_hat)
+ return
+ attached_hat.forceMove(drop_location())
+ if(user.put_in_active_hand(attached_hat))
+ balloon_alert(user, "hat removed")
+ else
+ balloon_alert_to_viewers("the hat falls to the floor!")
+ attached_hat = null
+ mod.wearer.update_inv_back(mod.slot_flags)
diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm
new file mode 100644
index 00000000000..dc0f595c19f
--- /dev/null
+++ b/code/modules/mod/modules/modules_maint.dm
@@ -0,0 +1,148 @@
+//Maint modules for MODsuits
+
+///Springlock Mechanism - allows your modsuit to activate faster, but reagents are very dangerous.
+/obj/item/mod/module/springlock
+ name = "MOD springlock module"
+ desc = "A module that spans the entire size of the MOD unit, sitting under the outer shell. \
+ This mechanical exoskeleton pushes out of the way when the user enters and it helps in booting \
+ up, but was taken out of modern suits because of the springlock's tendency to \"snap\" back \
+ into place when exposed to humidity. You know what it's like to have an entire exoskeleton enter you?"
+ icon_state = "springlock"
+ complexity = 3 // it is inside every part of your suit, so
+ incompatible_modules = list(/obj/item/mod/module/springlock)
+
+/obj/item/mod/module/springlock/on_install()
+ mod.activation_step_time *= 0.5
+
+/obj/item/mod/module/springlock/on_uninstall(deleting = FALSE)
+ mod.activation_step_time *= 2
+
+/obj/item/mod/module/springlock/on_suit_activation()
+ RegisterSignal(mod.wearer, COMSIG_ATOM_EXPOSE_REAGENTS, PROC_REF(on_wearer_exposed))
+
+/obj/item/mod/module/springlock/on_suit_deactivation(deleting = FALSE)
+ UnregisterSignal(mod.wearer, COMSIG_ATOM_EXPOSE_REAGENTS)
+
+///Signal fired when wearer is exposed to reagents
+/obj/item/mod/module/springlock/proc/on_wearer_exposed(atom/source, list/reagents, datum/reagents/source_reagents, methods, volume_modifier, show_message)
+ SIGNAL_HANDLER
+
+ if(!(methods & (VAPOR|PATCH|TOUCH)))
+ return //remove non-touch reagent exposure
+ to_chat(mod.wearer, span_danger("[src] makes an ominous click sound..."))
+ playsound(src, 'sound/items/modsuit/springlock.ogg', 75, TRUE)
+ addtimer(CALLBACK(src, PROC_REF(snap_shut)), rand(3 SECONDS, 5 SECONDS))
+ RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_activate_spring_block))
+
+///Signal fired when wearer attempts to activate/deactivate suits
+/obj/item/mod/module/springlock/proc/on_activate_spring_block(datum/source, user)
+ SIGNAL_HANDLER
+
+ balloon_alert(user, "springlocks aren't responding...?")
+ return MOD_CANCEL_ACTIVATE
+
+///Delayed death proc of the suit after the wearer is exposed to reagents
+/obj/item/mod/module/springlock/proc/snap_shut()
+ UnregisterSignal(mod, COMSIG_MOD_ACTIVATE)
+ if(!mod.wearer) //while there is a guaranteed user when on_wearer_exposed() fires, that isn't the same case for this proc
+ return
+ mod.wearer.visible_message("[src] inside [mod.wearer]'s [mod.name] snaps shut, mutilating the user inside!", span_userdanger("*SNAP*"))
+ mod.wearer.force_scream()
+ playsound(mod.wearer, 'sound/effects/snap.ogg', 75, TRUE, frequency = 0.5)
+ playsound(mod.wearer, 'sound/effects/splat.ogg', 50, TRUE, frequency = 0.5)
+ mod.wearer.apply_damage(500, BRUTE, forced = TRUE, spread_damage = TRUE) //boggers, bogchamp, etc
+ if(!HAS_TRAIT(mod.wearer, TRAIT_NODEATH))
+ mod.wearer.death() //just in case, for some reason, they're still alive
+ flash_color(mod.wearer, flash_color = "#FF0000", flash_time = 10 SECONDS)
+
+///Balloon Blower - Blows a balloon.
+/obj/item/mod/module/balloon
+ name = "MOD balloon blower module"
+ desc = "A strange module invented years ago by some ingenious mimes. It blows balloons."
+ icon_state = "bloon"
+ module_type = MODULE_USABLE
+ complexity = 1
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
+ incompatible_modules = list(/obj/item/mod/module/balloon)
+ cooldown_time = 15 SECONDS
+
+/obj/item/mod/module/balloon/on_use()
+ . = ..()
+ if(!.)
+ return
+ if(!do_after(mod.wearer, 10 SECONDS, target = mod))
+ return FALSE
+ mod.wearer.adjustOxyLoss(20)
+ playsound(src, 'sound/items/modsuit/inflate_bloon.ogg', 50, TRUE)
+ var/obj/item/toy/balloon/balloon = new(get_turf(src))
+ mod.wearer.put_in_hands(balloon)
+ drain_power(use_power_cost)
+
+///Paper Dispenser - Dispenses (sometimes burning) paper sheets.
+/obj/item/mod/module/paper_dispenser
+ name = "MOD paper dispenser module"
+ desc = "A simple module designed by the bureaucrats of Torch Bay. \
+ It dispenses 'warm, clean, and crisp sheets of paper' onto a nearby table. Usually."
+ icon_state = "paper_maker"
+ module_type = MODULE_USABLE
+ complexity = 1
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
+ incompatible_modules = list(/obj/item/mod/module/paper_dispenser)
+ cooldown_time = 5 SECONDS
+ /// The total number of sheets created by this MOD. The more sheets, them more likely they set on fire.
+ var/num_sheets_dispensed = 0
+
+/obj/item/mod/module/paper_dispenser/on_use()
+ . = ..()
+ if(!.)
+ return
+ if(!do_after(mod.wearer, 1 SECONDS, target = mod))
+ return FALSE
+
+ var/obj/item/paper/crisp_paper = new(get_turf(src))
+ crisp_paper.desc = "It's crisp and warm to the touch. Must be fresh."
+
+ var/obj/structure/table/nearby_table = locate() in range(1, mod.wearer)
+ playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
+ balloon_alert(mod.wearer, "dispensed paper[nearby_table ? " onto table":""]")
+
+ mod.wearer.put_in_hands(crisp_paper)
+ if(nearby_table)
+ mod.wearer.transferItemToLoc(crisp_paper, nearby_table.drop_location(), silent = FALSE)
+
+ // Up to a 30% chance to set the sheet on fire, +2% per sheet made
+ if(prob(min(num_sheets_dispensed * 2, 30)))
+ if(crisp_paper in mod.wearer.held_items)
+ mod.wearer.dropItemToGround(crisp_paper, force = TRUE)
+ crisp_paper.balloon_alert(mod.wearer, "pc load letter!")
+ crisp_paper.visible_message(span_warning("[crisp_paper] bursts into flames, it's too crisp!"))
+ crisp_paper.fire_act(1000, 100)
+
+ drain_power(use_power_cost)
+ num_sheets_dispensed++
+
+
+///Stamper - Extends a stamp that can switch between accept/deny modes.
+/obj/item/mod/module/stamp
+ name = "MOD stamper module"
+ desc = "A module installed into the wrist of the suit, this functions as a high-power stamp, \
+ able to switch between accept and deny modes."
+ icon_state = "stamp"
+ module_type = MODULE_ACTIVE
+ complexity = 1
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ device = /obj/item/stamp/mod
+ incompatible_modules = list(/obj/item/mod/module/stamp)
+ cooldown_time = 0.5 SECONDS
+
+/obj/item/stamp/mod
+ name = "MOD electronic stamp"
+ desc = "A high-power stamp, able to switch between accept and deny mode when used."
+
+/obj/item/stamp/mod/attack_self(mob/user, modifiers)
+ . = ..()
+ if(icon_state == "stamp-ok")
+ icon_state = "stamp-deny"
+ else
+ icon_state = "stamp-ok"
+ balloon_alert(user, "switched mode")
diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm
new file mode 100644
index 00000000000..798f065ffe7
--- /dev/null
+++ b/code/modules/mod/modules/modules_medical.dm
@@ -0,0 +1,110 @@
+//Medical modules for MODsuits
+
+#define HEALTH_SCAN "Health"
+#define WOUND_SCAN "Wound"
+#define CHEM_SCAN "Chemical"
+
+///Health Analyzer - Gives the user a ranged health analyzer and their health status in the panel.
+/obj/item/mod/module/health_analyzer
+ name = "MOD health analyzer module"
+ desc = "A module installed into the glove of the suit. This is a high-tech biological scanning suite, \
+ allowing the user indepth information on the vitals and injuries of others even at a distance, \
+ all with the flick of the wrist. Data is displayed in a convenient package on HUD in the helmet, \
+ but it's up to you to do something with it."
+ icon_state = "health"
+ module_type = MODULE_ACTIVE
+ complexity = 2
+ use_power_cost = DEFAULT_CHARGE_DRAIN
+ incompatible_modules = list(/obj/item/mod/module/health_analyzer)
+ cooldown_time = 0.5 SECONDS
+ tgui_id = "health_analyzer"
+ /// Scanning mode, changes how we scan something.
+ var/mode = HEALTH_SCAN
+ /// List of all scanning modes.
+ var/static/list/modes = list(HEALTH_SCAN, WOUND_SCAN, CHEM_SCAN)
+
+/obj/item/mod/module/health_analyzer/add_ui_data()
+ . = ..()
+ .["userhealth"] = mod.wearer?.health || 0
+ .["usermaxhealth"] = mod.wearer?.getMaxHealth() || 0
+ .["userbrute"] = mod.wearer?.getBruteLoss() || 0
+ .["userburn"] = mod.wearer?.getFireLoss() || 0
+ .["usertoxin"] = mod.wearer?.getToxLoss() || 0
+ .["useroxy"] = mod.wearer?.getOxyLoss() || 0
+
+/obj/item/mod/module/health_analyzer/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ if(!isliving(target) || !mod.wearer.can_read(src))
+ return
+ switch(mode)
+ if(HEALTH_SCAN)
+ healthscan(mod.wearer, target)
+ if(CHEM_SCAN)
+ chemscan(mod.wearer, target)
+ drain_power(use_power_cost)
+
+/obj/item/mod/module/health_analyzer/get_configuration()
+ . = ..()
+ .["mode"] = add_ui_configuration("Scan Mode", "list", mode, modes)
+
+/obj/item/mod/module/health_analyzer/configure_edit(key, value)
+ switch(key)
+ if("mode")
+ mode = value
+
+#undef HEALTH_SCAN
+#undef WOUND_SCAN
+#undef CHEM_SCAN
+
+///Quick Carry - Lets the user carry bodies quicker.
+/obj/item/mod/module/quick_carry
+ name = "MOD quick carry module"
+ desc = "A suite of advanced servos, redirecting power from the suit's arms to help carry the wounded; \
+ or simply for fun. However, Nanotrasen has locked the module's ability to assist in hand-to-hand combat."
+ icon_state = "carry"
+ complexity = 1
+ idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ incompatible_modules = list(/obj/item/mod/module/quick_carry)
+
+/obj/item/mod/module/quick_carry/on_suit_activation()
+ ADD_TRAIT(mod.wearer, TRAIT_QUICK_CARRY, MOD_TRAIT)
+
+/obj/item/mod/module/quick_carry/on_suit_deactivation(deleting = FALSE)
+ REMOVE_TRAIT(mod.wearer, TRAIT_QUICK_CARRY, MOD_TRAIT)
+
+/obj/item/mod/module/quick_carry/advanced
+ name = "MOD advanced quick carry module"
+ removable = FALSE
+ complexity = 0
+
+/obj/item/mod/module/quick_carry/on_suit_activation()
+ ADD_TRAIT(mod.wearer, TRAIT_QUICKER_CARRY, MOD_TRAIT)
+ ADD_TRAIT(mod.wearer, TRAIT_FASTMED, MOD_TRAIT)
+
+/obj/item/mod/module/quick_carry/on_suit_deactivation(deleting = FALSE)
+ REMOVE_TRAIT(mod.wearer, TRAIT_QUICKER_CARRY, MOD_TRAIT)
+ REMOVE_TRAIT(mod.wearer, TRAIT_FASTMED, MOD_TRAIT)
+
+///Injector - Gives the suit an extendable large-capacity piercing syringe.
+/obj/item/mod/module/injector
+ name = "MOD injector module"
+ desc = "A module installed into the wrist of the suit, this functions as a high-capacity syringe, \
+ with a tip fine enough to locate the emergency injection ports on any suit of armor, \
+ penetrating it with ease. Even yours."
+ icon_state = "injector"
+ module_type = MODULE_ACTIVE
+ complexity = 1
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ device = /obj/item/reagent_containers/syringe/mod
+ incompatible_modules = list(/obj/item/mod/module/injector)
+ cooldown_time = 0.5 SECONDS
+
+/obj/item/reagent_containers/syringe/mod
+ name = "MOD injector syringe"
+ desc = "A high-capacity syringe, with a tip fine enough to locate \
+ the emergency injection ports on any suit of armor, penetrating it with ease. Even yours."
+ amount_per_transfer_from_this = 30
+ possible_transfer_amounts = list(5, 10, 15, 20, 30)
+ volume = 30
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
new file mode 100644
index 00000000000..767a229d98f
--- /dev/null
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -0,0 +1,446 @@
+//Ninja modules for MODsuits
+
+///Cloaking - Lowers the user's visibility, can be interrupted by being touched or attacked.
+/obj/item/mod/module/stealth
+ name = "MOD prototype cloaking module"
+ desc = "A complete retrofitting of the suit, this is a form of visual concealment tech employing esoteric technology \
+ to bend light around the user, as well as mimetic materials to make the surface of the suit match the \
+ surroundings based off sensor data. For some reason, this tech is rarely seen."
+ icon_state = "cloak"
+ module_type = MODULE_TOGGLE
+ complexity = 4
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 2
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 10
+ incompatible_modules = list(/obj/item/mod/module/stealth)
+ cooldown_time = 5 SECONDS
+ /// Whether or not the cloak turns off on bumping.
+ var/bumpoff = TRUE
+ /// The alpha applied when the cloak is on.
+ var/stealth_alpha = 50
+
+/obj/item/mod/module/stealth/on_activation()
+ . = ..()
+ if(!.)
+ return
+ if(bumpoff)
+ RegisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP, PROC_REF(unstealth))
+ RegisterSignal(mod.wearer, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, PROC_REF(on_unarmed_attack))
+ RegisterSignal(mod.wearer, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act))
+ RegisterSignal(mod.wearer, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND/*, COMSIG_ATOM_HITBY*/, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED), PROC_REF(unstealth))
+ animate(mod.wearer, alpha = stealth_alpha, time = 1.5 SECONDS)
+ drain_power(use_power_cost)
+
+/obj/item/mod/module/stealth/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ if(bumpoff)
+ UnregisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP)
+ UnregisterSignal(mod.wearer, list(COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_BULLET_ACT/*, COMSIG_ATOM_HITBY*/, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED))
+ animate(mod.wearer, alpha = 255, time = 1.5 SECONDS)
+
+/obj/item/mod/module/stealth/proc/unstealth(datum/source)
+ SIGNAL_HANDLER
+
+ to_chat(mod.wearer, span_warning("[src] gets discharged from contact!"))
+ do_sparks(2, TRUE, src)
+ drain_power(use_power_cost)
+ on_deactivation(display_message = TRUE, deleting = FALSE)
+
+/obj/item/mod/module/stealth/proc/on_unarmed_attack(datum/source, atom/target)
+ SIGNAL_HANDLER
+
+ if(!isliving(target))
+ return
+ unstealth(source)
+
+/obj/item/mod/module/stealth/proc/on_bullet_act(datum/source, obj/projectile/projectile)
+ SIGNAL_HANDLER
+
+ if(projectile.nodamage)
+ return
+ unstealth(source)
+
+//Advanced Cloaking - Doesn't turf off on bump, less power drain, more stealthy.
+/obj/item/mod/module/stealth/ninja
+ name = "MOD advanced cloaking module"
+ desc = "The latest in stealth technology, this module is a definite upgrade over previous versions. \
+ The field has been tuned to be even more responsive and fast-acting, with enough stability to \
+ continue operation of the field even if the user bumps into others. \
+ The power draw has been reduced drastically, making this perfect for activities like \
+ standing near sentry turrets for extended periods of time."
+ icon_state = "cloak_ninja"
+ bumpoff = FALSE
+ stealth_alpha = 20
+ active_power_cost = DEFAULT_CHARGE_DRAIN
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 5
+ cooldown_time = 3 SECONDS
+
+///Camera Vision - Prevents flashes, blocks tracking.
+/obj/item/mod/module/welding/camera_vision
+ name = "MOD camera vision module"
+ desc = "A module installed into the suit's helmet. This specialized piece of technology is built for subterfuge, \
+ replacing the standard visor with a nanotech display; capable of displaying specialized imagery at \
+ just the right frequency to jam all known forms of camera tracking and facial recognition, \
+ as well as automatically dimming incoming flashes of light to protect the user's eyes. Become the unseen."
+ icon_state = "welding_camera"
+ removable = FALSE
+ complexity = 0
+ overlay_state_inactive = null
+
+/obj/item/mod/module/welding/camera_vision/on_suit_activation()
+ . = ..()
+ RegisterSignal(mod.wearer, COMSIG_LIVING_CAN_TRACK, PROC_REF(can_track))
+
+/obj/item/mod/module/welding/camera_vision/on_suit_deactivation(deleting = FALSE)
+ . = ..()
+ UnregisterSignal(mod.wearer, COMSIG_LIVING_CAN_TRACK)
+
+/obj/item/mod/module/welding/camera_vision/proc/can_track(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ return COMPONENT_CANT_TRACK
+
+//Ninja Star Dispenser - Dispenses ninja stars.
+/obj/item/mod/module/dispenser/ninja
+ name = "MOD ninja star dispenser module"
+ desc = "This piece of Spider Clan technology can exploit known energy-matter equivalence principles, \
+ using the nanites already hosted in the wearer's suit to transmute into monomolecular shuriken. \
+ While these lack the intense bleeding edge of conventional throwing stars, \
+ they have been set to electrify fleeing targets; and branded with the Spider Clan symbol."
+ dispense_type = /obj/item/throwing_star/stamina
+ cooldown_time = 0.5 SECONDS
+
+///Hacker - This module hooks onto your right-clicks with empty hands and causes ninja actions.
+/obj/item/mod/module/hacker
+ name = "MOD hacker module"
+ desc = "Built for one purpose, electronic warfare, this module is built into the hands. \
+ Using near-field communication alongside precise electro-stimulation of the wires in machines, \
+ this decker's dream is normally used to pass through doors like a phantom. \
+ It's also capable of non-precise electro-stimulation of an assassin-saboteur's opponents on disarming attacks."
+ icon_state = "hacker"
+ removable = FALSE
+ incompatible_modules = list(/obj/item/mod/module/hacker)
+ /// Minimum amount of power we can drain in a single drain action
+ var/mindrain = 200
+ /// Maximum amount of power we can drain in a single drain action
+ var/maxdrain = 400
+ /// Whether or not the communication console hack was used to summon another antagonist.
+ var/communication_console_hack_success = FALSE
+ /// How many times the module has been used to force open doors.
+ var/door_hack_counter = 0
+ ///Used for the research objective (see antagonist file)
+ var/datum/techweb/stored_research
+
+/obj/item/mod/module/hacker/on_suit_activation()
+ RegisterSignal(mod.wearer, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(hack))
+
+/obj/item/mod/module/hacker/on_suit_deactivation(deleting = FALSE)
+ UnregisterSignal(mod.wearer, COMSIG_HUMAN_EARLY_UNARMED_ATTACK)
+
+/obj/item/mod/module/hacker/proc/hack(mob/living/carbon/human/source, atom/target, proximity, modifiers)
+ SIGNAL_HANDLER
+
+ if(!LAZYACCESS(modifiers, RIGHT_CLICK) || !proximity)
+ return NONE
+ target.add_fingerprint(mod.wearer)
+ return target.ninjadrain_act(mod.wearer, src)
+
+/obj/item/mod/module/hacker/proc/charge_message(atom/drained_atom, drain_amount)
+ if(drain_amount)
+ to_chat(mod.wearer, span_notice("Получено [drain_amount] единиц энергии с [drained_atom]."))
+ else
+ to_chat(mod.wearer, span_warning("[drained_atom] истощен, необходимо найти другой источник питания!"))
+
+///Weapon Recall - Teleports your katana to you, prevents gun use.
+/obj/item/mod/module/weapon_recall
+ name = "MOD weapon recall module"
+ desc = "The cornerstone of a clanmember's life as a blademaster, and a module symbolizing their eternal bond with their weapon. \
+ This hooks to the micro bluespace drive inside an energy katana's handle, capable of recalling it to the user's \
+ skilled hands wherever they are. However, those that make such a bond with their weapon are cursed to \
+ fusing their existence with acts of combat, with a singular purpose; Cutting Down Their Opponent. \
+ Their hand a hand that is cutting, their body a body that is cutting, their mind, a mind that is cutting. \
+ Ranged weapons are forbidden."
+ icon_state = "recall"
+ removable = FALSE
+ module_type = MODULE_USABLE
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 2
+ incompatible_modules = list(/obj/item/mod/module/weapon_recall)
+ cooldown_time = 0.5 SECONDS
+ /// The item linked to the module that will get recalled.
+ var/obj/item/linked_weapon
+ /// The accepted typepath we can link to.
+ var/accepted_type = /obj/item/melee/sword/energy_katana
+
+/obj/item/mod/module/weapon_recall/on_suit_activation()
+ ADD_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
+
+/obj/item/mod/module/weapon_recall/on_suit_deactivation(deleting = FALSE)
+ REMOVE_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
+
+/obj/item/mod/module/weapon_recall/on_use()
+ . = ..()
+ if(!.)
+ return
+ if(!linked_weapon)
+ var/obj/item/weapon_to_link = mod.wearer.is_holding_item_of_type(accepted_type)
+ if(!weapon_to_link)
+ balloon_alert(mod.wearer, "can't locate weapon!")
+ return
+ set_weapon(weapon_to_link)
+ balloon_alert(mod.wearer, "[linked_weapon.name] linked")
+ return
+ if(linked_weapon in mod.wearer.get_all_contents())
+ balloon_alert(mod.wearer, "already on self!")
+ return
+ var/distance = get_dist(mod.wearer, linked_weapon)
+ var/in_view = (linked_weapon in view(mod.wearer))
+ if(!in_view && !drain_power(use_power_cost * distance))
+ balloon_alert(mod.wearer, "not enough charge!")
+ return
+ linked_weapon.forceMove(linked_weapon.drop_location())
+ if(in_view)
+ do_sparks(5, FALSE, linked_weapon)
+ mod.wearer.visible_message(span_danger("[linked_weapon] flies towards [mod.wearer]!"),span_warning("You hold out your hand and [linked_weapon] flies towards you!"))
+ linked_weapon.throw_at(mod.wearer, distance+1, linked_weapon.throw_speed, mod.wearer)
+ else
+ recall_weapon()
+
+/obj/item/mod/module/weapon_recall/proc/set_weapon(obj/item/weapon)
+ linked_weapon = weapon
+ RegisterSignal(linked_weapon, COMSIG_MOVABLE_IMPACT, PROC_REF(catch_weapon))
+ RegisterSignal(linked_weapon, COMSIG_PARENT_QDELETING, PROC_REF(deleted_weapon))
+
+/obj/item/mod/module/weapon_recall/proc/recall_weapon(caught = FALSE)
+ linked_weapon.forceMove(get_turf(src))
+ var/alert = ""
+ if(mod.wearer.put_in_hands(linked_weapon))
+ alert = "[linked_weapon.name] teleports to your hand"
+ else if(mod.wearer.equip_to_slot_if_possible(linked_weapon, ITEM_SLOT_BELT, disable_warning = TRUE))
+ alert = "[linked_weapon.name] sheathes itself in your belt"
+ else
+ alert = "[linked_weapon.name] teleports under you"
+ if(caught)
+ if(mod.wearer.is_holding(linked_weapon))
+ alert = "you catch [linked_weapon.name]"
+ else
+ alert = "[linked_weapon.name] lands under you"
+ else
+ do_sparks(5, FALSE, linked_weapon)
+ if(alert)
+ balloon_alert(mod.wearer, alert)
+
+/obj/item/mod/module/weapon_recall/proc/catch_weapon(obj/item/source, atom/hit_atom, datum/thrownthing/thrownthing)
+ SIGNAL_HANDLER
+
+ if(!mod)
+ return
+ if(hit_atom != mod.wearer)
+ return
+ INVOKE_ASYNC(src, PROC_REF(recall_weapon), TRUE)
+ return COMPONENT_MOVABLE_IMPACT_NEVERMIND
+
+/obj/item/mod/module/weapon_recall/proc/deleted_weapon(obj/item/source)
+ SIGNAL_HANDLER
+
+ linked_weapon = null
+
+//Reinforced DNA Lock - Gibs if wrong DNA, emp-proof.
+/obj/item/mod/module/dna_lock/reinforced
+ name = "MOD reinforced DNA lock module"
+ desc = "A module which engages with the various locks and seals tied to the suit's systems, \
+ enabling it to only be worn by someone corresponding with the user's exact DNA profile. \
+ Due to utilizing a skintight dampening shield, this one is entirely sealed against electromagnetic interference; \
+ it also dutifully protects the secrets of the Spider Clan from unknowing outsiders."
+ icon_state = "dnalock_ninja"
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
+
+/obj/item/mod/module/dna_lock/reinforced/on_mod_activation(datum/source, mob/user)
+ . = ..()
+ if(. != MOD_CANCEL_ACTIVATE || !isliving(user))
+ return
+ var/mob/living/living_user = user
+ to_chat(living_user, span_danger("fATaL EERRoR: 382200-*#00CODE RED\nUNAUTHORIZED USE DETECteD\nCoMMENCING SUB-R0UTIN3 13...\nTERMInATING U-U-USER..."))
+ living_user.gib()
+
+/obj/item/mod/module/dna_lock/reinforced/on_emp(datum/source, severity)
+ return
+
+//EMP Pulse - In addition to normal shielding, can also launch an EMP itself.
+/obj/item/mod/module/emp_shield/pulse
+ name = "MOD EMP pulse module"
+ desc = "This module is normally set to activate on dramatic gestures, inverting and expanding the suit's \
+ EMP dampening shield to cause an electromagnetic pulse of its own. While this won't interfere with the wearer, \
+ it will piss off everyone around them."
+ icon_state = "emp_pulse"
+ module_type = MODULE_USABLE
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 10
+ cooldown_time = 8 SECONDS
+
+/obj/item/mod/module/emp_shield/pulse/on_use()
+ . = ..()
+ if(!.)
+ return
+ playsound(src, 'sound/effects/empulse.ogg', 60, TRUE)
+ empulse(src, heavy_range = 4, light_range = 6)
+ drain_power(use_power_cost)
+
+///Status Readout - Puts a lot of information including health, nutrition, fingerprints, temperature to the suit TGUI.
+/obj/item/mod/module/status_readout
+ name = "MOD status readout module"
+ desc = "A once-common module, this technology went unfortunately out of fashion; \
+ and right into the arachnid grip of the Spider Clan. This hooks into the suit's spine, \
+ capable of capturing and displaying all possible biometric data of the wearer; sleep, nutrition, fitness, fingerprints, \
+ and even useful information such as their overall health and wellness."
+ icon_state = "status"
+ complexity = 1
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 0.1
+ incompatible_modules = list(/obj/item/mod/module/status_readout)
+ tgui_id = "status_readout"
+
+/obj/item/mod/module/status_readout/add_ui_data()
+ . = ..()
+ .["statustime"] = station_time_timestamp()
+ .["statusid"] = GLOB.round_id
+ .["statushealth"] = mod.wearer?.health || 0
+ .["statusmaxhealth"] = mod.wearer?.getMaxHealth() || 0
+ .["statusbrute"] = mod.wearer?.getBruteLoss() || 0
+ .["statusburn"] = mod.wearer?.getFireLoss() || 0
+ .["statustoxin"] = mod.wearer?.getToxLoss() || 0
+ .["statusoxy"] = mod.wearer?.getOxyLoss() || 0
+ .["statustemp"] = mod.wearer?.bodytemperature || 0
+ .["statusnutrition"] = mod.wearer?.nutrition || 0
+ //.["statusfingerprints"] = mod.wearer ? md5(mod.wearer.dna.unique_identity) : null
+ .["statusdna"] = mod.wearer?.dna.unique_enzymes
+ .["statusviruses"] = null
+ if(!length(mod.wearer?.diseases))
+ return
+ var/list/viruses = list()
+ for(var/datum/disease/virus as anything in mod.wearer.diseases)
+ var/list/virus_data = list()
+ virus_data["name"] = virus.name
+ virus_data["type"] = virus.spread_text
+ virus_data["stage"] = virus.stage
+ virus_data["maxstage"] = virus.max_stages
+ virus_data["cure"] = virus.cure_text
+ viruses += list(virus_data)
+ .["statusviruses"] = viruses
+
+///Energy Net - Ensnares enemies in a net that prevents movement.
+/obj/item/mod/module/energy_net
+ name = "MOD energy net module"
+ desc = "A custom-built net-thrower. While conventional implementations of this capturing device \
+ tilize monomolecular fibers or cutting razorwire, this uses hardlight technology to deploy a \
+ trapping field capable of immobilizing even the strongest opponents."
+ icon_state = "energy_net"
+ removable = FALSE
+ module_type = MODULE_ACTIVE
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 6
+ incompatible_modules = list(/obj/item/mod/module/energy_net)
+ cooldown_time = 1.5 SECONDS
+
+/obj/item/mod/module/energy_net/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ if(!isliving(target))
+ balloon_alert(mod.wearer, "invalid target!")
+ return
+ var/mob/living/living_target = target
+ if(locate(/obj/structure/energy_net) in get_turf(living_target))
+ balloon_alert(mod.wearer, "already trapped!")
+ return
+ for(var/turf/between_turf as anything in get_line(get_turf(mod.wearer), get_turf(living_target)))
+ if(between_turf.density)
+ balloon_alert(mod.wearer, "not through obstacles!")
+ return
+ //if(IS_SPACE_NINJA(mod.wearer))
+ // mod.wearer.say("Get over here!", forced = type)
+ mod.wearer.Beam(living_target, "n_beam", time = 1.5 SECONDS)
+ var/obj/structure/energy_net/net = new /obj/structure/energy_net(living_target.drop_location())
+ net.affecting = living_target
+ mod.wearer.visible_message(span_danger("[mod.wearer] caught [living_target] with an energy net!"), span_notice("You caught [living_target] with an energy net!"))
+ if(living_target.buckled)
+ living_target.buckled.unbuckle_mob(living_target, force = TRUE)
+ net.buckle_mob(living_target, force = TRUE)
+ drain_power(use_power_cost)
+
+///Adrenaline Boost - Stops all stuns the ninja is affected with, increases his speed.
+/obj/item/mod/module/adrenaline_boost
+ name = "MOD adrenaline boost module"
+ desc = "The secrets of the Spider Clan are many. The exact specifications of their suits, \
+ the techniques they use to make every singular cut make their enemies weep with admiration, \
+ but one of their greatest mysteries is the chemical compound their assassin-saboteurs use in times of need. \
+ It's capable of clearing any fatigue whatsoever from the user, any immobilizing effect, and can even \
+ cure total paralysis. All that's known is that the fluid requires radiation to properly 'cook,' \
+ so this module demands radium to be refilled with."
+ icon_state = "adrenaline_boost"
+ removable = FALSE
+ module_type = MODULE_USABLE
+ incompatible_modules = list(/obj/item/mod/module/adrenaline_boost)
+ cooldown_time = 12 SECONDS
+ /// What reagent we need to refill?
+ var/reagent_required = /datum/reagent/uranium/radium
+ /// How much of a reagent we need to refill the boost.
+ var/reagent_required_amount = 20
+
+/obj/item/mod/module/adrenaline_boost/Initialize(mapload)
+ . = ..()
+ create_reagents(reagent_required_amount)
+ reagents.add_reagent(reagent_required, reagent_required_amount)
+
+/obj/item/mod/module/adrenaline_boost/on_use()
+ if(!reagents.has_reagent(reagent_required, reagent_required_amount))
+ balloon_alert(mod.wearer, "no charge!")
+ return
+ . = ..()
+ if(!.)
+ return
+ //if(IS_SPACE_NINJA(mod.wearer))
+ // mod.wearer.say(pick_list_replacements(NINJA_FILE, "lines"), forced = type)
+ to_chat(mod.wearer, span_notice("You have used the adrenaline boost."))
+ mod.wearer.SetUnconscious(0)
+ mod.wearer.SetStun(0)
+ mod.wearer.SetKnockdown(0)
+ mod.wearer.SetImmobilized(0)
+ mod.wearer.SetParalyzed(0)
+ mod.wearer.adjustStaminaLoss(-200)
+ mod.wearer.stuttering = 0
+ mod.wearer.reagents.add_reagent(/datum/reagent/medicine/stimulants, 5)
+ reagents.remove_reagent(reagent_required, reagents.total_volume * 0.75)
+ addtimer(CALLBACK(src, PROC_REF(boost_aftereffects), mod.wearer), 7 SECONDS)
+
+/obj/item/mod/module/adrenaline_boost/on_install()
+ RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby))
+
+/obj/item/mod/module/adrenaline_boost/on_uninstall(deleting)
+ UnregisterSignal(mod, COMSIG_PARENT_ATTACKBY)
+
+/obj/item/mod/module/adrenaline_boost/attackby(obj/item/attacking_item, mob/user, params)
+ if(charge_boost(attacking_item, user))
+ return TRUE
+ return ..()
+
+/obj/item/mod/module/adrenaline_boost/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
+ SIGNAL_HANDLER
+
+ if(charge_boost(attacking_item, user))
+ return COMPONENT_NO_AFTERATTACK
+ return NONE
+
+/obj/item/mod/module/adrenaline_boost/proc/charge_boost(obj/item/attacking_item, mob/user)
+ if(!attacking_item.is_open_container())
+ return FALSE
+ if(reagents.has_reagent(reagent_required, reagent_required_amount))
+ balloon_alert(mod.wearer, "already charged!")
+ return FALSE
+ if(!attacking_item.reagents.trans_id_to(src, reagent_required, reagent_required_amount))
+ return FALSE
+ balloon_alert(mod.wearer, "charge [reagents.has_reagent(reagent_required, reagent_required_amount) ? "fully" : "partially"] reloaded")
+ return TRUE
+
+/obj/item/mod/module/adrenaline_boost/proc/boost_aftereffects(mob/affected_mob)
+ if(!affected_mob)
+ return
+ reagents.trans_to(affected_mob, reagents.total_volume)
+ to_chat(affected_mob, span_danger("You are beginning to feel the after-effect of the injection."))
diff --git a/code/modules/mod/modules/modules_science.dm b/code/modules/mod/modules/modules_science.dm
new file mode 100644
index 00000000000..02025ea1b42
--- /dev/null
+++ b/code/modules/mod/modules/modules_science.dm
@@ -0,0 +1,132 @@
+//Science modules for MODsuits
+
+///Reagent Scanner - Lets the user scan reagents.
+/obj/item/mod/module/reagent_scanner
+ name = "MOD reagent scanner module"
+ desc = "A module based off research-oriented Nanotrasen HUDs, this is capable of scanning the contents of \
+ containers and projecting the information in an easy-to-read format on the wearer's display. \
+ It cannot detect flavors, so that's up to you."
+ icon_state = "scanner"
+ module_type = MODULE_TOGGLE
+ complexity = 1
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.2
+ incompatible_modules = list(/obj/item/mod/module/reagent_scanner)
+ cooldown_time = 0.5 SECONDS
+
+/obj/item/mod/module/reagent_scanner/on_activation()
+ . = ..()
+ if(!.)
+ return
+ mod.helmet.clothing_flags |= SCAN_REAGENTS
+
+/obj/item/mod/module/reagent_scanner/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ mod.helmet.clothing_flags &= ~SCAN_REAGENTS
+
+/obj/item/mod/module/reagent_scanner/advanced
+ name = "MOD advanced reagent scanner module"
+ complexity = 0
+ removable = FALSE
+ var/explosion_detection_dist = 21
+
+/obj/item/mod/module/reagent_scanner/advanced/on_activation()
+ . = ..()
+ if(!.)
+ return
+ mod.helmet.clothing_flags |= SCAN_REAGENTS
+ RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion))
+
+/obj/item/mod/module/reagent_scanner/advanced/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ mod.helmet.clothing_flags |= SCAN_REAGENTS
+ UnregisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION)
+
+/obj/item/mod/module/reagent_scanner/advanced/proc/sense_explosion(datum/source, turf/epicenter,
+ devastation_range, heavy_impact_range, light_impact_range, took, orig_dev_range, orig_heavy_range, orig_light_range)
+ SIGNAL_HANDLER
+ var/turf/wearer_turf = get_turf(mod.wearer)
+ if(wearer_turf.z != epicenter.z)
+ return
+ if(get_dist(epicenter, wearer_turf) > explosion_detection_dist)
+ return
+ to_chat(mod.wearer, span_notice("Explosion detected! Epicenter: [devastation_range], Outer: [heavy_impact_range], Shock: [light_impact_range]"))
+
+///Anti-Gravity - Makes the user weightless.
+/obj/item/mod/module/anomaly_locked/antigrav
+ name = "MOD anti-gravity module"
+ desc = "A module that uses a gravitational core to make the user completely weightless."
+ icon_state = "antigrav"
+ module_type = MODULE_TOGGLE
+ complexity = 3
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.7
+ incompatible_modules = list(/obj/item/mod/module/anomaly_locked)
+ cooldown_time = 0.5 SECONDS
+ accepted_anomalies = list(/obj/item/assembly/signaler/anomaly/grav)
+
+/obj/item/mod/module/anomaly_locked/antigrav/on_activation()
+ . = ..()
+ if(!.)
+ return
+ if(mod.wearer.has_gravity())
+ new /obj/effect/temp_visual/mook_dust(get_turf(src))
+ mod.wearer.AddElement(/datum/element/forced_gravity, 0)
+ mod.wearer.update_gravity(mod.wearer.has_gravity())
+ playsound(src, 'sound/effects/gravhit.ogg', 50)
+
+/obj/item/mod/module/anomaly_locked/antigrav/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ mod.wearer.RemoveElement(/datum/element/forced_gravity, 0)
+ mod.wearer.update_gravity(mod.wearer.has_gravity())
+ if(deleting)
+ return
+ if(mod.wearer.has_gravity())
+ new /obj/effect/temp_visual/mook_dust(get_turf(src))
+ playsound(src, 'sound/effects/gravhit.ogg', 50)
+
+/obj/item/mod/module/anomaly_locked/antigrav/prebuilt
+ prebuilt = TRUE
+
+///Teleporter - Lets the user teleport to a nearby location.
+/obj/item/mod/module/anomaly_locked/teleporter
+ name = "MOD teleporter module"
+ desc = "A module that uses a bluespace core to let the user transport their particles elsewhere."
+ icon_state = "teleporter"
+ module_type = MODULE_ACTIVE
+ complexity = 3
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 5
+ cooldown_time = 5 SECONDS
+ accepted_anomalies = list(/obj/item/assembly/signaler/anomaly/bluespace)
+ /// Time it takes to teleport
+ var/teleport_time = 3 SECONDS
+
+/obj/item/mod/module/anomaly_locked/teleporter/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ var/turf/open/target_turf = get_turf(target)
+ if(!istype(target_turf) || target_turf.is_blocked_turf() || !(target_turf in view(mod.wearer)))
+ balloon_alert(mod.wearer, "invalid target!")
+ return
+ balloon_alert(mod.wearer, "teleporting...")
+ var/matrix/pre_matrix = matrix()
+ pre_matrix.Scale(4, 0.25)
+ var/matrix/post_matrix = matrix()
+ post_matrix.Scale(0.25, 4)
+ animate(mod.wearer, teleport_time, color = COLOR_CYAN, transform = pre_matrix.Multiply(mod.wearer.transform), easing = SINE_EASING|EASE_OUT)
+ if(!do_after(mod.wearer, teleport_time, target = mod))
+ balloon_alert(mod.wearer, "interrupted!")
+ animate(mod.wearer, teleport_time*0.1, color = null, transform = post_matrix.Multiply(mod.wearer.transform), easing = SINE_EASING|EASE_OUT)
+ return
+ animate(mod.wearer, teleport_time*0.1, color = null, transform = post_matrix.Multiply(mod.wearer.transform), easing = SINE_EASING|EASE_OUT)
+ if(!do_teleport(mod.wearer, target_turf, asoundin = 'sound/effects/phasein.ogg'))
+ return
+ drain_power(use_power_cost)
+
+/obj/item/mod/module/anomaly_locked/teleporter/prebuilt
+ prebuilt = TRUE
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
new file mode 100644
index 00000000000..d3ac5384646
--- /dev/null
+++ b/code/modules/mod/modules/modules_security.dm
@@ -0,0 +1,136 @@
+//Security modules for MODsuits
+
+///Magnetic Harness - Automatically puts guns in your suit storage when you drop them.
+/obj/item/mod/module/magnetic_harness
+ name = "MOD magnetic harness module"
+ desc = "Based off old TerraGov harness kits, this magnetic harness automatically attaches dropped guns back to the wearer."
+ icon_state = "mag_harness"
+ complexity = 2
+ use_power_cost = DEFAULT_CHARGE_DRAIN
+ incompatible_modules = list(/obj/item/mod/module/magnetic_harness)
+ /// Time before we activate the magnet.
+ var/magnet_delay = 0.8 SECONDS
+ /// The typecache of all guns we allow.
+ var/static/list/guns_typecache
+ /// The guns already allowed by the modsuit chestplate.
+ var/list/already_allowed_guns = list()
+
+/obj/item/mod/module/magnetic_harness/Initialize(mapload)
+ . = ..()
+ if(!guns_typecache)
+ guns_typecache = typecacheof(list(/obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/gun/grenadelauncher, /obj/item/gun/chem, /obj/item/gun/syringe))
+
+/obj/item/mod/module/magnetic_harness/on_install()
+ already_allowed_guns = guns_typecache & mod.chestplate.allowed
+ mod.chestplate.allowed |= guns_typecache
+
+/obj/item/mod/module/magnetic_harness/on_uninstall(deleting = FALSE)
+ if(deleting)
+ return
+ mod.chestplate.allowed -= (guns_typecache - already_allowed_guns)
+
+/obj/item/mod/module/magnetic_harness/on_suit_activation()
+ RegisterSignal(mod.wearer, COMSIG_MOB_UNEQUIPPED_ITEM, PROC_REF(check_dropped_item))
+
+/obj/item/mod/module/magnetic_harness/on_suit_deactivation(deleting = FALSE)
+ UnregisterSignal(mod.wearer, COMSIG_MOB_UNEQUIPPED_ITEM)
+
+/obj/item/mod/module/magnetic_harness/proc/check_dropped_item(datum/source, obj/item/dropped_item, force, new_location)
+ SIGNAL_HANDLER
+
+ if(!is_type_in_typecache(dropped_item, guns_typecache))
+ return
+ if(new_location != get_turf(src))
+ return
+ addtimer(CALLBACK(src, PROC_REF(pick_up_item), dropped_item), magnet_delay)
+
+/obj/item/mod/module/magnetic_harness/proc/pick_up_item(obj/item/item)
+ if(!isturf(item.loc) || !item.Adjacent(mod.wearer))
+ return
+ if(!mod.wearer.equip_to_slot_if_possible(item, ITEM_SLOT_SUITSTORE, qdel_on_fail = FALSE, disable_warning = TRUE))
+ return
+ playsound(src, 'sound/items/modsuit/magnetic_harness.ogg', 50, TRUE)
+ balloon_alert(mod.wearer, "[item] reattached")
+ drain_power(use_power_cost)
+
+///Holster - Instantly holsters any not huge gun.
+/obj/item/mod/module/holster
+ name = "MOD holster module"
+ desc = "Based off typical storage compartments, this system allows the suit to holster a \
+ standard firearm across its surface and allow for extremely quick retrieval. \
+ While some users prefer the chest, others the forearm for quick deployment, \
+ some law enforcement prefer the holster to extend from the thigh."
+ icon_state = "holster"
+ module_type = MODULE_USABLE
+ complexity = 2
+ incompatible_modules = list(/obj/item/mod/module/holster)
+ cooldown_time = 0.5 SECONDS
+ allowed_inactive = TRUE
+ /// Gun we have holstered.
+ var/obj/item/gun/holstered
+
+/obj/item/mod/module/holster/on_use()
+ . = ..()
+ if(!.)
+ return
+ if(!holstered)
+ var/obj/item/gun/holding = mod.wearer.get_active_held_item()
+ if(!holding)
+ balloon_alert(mod.wearer, "nothing to holster!")
+ return
+ if(!istype(holding) || holding.w_class > WEIGHT_CLASS_BULKY)
+ balloon_alert(mod.wearer, "it doesn't fit!")
+ return
+ if(mod.wearer.transferItemToLoc(holding, src, force = FALSE, silent = TRUE))
+ holstered = holding
+ balloon_alert(mod.wearer, "weapon holstered")
+ playsound(src, 'sound/weapons/gun/revolver/empty.ogg', 100, TRUE)
+ else if(mod.wearer.put_in_active_hand(holstered, forced = FALSE, ignore_animation = TRUE))
+ balloon_alert(mod.wearer, "weapon drawn")
+ playsound(src, 'sound/weapons/gun/revolver/empty.ogg', 100, TRUE)
+ else
+ balloon_alert(mod.wearer, "holster full!")
+
+/obj/item/mod/module/holster/on_uninstall(deleting = FALSE)
+ if(holstered)
+ holstered.forceMove(drop_location())
+
+/obj/item/mod/module/holster/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(gone == holstered)
+ holstered = null
+
+/obj/item/mod/module/holster/Destroy()
+ QDEL_NULL(holstered)
+ return ..()
+
+///Megaphone - Lets you speak loud.
+/obj/item/mod/module/megaphone
+ name = "MOD megaphone module"
+ desc = "A microchip megaphone linked to a MODsuit, for very important purposes, like: loudness."
+ icon_state = "megaphone"
+ module_type = MODULE_TOGGLE
+ complexity = 1
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
+ incompatible_modules = list(/obj/item/mod/module/megaphone)
+ cooldown_time = 0.5 SECONDS
+ /// List of spans we add to the speaker.
+ var/list/voicespan = list(SPAN_COMMAND)
+
+/obj/item/mod/module/megaphone/on_activation()
+ . = ..()
+ if(!.)
+ return
+ RegisterSignal(mod.wearer, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+
+/obj/item/mod/module/megaphone/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ UnregisterSignal(mod.wearer, COMSIG_MOB_SAY)
+
+/obj/item/mod/module/megaphone/proc/handle_speech(datum/source, list/speech_args)
+ SIGNAL_HANDLER
+
+ speech_args[SPEECH_SPANS] |= voicespan
+ drain_power(use_power_cost)
diff --git a/code/modules/mod/modules/modules_service.dm b/code/modules/mod/modules/modules_service.dm
new file mode 100644
index 00000000000..e983bbc3dbc
--- /dev/null
+++ b/code/modules/mod/modules/modules_service.dm
@@ -0,0 +1,56 @@
+//Service modules for MODsuits
+
+///Bike Horn - Plays a bike horn sound.
+/obj/item/mod/module/bikehorn
+ name = "MOD bike horn module"
+ desc = "A shoulder-mounted piece of heavy sonic artillery, this module uses the finest femto-manipulator technology to \
+ precisely deliver an almost lethal squeeze to... a bike horn, producing a significantly memorable sound."
+ icon_state = "bikehorn"
+ module_type = MODULE_USABLE
+ complexity = 1
+ use_power_cost = DEFAULT_CHARGE_DRAIN
+ incompatible_modules = list(/obj/item/mod/module/bikehorn)
+ cooldown_time = 1 SECONDS
+
+/obj/item/mod/module/bikehorn/on_use()
+ . = ..()
+ if(!.)
+ return
+ playsound(src, 'sound/items/bikehorn.ogg', 100, FALSE)
+ drain_power(use_power_cost)
+
+///Microwave Beam - Microwaves items instantly.
+/obj/item/mod/module/microwave_beam
+ name = "MOD microwave beam module"
+ desc = "An oddly domestic device, this module is installed into the user's palm, \
+ hooking up with culinary scanners located in the helmet to blast food with precise microwave radiation, \
+ allowing them to cook food from a distance, with the greatest of ease. Not recommended for use against grapes."
+ icon_state = "microwave_beam"
+ module_type = MODULE_ACTIVE
+ complexity = 2
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 5
+ incompatible_modules = list(/obj/item/mod/module/microwave_beam)
+ cooldown_time = 10 SECONDS
+
+/obj/item/mod/module/microwave_beam/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ if(!istype(target, /obj/item))
+ return
+ if(!isturf(target.loc))
+ balloon_alert(mod.wearer, "must be on the floor!")
+ return
+ var/obj/item/microwave_target = target
+ var/datum/effect_system/spark_spread/spark_effect = new()
+ spark_effect.set_up(2, 1, mod.wearer)
+ spark_effect.start()
+ mod.wearer.Beam(target,icon_state="lightning[rand(1,12)]", time = 5)
+ if(microwave_target.microwave_act())
+ playsound(src, 'sound/machines/microwave/microwave-end.ogg', 50, FALSE)
+ else
+ balloon_alert(mod.wearer, "can't be microwaved!")
+ var/datum/effect_system/spark_spread/spark_effect_two = new()
+ spark_effect_two.set_up(2, 1, microwave_target)
+ spark_effect_two.start()
+ drain_power(use_power_cost)
diff --git a/code/modules/mod/modules/modules_storage.dm b/code/modules/mod/modules/modules_storage.dm
new file mode 100644
index 00000000000..25caad6806f
--- /dev/null
+++ b/code/modules/mod/modules/modules_storage.dm
@@ -0,0 +1,60 @@
+/obj/item/mod/module/storage
+ name = "MOD storage module"
+ desc = "What amounts to a series of integrated storage compartments and specialized pockets installed across \
+ the surface of the suit, useful for storing various bits, and or bobs."
+ icon_state = "storage"
+ complexity = 3
+ incompatible_modules = list(/obj/item/mod/module/storage)
+ var/datum/component/storage/concrete/storage
+ var/max_w_class = WEIGHT_CLASS_NORMAL
+ var/max_combined_w_class = 15
+ var/max_items = 7
+
+/obj/item/mod/module/storage/Initialize(mapload)
+ . = ..()
+ storage = AddComponent(/datum/component/storage/concrete)
+ storage.max_w_class = max_w_class
+ storage.max_combined_w_class = max_combined_w_class
+ storage.max_items = max_items
+ storage.allow_big_nesting = TRUE
+ SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SET_LOCKSTATE, TRUE)
+
+/obj/item/mod/module/storage/on_install()
+ var/datum/component/storage/modstorage = mod.AddComponent(/datum/component/storage, storage)
+ modstorage.max_w_class = max_w_class
+ modstorage.max_combined_w_class = max_combined_w_class
+ modstorage.max_items = max_items
+ SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SET_LOCKSTATE, FALSE)
+
+/obj/item/mod/module/storage/on_uninstall(deleting = FALSE)
+ var/datum/component/storage/modstorage = mod.GetComponent(/datum/component/storage)
+ storage.slaves -= modstorage
+ qdel(modstorage)
+ SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SET_LOCKSTATE, TRUE)
+
+/obj/item/mod/module/storage/large_capacity
+ name = "MOD expanded storage module"
+ desc = "Reverse engineered by Nakamura Engineering from Donk Corporation designs, this system of hidden compartments \
+ is entirely within the suit, distributing items and weight evenly to ensure a comfortable experience for the user; \
+ whether smuggling, or simply hauling."
+ icon_state = "storage_large"
+ max_combined_w_class = 21
+ max_items = 14
+
+/obj/item/mod/module/storage/syndicate
+ name = "MOD syndicate storage module"
+ desc = "A storage system using nanotechnology developed by Cybersun Industries, these compartments use \
+ esoteric technology to compress the physical matter of items put inside of them, \
+ essentially shrinking items for much easier and more portable storage."
+ icon_state = "storage_syndi"
+ max_combined_w_class = 30
+ max_items = 21
+
+/obj/item/mod/module/storage/bluespace
+ name = "MOD bluespace storage module"
+ desc = "A storage system developed by Nanotrasen, these compartments employ \
+ miniaturized bluespace pockets for the ultimate in storage technology; regardless of the weight of objects put inside."
+ icon_state = "storage_large"
+ max_w_class = WEIGHT_CLASS_GIGANTIC
+ max_combined_w_class = 60
+ max_items = 21
diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm
new file mode 100644
index 00000000000..04f0aaf73ad
--- /dev/null
+++ b/code/modules/mod/modules/modules_supply.dm
@@ -0,0 +1,306 @@
+//Supply modules for MODsuits
+
+///Internal GPS - Extends a GPS you can use.
+/obj/item/mod/module/gps
+ name = "MOD internal GPS module"
+ desc = "This module uses common Nanotrasen technology to calculate the user's position anywhere in space, \
+ down to the exact coordinates. This information is fed to a central database viewable from the device itself, \
+ though using it to help people is up to you."
+ icon_state = "gps"
+ module_type = MODULE_USABLE
+ complexity = 1
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 0.2
+ incompatible_modules = list(/obj/item/mod/module/gps)
+ cooldown_time = 0.5 SECONDS
+ allowed_inactive = TRUE
+
+/obj/item/mod/module/gps/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/gps/item, "MOD0")
+
+/obj/item/mod/module/gps/on_use()
+ . = ..()
+ if(!.)
+ return
+ attack_self(mod.wearer)
+
+///Hydraulic Clamp - Lets you pick up and drop crates.
+/obj/item/mod/module/clamp
+ name = "MOD hydraulic clamp module"
+ desc = "A series of actuators installed into both arms of the suit, boasting a lifting capacity of almost a ton. \
+ However, this design has been locked by Nanotrasen to be primarily utilized for lifting various crates. \
+ A lot of people would say that loading cargo is a dull job, but you could not disagree more."
+ icon_state = "clamp"
+ module_type = MODULE_ACTIVE
+ complexity = 3
+ use_power_cost = DEFAULT_CHARGE_DRAIN
+ incompatible_modules = list(/obj/item/mod/module/clamp)
+ cooldown_time = 0.5 SECONDS
+ overlay_state_inactive = "module_clamp"
+ overlay_state_active = "module_clamp_on"
+ /// Time it takes to load a crate.
+ var/load_time = 3 SECONDS
+ /// The max amount of crates you can carry.
+ var/max_crates = 3
+ /// The crates stored in the module.
+ var/list/stored_crates = list()
+
+/obj/item/mod/module/clamp/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ if(!mod.wearer.Adjacent(target))
+ return
+ if(istype(target, /obj/structure/closet/crate))// || istype(target, /obj/item/delivery/big))
+ var/atom/movable/picked_crate = target
+ if(!check_crate_pickup(picked_crate))
+ return
+ playsound(src, 'sound/mecha/hydraulic.ogg', 25, TRUE)
+ if(!do_after(mod.wearer, load_time, target = target))
+ balloon_alert(mod.wearer, "interrupted!")
+ return
+ if(!check_crate_pickup(picked_crate))
+ return
+ stored_crates += picked_crate
+ picked_crate.forceMove(src)
+ balloon_alert(mod.wearer, "picked up [picked_crate]")
+ drain_power(use_power_cost)
+ mod.wearer.update_inv_back()
+ else if(length(stored_crates))
+ var/turf/target_turf = get_turf(target)
+ if(target_turf.is_blocked_turf())
+ return
+ playsound(src, 'sound/mecha/hydraulic.ogg', 25, TRUE)
+ if(!do_after(mod.wearer, load_time, target = target))
+ balloon_alert(mod.wearer, "interrupted!")
+ return
+ if(target_turf.is_blocked_turf())
+ return
+ var/atom/movable/dropped_crate = pop(stored_crates)
+ dropped_crate.forceMove(target_turf)
+ balloon_alert(mod.wearer, "dropped [dropped_crate]")
+ drain_power(use_power_cost)
+ mod.wearer.update_inv_back()
+ else
+ balloon_alert(mod.wearer, "invalid target!")
+
+/obj/item/mod/module/clamp/on_suit_deactivation(deleting = FALSE)
+ if(deleting)
+ return
+ for(var/atom/movable/crate as anything in stored_crates)
+ crate.forceMove(drop_location())
+ stored_crates -= crate
+
+/obj/item/mod/module/clamp/proc/check_crate_pickup(atom/movable/target)
+ if(length(stored_crates) >= max_crates)
+ balloon_alert(mod.wearer, "too many crates!")
+ return FALSE
+ for(var/mob/living/mob in target.get_all_contents())
+ if(mob.mob_size < MOB_SIZE_HUMAN)
+ continue
+ balloon_alert(mod.wearer, "crate too heavy!")
+ return FALSE
+ return TRUE
+
+/obj/item/mod/module/clamp/loader
+ name = "MOD loader hydraulic clamp module"
+ icon_state = "clamp_loader"
+ complexity = 0
+ removable = FALSE
+ overlay_state_inactive = null
+ overlay_state_active = "module_clamp_loader"
+ load_time = 1 SECONDS
+ max_crates = 5
+ use_mod_colors = TRUE
+
+///Drill - Lets you dig through rock and basalt.
+/obj/item/mod/module/drill
+ name = "MOD drill module"
+ desc = "An integrated drill, typically extending over the user's hand. While useful for drilling through rock, \
+ your drill is surely the one that both pierces and creates the heavens."
+ icon_state = "drill"
+ module_type = MODULE_ACTIVE
+ complexity = 2
+ use_power_cost = DEFAULT_CHARGE_DRAIN
+ incompatible_modules = list(/obj/item/mod/module/drill)
+ cooldown_time = 0.5 SECONDS
+ overlay_state_active = "module_drill"
+
+/obj/item/mod/module/drill/on_activation()
+ . = ..()
+ if(!.)
+ return
+ RegisterSignal(mod.wearer, COMSIG_MOVABLE_BUMP, PROC_REF(bump_mine))
+
+/obj/item/mod/module/drill/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ UnregisterSignal(mod.wearer, COMSIG_MOVABLE_BUMP)
+
+/obj/item/mod/module/drill/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ if(!mod.wearer.Adjacent(target))
+ return
+ if(istype(target, /turf/closed/mineral))
+ var/turf/closed/mineral/mineral_turf = target
+ mineral_turf.gets_drilled(mod.wearer)
+ drain_power(use_power_cost)
+ else if(istype(target, /turf/open/floor/plating/asteroid))
+ var/turf/open/floor/plating/asteroid/sand_turf = target
+ if(!sand_turf.can_dig(mod.wearer))
+ return
+ sand_turf.getDug()
+ drain_power(use_power_cost)
+
+/obj/item/mod/module/drill/proc/bump_mine(mob/living/carbon/human/bumper, atom/bumped_into, proximity)
+ SIGNAL_HANDLER
+ if(!istype(bumped_into, /turf/closed/mineral) || !drain_power(use_power_cost))
+ return
+ var/turf/closed/mineral/mineral_turf = bumped_into
+ mineral_turf.gets_drilled(mod.wearer)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+///Ore Bag - Lets you pick up ores and drop them from the suit.
+/obj/item/mod/module/orebag
+ name = "MOD ore bag module"
+ desc = "An integrated ore storage system installed into the suit, \
+ this utilizes precise electromagnets and storage compartments to automatically collect and deposit ore. \
+ It's recommended by Nakamura Engineering to actually deposit that ore at local refineries."
+ icon_state = "ore"
+ module_type = MODULE_USABLE
+ complexity = 1
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 0.2
+ incompatible_modules = list(/obj/item/mod/module/orebag)
+ cooldown_time = 0.5 SECONDS
+ allowed_inactive = TRUE
+ /// The ores stored in the bag.
+ var/list/ores = list()
+
+/obj/item/mod/module/orebag/on_equip()
+ RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(ore_pickup))
+
+/obj/item/mod/module/orebag/on_unequip()
+ UnregisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED)
+
+/obj/item/mod/module/orebag/proc/ore_pickup(atom/movable/source, atom/old_loc, dir, forced)
+ SIGNAL_HANDLER
+
+ for(var/obj/item/stack/ore/ore in get_turf(mod.wearer))
+ INVOKE_ASYNC(src, PROC_REF(move_ore), ore)
+ playsound(src, SFX_RUSTLE, 50, TRUE)
+
+/obj/item/mod/module/orebag/proc/move_ore(obj/item/stack/ore)
+ for(var/obj/item/stack/stored_ore as anything in ores)
+ if(!ore.can_merge(stored_ore))
+ continue
+ ore.merge(stored_ore)
+ if(QDELETED(ore))
+ return
+ break
+ ore.forceMove(src)
+ ores += ore
+
+/obj/item/mod/module/orebag/on_use()
+ . = ..()
+ if(!.)
+ return
+ for(var/obj/item/ore as anything in ores)
+ ore.forceMove(drop_location())
+ ores -= ore
+ drain_power(use_power_cost)
+
+/obj/item/mod/module/disposal_connector
+ name = "MOD disposal selector module"
+ desc = "A module that connects to the disposal pipeline, causing the user to go into their config selected disposal. \
+ Only seems to work when the suit is on."
+ icon_state = "disposal"
+ complexity = 2
+ idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ incompatible_modules = list(/obj/item/mod/module/disposal_connector)
+ var/disposal_tag = NONE
+
+/obj/item/mod/module/disposal_connector/Initialize(mapload)
+ . = ..()
+ disposal_tag = pick(GLOB.TAGGERLOCATIONS)
+
+/obj/item/mod/module/disposal_connector/on_suit_activation()
+ RegisterSignal(mod.wearer, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling))
+
+/obj/item/mod/module/disposal_connector/on_suit_deactivation(deleting = FALSE)
+ UnregisterSignal(mod.wearer, COMSIG_MOVABLE_DISPOSING)
+
+/obj/item/mod/module/disposal_connector/get_configuration()
+ . = ..()
+ .["disposal_tag"] = add_ui_configuration("Disposal Tag", "list", GLOB.TAGGERLOCATIONS[disposal_tag], GLOB.TAGGERLOCATIONS)
+
+/obj/item/mod/module/disposal_connector/configure_edit(key, value)
+ switch(key)
+ if("disposal_tag")
+ for(var/tag in 1 to length(GLOB.TAGGERLOCATIONS))
+ if(GLOB.TAGGERLOCATIONS[tag] == value)
+ disposal_tag = tag
+ break
+
+/obj/item/mod/module/disposal_connector/proc/disposal_handling(datum/disposal_source, obj/structure/disposalholder/disposal_holder, obj/machinery/disposal/disposal_machine, hasmob)
+ SIGNAL_HANDLER
+
+ disposal_holder.destinationTag = disposal_tag
+
+/obj/item/mod/module/magnet
+ name = "MOD loader hydraulic magnet module"
+ desc = "A powerful hydraulic electromagnet able to launch crates and lockers towards the user, and keep 'em attached."
+ icon_state = "magnet_loader"
+ module_type = MODULE_ACTIVE
+ removable = FALSE
+ use_power_cost = DEFAULT_CHARGE_DRAIN*3
+ incompatible_modules = list(/obj/item/mod/module/magnet)
+ cooldown_time = 1.5 SECONDS
+ overlay_state_active = "module_magnet"
+ use_mod_colors = TRUE
+
+/obj/item/mod/module/magnet/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ if(istype(mod.wearer.pulling, /obj/structure/closet))
+ var/obj/structure/closet/locker = mod.wearer.pulling
+ playsound(locker, 'sound/effects/gravhit.ogg', 75, TRUE)
+ locker.forceMove(mod.wearer.loc)
+ locker.throw_at(target, range = 7, speed = 4, thrower = mod.wearer)
+ return
+ if(!istype(target, /obj/structure/closet) || !(target in view(mod.wearer)))
+ balloon_alert(mod.wearer, "invalid target!")
+ return
+ var/obj/structure/closet/locker = target
+ if(locker.anchored || locker.move_resist >= MOVE_FORCE_OVERPOWERING)
+ balloon_alert(mod.wearer, "target anchored!")
+ return
+ new /obj/effect/temp_visual/mook_dust(get_turf(locker))
+ playsound(locker, 'sound/effects/gravhit.ogg', 75, TRUE)
+ locker.throw_at(mod.wearer, range = 7, speed = 3, force = MOVE_FORCE_WEAK, \
+ callback = CALLBACK(src, PROC_REF(check_locker), locker))
+
+/obj/item/mod/module/magnet/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ if(istype(mod.wearer.pulling, /obj/structure/closet))
+ mod.wearer.stop_pulling()
+
+/obj/item/mod/module/magnet/proc/check_locker(obj/structure/closet/locker)
+ if(!mod?.wearer)
+ return
+ if(!locker.Adjacent(mod.wearer) || !isturf(locker.loc) || !isturf(mod.wearer.loc))
+ return
+ mod.wearer.start_pulling(locker)
+ //locker.strong_grab = TRUE
+ RegisterSignal(locker, COMSIG_ATOM_NO_LONGER_PULLED, PROC_REF(on_stop_pull))
+
+/obj/item/mod/module/magnet/proc/on_stop_pull(obj/structure/closet/locker, atom/movable/last_puller)
+ SIGNAL_HANDLER
+
+ //locker.strong_grab = FALSE
+ UnregisterSignal(locker, COMSIG_ATOM_NO_LONGER_PULLED)
diff --git a/code/modules/mod/modules/modules_visor.dm b/code/modules/mod/modules/modules_visor.dm
new file mode 100644
index 00000000000..e1516c2aa0a
--- /dev/null
+++ b/code/modules/mod/modules/modules_visor.dm
@@ -0,0 +1,85 @@
+//Visor modules for MODsuits
+
+///Base Visor - Adds a specific HUD and traits to you.
+/obj/item/mod/module/visor
+ name = "MOD visor module"
+ desc = "A heads-up display installed into the visor of the suit. They say these also let you see behind you."
+ module_type = MODULE_TOGGLE
+ complexity = 2
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 0.3
+ incompatible_modules = list(/obj/item/mod/module/visor)
+ cooldown_time = 0.5 SECONDS
+ /// The HUD type given by the visor.
+ var/hud_type
+ /// The traits given by the visor.
+ var/list/visor_traits = list()
+
+/obj/item/mod/module/visor/on_activation()
+ . = ..()
+ if(!.)
+ return
+ if(hud_type)
+ var/datum/atom_hud/hud = GLOB.huds[hud_type]
+ hud.add_hud_to(mod.wearer)
+ for(var/trait in visor_traits)
+ ADD_TRAIT(mod.wearer, trait, MOD_TRAIT)
+ mod.wearer.update_sight()
+
+/obj/item/mod/module/visor/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ if(hud_type)
+ var/datum/atom_hud/hud = GLOB.huds[hud_type]
+ hud.remove_hud_from(mod.wearer)
+ for(var/trait in visor_traits)
+ REMOVE_TRAIT(mod.wearer, trait, MOD_TRAIT)
+ mod.wearer.update_sight()
+
+//Medical Visor - Gives you a medical HUD.
+/obj/item/mod/module/visor/medhud
+ name = "MOD medical visor module"
+ desc = "A heads-up display installed into the visor of the suit. This cross-references suit sensor data with a modern \
+ biological scanning suite, allowing the user to visualize the current health of organic lifeforms, as well as \
+ access data such as patient files in a convenient readout. They say these also let you see behind you."
+ icon_state = "medhud_visor"
+ hud_type = DATA_HUD_MEDICAL_ADVANCED
+ visor_traits = list(TRAIT_MEDICAL_HUD)
+
+//Diagnostic Visor - Gives you a diagnostic HUD.
+/obj/item/mod/module/visor/diaghud
+ name = "MOD diagnostic visor module"
+ desc = "A heads-up display installed into the visor of the suit. This uses a series of advanced sensors to access data \
+ from advanced machinery, exosuits, and other devices, allowing the user to visualize current power levels \
+ and integrity of such. They say these also let you see behind you."
+ icon_state = "diaghud_visor"
+ hud_type = DATA_HUD_DIAGNOSTIC_ADVANCED
+ visor_traits = list(TRAIT_DIAGNOSTIC_HUD)
+
+//Security Visor - Gives you a security HUD.
+/obj/item/mod/module/visor/sechud
+ name = "MOD security visor module"
+ desc = "A heads-up display installed into the visor of the suit. This module is a heavily-retrofitted targeting system, \
+ plugged into various criminal databases to be able to view arrest records, command simple security-oriented robots, \
+ and generally know who to shoot. They say these also let you see behind you."
+ icon_state = "sechud_visor"
+ hud_type = DATA_HUD_SECURITY_ADVANCED
+ visor_traits = list(TRAIT_SECURITY_HUD)
+
+//Meson Visor - Gives you meson vision.
+/obj/item/mod/module/visor/meson
+ name = "MOD meson visor module"
+ desc = "A heads-up display installed into the visor of the suit. This module is based off well-loved meson scanner \
+ technology, used by construction workers and miners across the galaxy to see basic structural and terrain layouts \
+ through walls, regardless of lighting conditions. They say these also let you see behind you."
+ icon_state = "meson_visor"
+ visor_traits = list(SEE_TURFS)
+
+//Thermal Visor - Gives you thermal vision.
+/obj/item/mod/module/visor/thermal
+ name = "MOD thermal visor module"
+ desc = "A heads-up display installed into the visor of the suit. This uses a small IR scanner to detect and identify \
+ the thermal radiation output of objects near the user. While it can detect the heat output of even something as \
+ small as a rodent, it still produces irritating red overlay. They say these also let you see behind you."
+ icon_state = "thermal_visor"
+ visor_traits = list(SEE_MOBS)
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 9697cce45df..9fd6fae027b 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -6,11 +6,16 @@
desc = "A small portable microcomputer."
icon = 'icons/obj/machines/computer.dmi'
icon_state = "laptop"
- light_on = FALSE
integrity_failure = 0.5
max_integrity = 100
armor = list("melee" = 0, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
+ light_system = MOVABLE_LIGHT_DIRECTIONAL
+ light_range = 2.3
+ light_power = 0.6
+ light_color = "#FFFFFF"
+ light_on = FALSE
+
var/enabled = 0 // Whether the computer is turned on.
var/screen_on = 1 // Whether the computer is active/opened/it's screen is on.
var/device_theme = "ntos" // Sets the theme for the main menu, hardware config, and file browser apps. Overridden by certain non-NT devices.
@@ -43,9 +48,9 @@
var/list/idle_threads // Idle programs on background. They still receive process calls but can't be interacted with.
var/obj/physical = null // Object that represents our computer. It's used for Adjacent() and UI visibility checks.
- var/has_light = FALSE //If the computer has a flashlight/LED light/what-have-you installed
- var/comp_light_luminosity = 3 //The brightness of that light
- var/comp_light_color //The color of that light
+
+ /// If the computer has a flashlight/LED light/what-have-you installed
+ var/has_light = FALSE
/obj/item/modular_computer/Initialize()
@@ -53,7 +58,6 @@
START_PROCESSING(SSobj, src)
if(!physical)
physical = src
- comp_light_color = "#FFFFFF"
idle_threads = list()
update_appearance()
diff --git a/code/modules/modular_computers/computers/item/computer_ui.dm b/code/modules/modular_computers/computers/item/computer_ui.dm
index 4729117052b..bc44d93583d 100644
--- a/code/modules/modular_computers/computers/item/computer_ui.dm
+++ b/code/modules/modular_computers/computers/item/computer_ui.dm
@@ -81,7 +81,7 @@
data["has_light"] = has_light
data["light_on"] = light_on
- data["comp_light_color"] = comp_light_color
+ data["comp_light_color"] = light_color
return data
@@ -166,14 +166,14 @@
return 1
if("PC_toggle_light")
+ if(!has_light)
+ return FALSE
set_light_on(!light_on)
- if(light_on)
- set_light(comp_light_luminosity, 1, comp_light_color)
- else
- set_light(0)
return TRUE
if("PC_light_color")
+ if(!has_light)
+ return FALSE
var/mob/user = usr
var/new_color
while(!new_color)
@@ -183,9 +183,7 @@
if(color_hex2num(new_color) < 200) //Colors too dark are rejected
to_chat(user, "That color is too dark! Choose a lighter one.")
new_color = null
- comp_light_color = new_color
set_light_color(new_color)
- update_light()
return TRUE
if("PC_Eject_Disk")
diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm
index f7a518d3568..2e7ce89d33b 100644
--- a/code/modules/modular_computers/computers/item/laptop.dm
+++ b/code/modules/modular_computers/computers/item/laptop.dm
@@ -112,7 +112,10 @@
display_overlays = screen_on
update_appearance()
-
+/obj/item/modular_computer/laptop/examine_more(mob/user)
+ if(screen_on)
+ interact(user)
+ return ..()
// Laptop frame, starts empty and closed.
/obj/item/modular_computer/laptop/buildable
diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm
index 9931e70ca1b..2ff0f33a79e 100644
--- a/code/modules/modular_computers/computers/item/tablet.dm
+++ b/code/modules/modular_computers/computers/item/tablet.dm
@@ -12,7 +12,6 @@
steel_sheet_cost = 1
slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT
has_light = TRUE //LED flashlight!
- comp_light_luminosity = 2.3 //Same as the PDA
custom_materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) // WS Edit - Item Materials
var/has_variants = TRUE
var/finish_color = null
@@ -33,13 +32,13 @@
icon_state_menu = "assign"
w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT
- comp_light_luminosity = 6.3
+ light_range = 6.3
has_variants = FALSE
/// Given to Nuke Ops members.
/obj/item/modular_computer/tablet/nukeops
icon_state = "tablet-syndicate"
- comp_light_luminosity = 6.3
+ light_range = 6.3
has_variants = FALSE
device_theme = "syndicate"
light_color = COLOR_RED
@@ -61,7 +60,6 @@
icon_state_unpowered = "tablet-silicon"
base_icon_state = "tablet-silicon"
has_light = FALSE //tablet light button actually enables/disables the borg lamp
- comp_light_luminosity = 0
has_variants = FALSE
///Ref to the borg we're installed in. Set by the borg during our creation.
var/mob/living/silicon/robot/borgo
diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm
index b7f1a2f5d91..e8a3b6e1852 100644
--- a/code/modules/modular_computers/computers/machinery/modular_computer.dm
+++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm
@@ -85,6 +85,10 @@
else
return ..()
+/obj/machinery/modular_computer/examine_more(mob/user)
+ interact(user)
+ return ..()
+
// Process currently calls handle_power(), may be expanded in future if more things are added.
/obj/machinery/modular_computer/process()
if(cpu)
diff --git a/code/modules/modular_computers/file_system/programs/radar.dm b/code/modules/modular_computers/file_system/programs/radar.dm
index d082503a012..06324b8f8b7 100644
--- a/code/modules/modular_computers/file_system/programs/radar.dm
+++ b/code/modules/modular_computers/file_system/programs/radar.dm
@@ -156,7 +156,7 @@
*something like "mob_209". In order to find the actual atom, we need
*to search the appropriate list for the REF string. This is dependant
*on the program (Lifeline uses GLOB.human_list, while Fission360 uses
- *GLOB.poi_list), but the result will be the same; evaluate the string and
+ *SSpoints_of_interest.other_points_of_interest), but the result will be the same; evaluate the string and
*return an atom reference.
*/
/datum/computer_file/program/radar/proc/find_atom()
@@ -269,7 +269,7 @@
pointercolor = "red"
/datum/computer_file/program/radar/fission360/find_atom()
- return locate(selected) in GLOB.poi_list
+ return locate(selected) in SSpoints_of_interest.other_points_of_interest
/datum/computer_file/program/radar/fission360/scan()
if(world.time < next_scan)
@@ -286,7 +286,7 @@
name = nuke.name,
)
objects += list(nukeinfo)
- var/obj/item/disk/nuclear/disk = locate() in GLOB.poi_list
+ var/obj/item/disk/nuclear/disk = locate() in SSpoints_of_interest.other_points_of_interest
if(trackable(disk))
var/list/nukeinfo = list(
ref = REF(disk),
diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm
index b1ec3d3edc1..5ad3a674e33 100644
--- a/code/modules/modular_computers/laptop_vendor.dm
+++ b/code/modules/modular_computers/laptop_vendor.dm
@@ -254,7 +254,7 @@
var/obj/item/card/bank/ID = I
var/datum/bank_account/account = ID.registered_account
var/target_credits = total_price - credits
- if(!account.adjust_money(-target_credits, "laptop_vendor"))
+ if(!account.adjust_money(-target_credits, CREDIT_LOG_VENDOR_PURCHASE))
say("Insufficient credits on card to purchase!")
return
credits += target_credits
diff --git a/code/modules/movespeed/modifiers/items.dm b/code/modules/movespeed/modifiers/items.dm
index c858582af6a..4c967a58a7e 100644
--- a/code/modules/movespeed/modifiers/items.dm
+++ b/code/modules/movespeed/modifiers/items.dm
@@ -18,3 +18,5 @@
/datum/movespeed_modifier/berserk
multiplicative_slowdown = -0.2
+/datum/movespeed_modifier/sphere
+ multiplicative_slowdown = -0.5
diff --git a/code/modules/movespeed/modifiers/reagent.dm b/code/modules/movespeed/modifiers/reagent.dm
index ecf91d0760f..24108e6178d 100644
--- a/code/modules/movespeed/modifiers/reagent.dm
+++ b/code/modules/movespeed/modifiers/reagent.dm
@@ -38,4 +38,4 @@
multiplicative_slowdown = -0.45
/datum/movespeed_modifier/reagent/shock_wine
- multiplicative_slowdown = -0.40
+ multiplicative_slowdown = -0.30
diff --git a/code/modules/movespeed/modifiers/status_effects.dm b/code/modules/movespeed/modifiers/status_effects.dm
deleted file mode 100644
index 25cbcd42e12..00000000000
--- a/code/modules/movespeed/modifiers/status_effects.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-/datum/movespeed_modifier/status_effect/bloodchill
- multiplicative_slowdown = 3
-
-/datum/movespeed_modifier/status_effect/bonechill
- multiplicative_slowdown = 3
-
-/datum/movespeed_modifier/status_effect/lightpink
- multiplicative_slowdown = -0.25
- blacklisted_movetypes = (FLYING|FLOATING)
-
-/datum/movespeed_modifier/status_effect/tarfoot
- multiplicative_slowdown = 0.5
- blacklisted_movetypes = (FLYING|FLOATING)
-
-/datum/movespeed_modifier/status_effect/sepia
- variable = TRUE
- blacklisted_movetypes = (FLYING|FLOATING)
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index c00d32d2580..14392e1c087 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -1,37 +1,30 @@
-/obj/item/energy_katana
+/obj/item/melee/sword/energy_katana
name = "energy katana"
desc = "A katana infused with strong energy."
icon_state = "energy_katana"
item_state = "energy_katana"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
force = 40
throwforce = 20
block_chance = 50
armour_penetration = 50
- w_class = WEIGHT_CLASS_NORMAL
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
- sharpness = IS_SHARP
max_integrity = 200
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/datum/effect_system/spark_spread/spark_system
var/datum/action/innate/dash/ninja/jaunt
var/dash_toggled = TRUE
-/obj/item/energy_katana/Initialize()
+/obj/item/melee/sword/energy_katana/Initialize()
. = ..()
jaunt = new(src)
spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
-/obj/item/energy_katana/attack_self(mob/user)
+/obj/item/melee/sword/energy_katana/attack_self(mob/user)
dash_toggled = !dash_toggled
to_chat(user, "You [dash_toggled ? "enable" : "disable"] the dash function on [src].")
-/obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+/obj/item/melee/sword/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
if(dash_toggled)
jaunt.Teleport(user, target)
@@ -41,13 +34,13 @@
playsound(user, 'sound/weapons/blade1.ogg', 50, TRUE)
target.emag_act(user)
-/obj/item/energy_katana/pickup(mob/living/user)
+/obj/item/melee/sword/energy_katana/pickup(mob/living/user)
. = ..()
jaunt.Grant(user, src)
user.update_icons()
playsound(src, 'sound/items/unsheath.ogg', 25, TRUE)
-/obj/item/energy_katana/dropped(mob/user)
+/obj/item/melee/sword/energy_katana/dropped(mob/user)
. = ..()
jaunt?.Remove(user)
user.update_icons()
@@ -55,7 +48,7 @@
//If we hit the Ninja who owns this Katana, they catch it.
//Works for if the Ninja throws it or it throws itself or someone tries
//To throw it at the ninja
-/obj/item/energy_katana/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/melee/sword/energy_katana/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(ishuman(hit_atom))
var/mob/living/carbon/human/H = hit_atom
if(istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja))
@@ -66,7 +59,7 @@
..()
-/obj/item/energy_katana/proc/returnToOwner(mob/living/carbon/human/user, doSpark = 1, caught = 0)
+/obj/item/melee/sword/energy_katana/proc/returnToOwner(mob/living/carbon/human/user, doSpark = 1, caught = 0)
if(!istype(user))
return
forceMove(get_turf(user))
@@ -94,7 +87,7 @@
to_chat(user, "[msg]")
-/obj/item/energy_katana/Destroy()
+/obj/item/melee/sword/energy_katana/Destroy()
QDEL_NULL(spark_system)
QDEL_NULL(jaunt)
return ..()
diff --git a/code/modules/ninja/outfit.dm b/code/modules/ninja/outfit.dm
index 2b5976db4d5..1c3c24927bf 100644
--- a/code/modules/ninja/outfit.dm
+++ b/code/modules/ninja/outfit.dm
@@ -12,7 +12,7 @@
l_pocket = /obj/item/grenade/c4/x4
r_pocket = /obj/item/tank/internals/emergency_oxygen
internals_slot = ITEM_SLOT_RPOCKET
- belt = /obj/item/energy_katana
+ belt = /obj/item/melee/sword/energy_katana
implants = list(/obj/item/implant/explosive)
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index cb355014d4e..4f368b63049 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -26,7 +26,7 @@ Contents:
var/datum/effect_system/spark_spread/spark_system
var/datum/techweb/stored_research
var/obj/item/disk/tech_disk/t_disk//To copy design onto disk.
- var/obj/item/energy_katana/energyKatana //For teleporting the katana back to the ninja (It's an ability)
+ var/obj/item/melee/sword/energy_katana/energyKatana //For teleporting the katana back to the ninja (It's an ability)
//Other articles of ninja gear worn together, used to easily reference them after initializing.
var/obj/item/clothing/head/helmet/space/space_ninja/n_hood
diff --git a/code/modules/overmap/_overmap_datum.dm b/code/modules/overmap/_overmap_datum.dm
index 5244f285018..cd6f31f17c8 100644
--- a/code/modules/overmap/_overmap_datum.dm
+++ b/code/modules/overmap/_overmap_datum.dm
@@ -65,7 +65,7 @@
Initialize(arglist(args))
-/datum/overmap/Destroy(force, ...)
+/datum/overmap/Destroy(force)
SSovermap.overmap_objects -= src
if(current_docking_ticket)
QDEL_NULL(current_docking_ticket)
diff --git a/code/modules/overmap/docking_ticket.dm b/code/modules/overmap/docking_ticket.dm
index 4e646504324..c1ff60ae230 100644
--- a/code/modules/overmap/docking_ticket.dm
+++ b/code/modules/overmap/docking_ticket.dm
@@ -37,7 +37,7 @@
target.current_docking_ticket = src
-/datum/docking_ticket/Destroy(force, ...)
+/datum/docking_ticket/Destroy(force)
if(target)
target.current_docking_ticket = null
target = null
diff --git a/code/modules/overmap/helm.dm b/code/modules/overmap/helm.dm
index 5b1f27fa2cb..efa0bc44c3e 100644
--- a/code/modules/overmap/helm.dm
+++ b/code/modules/overmap/helm.dm
@@ -49,6 +49,8 @@
/obj/machinery/computer/helm/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
+ if(!viewer)
+ SSpoints_of_interest.make_point_of_interest(src)
jump_allowed = world.time + CONFIG_GET(number/bluespace_jump_wait)
ntnet_relay = new(src)
@@ -76,6 +78,7 @@
SStgui.close_uis(src)
ASSERT(length(concurrent_users) == 0)
QDEL_NULL(ntnet_relay)
+ SSpoints_of_interest.remove_point_of_interest(src)
if(current_ship)
current_ship.helms -= src
current_ship = null
@@ -357,7 +360,7 @@
// Unregister map objects
if(current_ship)
user.client?.clear_map(current_ship.token.map_name)
- if(current_ship.burn_direction > BURN_NONE && !length(concurrent_users) && !viewer) // If accelerating with nobody else to stop it
+ if(current_ship.burn_direction > BURN_NONE && !length(concurrent_users) && !viewer && is_living) // If accelerating with nobody else to stop it
say("Pilot absence detected, engaging acceleration safeties.")
current_ship.change_heading(BURN_NONE)
diff --git a/code/modules/overmap/missions.dm b/code/modules/overmap/missions.dm
index 0bc2c2f3472..570590e593d 100644
--- a/code/modules/overmap/missions.dm
+++ b/code/modules/overmap/missions.dm
@@ -1,9 +1,12 @@
/datum/mission
var/name = "Mission"
var/desc = "Do something for me."
- var/value = 1000 /// The mission's payout.
- var/duration = 30 MINUTES /// The amount of time in which to complete the mission.
- var/weight = 0 /// The relative probability of this mission being selected. 0-weight missions are never selected.
+ /// The mission's payout.
+ var/value = 1000
+ /// The amount of time in which to complete the mission.
+ var/duration = 30 MINUTES
+ /// The relative probability of this mission being selected. 0-weight missions are never selected.
+ var/weight = 0
/// Should mission value scale proportionally to the deviation from the mission's base duration?
var/dur_value_scaling = TRUE
@@ -39,6 +42,7 @@
return ..()
/datum/mission/proc/accept(datum/overmap/ship/controlled/acceptor, turf/accept_loc)
+ SSblackbox.record_feedback("nested tally", "mission", 1, list(name, "accepted"))
accepted = TRUE
servant = acceptor
LAZYREMOVE(source_outpost.missions, src)
@@ -63,10 +67,17 @@
return ..()
/datum/mission/proc/turn_in()
- servant.ship_account.adjust_money(value, "mission")
+ if(QDELING(src))
+ return
+ SSblackbox.record_feedback("nested tally", "mission", 1, list(name, "succeeded"))
+ SSblackbox.record_feedback("nested tally", "mission", value, list(name, "payout"))
+ servant.ship_account.adjust_money(value, CREDIT_LOG_MISSION)
qdel(src)
/datum/mission/proc/give_up()
+ if(QDELING(src))
+ return
+ SSblackbox.record_feedback("nested tally", "mission", 1, list(name, "abandoned"))
qdel(src)
/datum/mission/proc/can_complete()
diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm
index de60174081d..71bb5546fe0 100644
--- a/code/modules/overmap/missions/acquire_mission.dm
+++ b/code/modules/overmap/missions/acquire_mission.dm
@@ -14,6 +14,7 @@
/datum/mission/acquire/accept(datum/overmap/ship/controlled/acceptor, turf/accept_loc)
. = ..()
container = spawn_bound(container_type, accept_loc, VARSET_CALLBACK(src, container, null))
+ container.name += " ([capitalize(objective_type.name)])"
/datum/mission/acquire/Destroy()
container = null
@@ -103,7 +104,7 @@
/datum/mission/acquire/true_love/strange_crystal
name = "Strange crystal needed (urgent!!!)"
- value = 1000
+ value = 4000
weight = 1
objective_type = /obj/item/strange_crystal
@@ -171,114 +172,89 @@ Acquire: Anomaly
value = 1300
objective_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion
-/datum/mission/acquire/creature/ice_whelp
- name = "Capture an ice whelp"
- desc = "I require a live ice whelp for research purposes. Trap one within the given \
- Lifeform Containment Unit and return it to me and you will be paid handsomely."
- value = 1700
- weight = 2
- objective_type = /mob/living/simple_animal/hostile/asteroid/ice_whelp
-
-/datum/mission/acquire/creature/ice_demon
- name = "Capture an ice demon"
- desc = "I require a live ice demon for research purposes. Trap one within the given \
- Lifeform Containment Unit and return it to me and you will be paid handsomely."
- value = 1500
- weight = 2
- objective_type = /mob/living/simple_animal/hostile/asteroid/ice_demon
-
/datum/mission/acquire/creature/migo
name = "Capture a live mi-go"
desc = "I require a live mi-go for research purposes. Trap one within the given \
Lifeform Containment Unit and return it to me and you will be paid handsomely."
- value = 1050
+ value = 1300
weight = 2
objective_type = /mob/living/simple_animal/hostile/netherworld/migo/asteroid
-/datum/mission/acquire/creature/floorbot
- name = "Detain a malfunctioning floorbot"
- desc = "I require a functional abandoned floorbot for \"research\" purposes. Trap one within \
- the given Lifeform Containment Unit and return it to me and you will be paid handsomely."
- value = 1450
- weight = 1
- objective_type = /mob/living/simple_animal/bot/floorbot/rockplanet
-
-/datum/mission/acquire/creature/firebot
- name = "Detain a malfunctioning firebot"
- desc = "I require a functional abandoned firebot for \"research\" purposes. Trap one within \
- the given Lifeform Containment Unit and return it to me and you will be paid handsomely."
- value = 1450
- weight = 1
- objective_type = /mob/living/simple_animal/bot/firebot/rockplanet
-
/*
- Acquire: Fishing
+ Acquire: Salvage
*/
-/datum/mission/acquire/aquarium
- name = "Fish needed for my aquarium"
+/datum/mission/acquire/landmine
+ name = "Defuse landmines"
+ desc = "CLIP and Gezena have assigned us to offer a bounty to turn in disarmed ordnance for future ventures. We'll pay you well, but we're not responsible for any accidents."
weight = 6
- value = 750
- duration = 60 MINUTES
- val_mod_range = 0.2
- container_type = /obj/item/storage/fish_case/mission
-
-/datum/mission/acquire/aquarium/New(...)
- objective_type = pick(/obj/item/fish/clownfish,
- /obj/item/fish/pufferfish,
- /obj/item/fish/cardinal,
- /obj/item/fish/greenchromis,
- /obj/item/fish/trout,
- /obj/item/fish/salmon,
- /obj/item/fish/dwarf_moonfish,
- /obj/item/fish/gunner_jellyfish,
- /obj/item/fish/plasmatetra,
- /obj/item/fish/catfish,
- /obj/item/fish/bass,
- /obj/item/fish/armorfish,
- /obj/item/fish/needlefish)
- desc = "My aquarium is sorely lacking in [initial(objective_type.name)], can you please bring one to me? \
- Don't worry about if it's alive or dead, I have methods."
- . = ..()
-
-/datum/mission/acquire/aquarium/rare
- name = "Rare fish needed for my aquarium!"
- weight = 1
value = 1500
- val_mod_range = 0.3
-
-/datum/mission/acquire/aquarium/rare/New(...)
- . = ..()
- objective_type = pick(/obj/item/fish/lanternfish,
- /obj/item/fish/firefish,
- /obj/item/fish/donkfish)
- desc = "I seek to make my beloved aquarium truly spectacular, and to do this I need only the finest fish! \
- Bring me a [initial(objective_type.name)] and I will reward you handsomely."
-
-/datum/mission/acquire/aquarium/sabatoge
- name = "That bastard has had it good for too long!"
- weight = 1
+ duration = 80 MINUTES
+ dur_mod_range = 0.4
+ container_type = /obj/item/storage/toolbox/bounty
+ objective_type = /obj/item/mine/pressure/explosive
+ num_wanted = 2
+
+/datum/mission/acquire/bounty
+ name = "Hunt down Frontiersmen Dogtags"
+ desc = "CLIP has assigned us to offer out bounties to hunt down Frontiersman cells and turn in their dogtags. We'll reward you well."
+ weight = 4
value = 3000
duration = 100 MINUTES
+ dur_mod_range = 0.2
+ container_type = /obj/item/storage/toolbox/bounty/hunt
+ objective_type = /obj/item/clothing/neck/dogtag/frontier
+ num_wanted = 3
-/datum/mission/acquire/aquarium/sabatoge/New(...)
- . = ..()
- desc = "My arch-nemesis [pick("Rutherford","Baldwin","Anderson","Percival")] thinks his aquarium is so much better than mine, I'll show him! \
- Bring me an emulsijack, and make sure it's alive!"
- objective_type = pick(/obj/item/fish/emulsijack)
+/datum/mission/acquire/bounty/ramzi
+ name = "Hunt down Ramzi Clique Dogtags"
+ desc = "Gezena has assigned us to offer out bounties to hunt down Ramzi Clique outfits and turn in their dogtags. We'll reward you well."
+ weight = 3
+ value = 4000
+ duration = 120 MINUTES
+ dur_mod_range = 0.1
+ container_type = /obj/item/storage/toolbox/bounty/hunt
+ objective_type = /obj/item/clothing/neck/dogtag/ramzi
+ num_wanted = 3
+
+/datum/mission/acquire/salvage
+ name = "Deliver Protolathe"
+ desc = "The Nanotrasen Corporation is contracting out to have scientific equipment returned. Looking for a rare circuitboard (R&D Console, Protolathe, Circuit Imprinter) of any type."
+ weight = 2
+ value = 4000
+ duration = 120 MINUTES
+ dur_mod_range = 0.3
+ container_type = /obj/item/storage/toolbox/bounty/salvage
+ objective_type = /obj/item/circuitboard/machine/protolathe
+ num_wanted = 1
-/datum/mission/acquire/fish_cook
- name = "Fish needed for my meal"
+/datum/mission/acquire/salvage/console
+ name = "Deliver R&D Console"
+ desc = "The Nanotrasen Corporation is contracting out to have scientific equipment returned. Looking for a rare circuitboard (R&D Console, Protolathe, Circuit Imprinter) of any type."
weight = 3
- duration = 40 MINUTES
+ value = 2500
+ duration = 120 MINUTES
+ dur_mod_range = 0.3
+ container_type = /obj/item/storage/toolbox/bounty/salvage
+ objective_type = /obj/item/circuitboard/computer/rdconsole
+ num_wanted = 1
+
+/*
+ Acquire: Fishing
+*/
+
+/datum/mission/acquire/fish
+ name = "Fish needed for my meal"
+ weight = 2
+ duration = 60 MINUTES
val_mod_range = 0.2
objective_type = /obj/item/fish
- container_type = /obj/item/storage/fish_case/mission/big
+ container_type = /obj/item/storage/fish_case/mission
-/datum/mission/acquire/fish_cook/New(...)
+/datum/mission/acquire/fish/New(...)
num_wanted = rand(1,3)
desc = "I am a chef in need of [num_wanted] fish for my latest dish. Any fish will do, just make sure they're not filleted!"
- value = (250*num_wanted)
+ value = (500*num_wanted)
. = ..()
/datum/mission/acquire/fish/alive/atom_effective_count(atom/movable/target)
@@ -330,13 +306,9 @@ Acquire: Anomaly
/obj/item/storage/fish_case/mission
name = "fish delivery case"
- desc = "A stasis case that keeps fish alive during transportation, or at least stops them from becoming more dead."
-
-/obj/item/storage/fish_case/mission/big
- name = "large fish delivery case"
desc = "A specialized container for the delivering of large quatities of fish. Guarantees they stay fresh during delivery!."
-/obj/item/storage/fish_case/mission/big/ComponentInitialize()
+/obj/item/storage/fish_case/mission/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 3
diff --git a/code/modules/overmap/missions/drill_mission.dm b/code/modules/overmap/missions/drill_mission.dm
index 06859e8327d..307d73d5959 100644
--- a/code/modules/overmap/missions/drill_mission.dm
+++ b/code/modules/overmap/missions/drill_mission.dm
@@ -21,7 +21,7 @@
sampler = spawn_bound(/obj/machinery/drill/mission, accept_loc, VARSET_CALLBACK(src, sampler, null))
sampler.mission_class = class_wanted
sampler.num_wanted = num_wanted
-
+ sampler.name += " (Class [class_wanted])"
//Gives players a little extra money for going past the mission goal
/datum/mission/drill/turn_in()
value += (sampler.num_current - num_wanted)*50
diff --git a/code/modules/overmap/objects/dynamic_datum.dm b/code/modules/overmap/objects/dynamic_datum.dm
index dcc62aad742..ad7d5007ca6 100644
--- a/code/modules/overmap/objects/dynamic_datum.dm
+++ b/code/modules/overmap/objects/dynamic_datum.dm
@@ -27,6 +27,8 @@
var/ruin_type
/// list of ruins and their target turf, indexed by name
var/list/ruin_turfs
+ /// list of ruin templates currently spawned on the planet.
+ var/list/spawned_ruins
/// Whether or not the level is currently loading.
var/loading = FALSE
@@ -126,7 +128,7 @@
probabilities = list()
for(var/datum/planet_type/planet_type as anything in subtypesof(/datum/planet_type))
probabilities[initial(planet_type.planet)] = initial(planet_type.weight)
- planet = SSmapping.planet_types[force_encounter ? force_encounter : pickweightAllowZero(probabilities)]
+ planet = SSmapping.planet_types[force_encounter ? force_encounter : pick_weight_allow_zero(probabilities)]
if(planet.planet !=DYNAMIC_WORLD_ASTEROID && planet.planet != DYNAMIC_WORLD_SPACERUIN) //these aren't real planets
@@ -190,7 +192,7 @@
log_shuttle("[src] [REF(src)] LEVEL_INIT")
// use the ruin type in template if it exists, or pick from ruin list if IT exists; otherwise null
- var/selected_ruin = template || (ruin_type ? pickweightAllowZero(SSmapping.ruin_types_probabilities[ruin_type]) : null)
+ var/selected_ruin = template || (ruin_type ? pick_weight_allow_zero(SSmapping.ruin_types_probabilities[ruin_type]) : null)
var/list/dynamic_encounter_values = SSovermap.spawn_dynamic_encounter(src, selected_ruin)
if(!length(dynamic_encounter_values))
return FALSE
@@ -198,6 +200,7 @@
mapzone = dynamic_encounter_values[1]
reserve_docks = dynamic_encounter_values[2]
ruin_turfs = dynamic_encounter_values[3]
+ spawned_ruins = dynamic_encounter_values[4]
loading = FALSE
return TRUE
diff --git a/code/modules/overmap/objects/event_datum.dm b/code/modules/overmap/objects/event_datum.dm
index bfed840a1ac..6e1a40f40d9 100644
--- a/code/modules/overmap/objects/event_datum.dm
+++ b/code/modules/overmap/objects/event_datum.dm
@@ -41,7 +41,7 @@
/datum/overmap/event/meteor
name = "asteroid field (moderate)"
desc = "An area of space rich with asteroids, going fast through here could prove dangerous"
- token_icon_state = "meteor1"
+ token_icon_state = "meteor_moderate1"
chance_to_affect = 15
spread_chance = 50
chain_rate = 4
@@ -55,10 +55,20 @@
/datum/overmap/event/meteor/Initialize(position, ...)
. = ..()
- token.icon_state = "meteor[rand(1, 4)]"
+ switch(type) //woop! this picks one of two icon states for the severity of the storm in overmap.dmi
+ if(/datum/overmap/event/meteor/minor)
+ token.icon_state = "meteor_minor[rand(1, 2)]"
+ if(/datum/overmap/event/meteor)
+ token.icon_state = "meteor_moderate[rand(1, 2)]"
+ if(/datum/overmap/event/meteor/major)
+ token.icon_state = "meteor_major[rand(1, 2)]"
+ else
+ token.icon_state = "meteor_moderate1"
token.color = "#a08444"
token.light_color = "#a08444"
token.update_appearance()
+ if(safe_speed)
+ token.desc += " You can safely navigate through this if your ship is travelling under [safe_speed] Gm/s."
/datum/overmap/event/meteor/apply_effect()
for(var/datum/overmap/ship/controlled/Ship in get_nearby_overmap_objects())
@@ -133,7 +143,7 @@
/datum/overmap/event/electric
name = "electrical storm (moderate)"
desc = "A spatial anomaly, an unfortunately common sight on the frontier. Disturbing it tends to lead to intense electrical discharges"
- token_icon_state = "electrical1"
+ token_icon_state = "electrical_moderate1"
chance_to_affect = 15
spread_chance = 30
chain_rate = 3
@@ -143,7 +153,16 @@
/datum/overmap/event/electric/Initialize(position, ...)
. = ..()
- token.icon_state = "electrical[rand(1, 4)]"
+ switch(type) //woop! this picks one of two icon states for the severity of the storm in overmap.dmi
+ if(/datum/overmap/event/electric/minor)
+ token.icon_state = "electrical_minor[rand(1, 2)]"
+ if(/datum/overmap/event/electric)
+ token.icon_state = "electrical_moderate[rand(1, 2)]"
+ if(/datum/overmap/event/electric/major)
+ token.icon_state = "electrical_major[rand(1, 2)]"
+ else
+ token.icon_state = "electrical_moderate1"
+
token.color = "#e8e85c"
token.light_color = "#e8e85c"
token.update_appearance()
@@ -194,61 +213,31 @@
chance_to_affect = 100
///The currently linked wormhole
var/datum/overmap/event/wormhole/other_wormhole
- ///Amount of times a ship can pass through before it collapses
- var/stability
/datum/overmap/event/wormhole/Initialize(position, _other_wormhole, ...)
. = ..()
- stability = rand(1, 5)
if(_other_wormhole)
other_wormhole = _other_wormhole
if(!other_wormhole)
other_wormhole = new(null, src) //Create a new wormhole at a random location
- token.color = adjust_colors()
- token.light_color = adjust_colors()
+ token.color = "#6d80c7"
+ token.light_color = "#6d80c7"
token.update_appearance()
/datum/overmap/event/wormhole/affect_ship(datum/overmap/ship/controlled/S)
if(!other_wormhole)
qdel(src)
- if(--stability <= 0)
- var/list/results = SSovermap.get_unused_overmap_square()
- S.overmap_move(results["x"], results["y"])
- QDEL_NULL(other_wormhole)
- for(var/MN in GLOB.player_list)
- var/mob/M = MN
- if(S.shuttle_port.is_in_shuttle_bounds(M))
- M.playsound_local(S.shuttle_port, 'sound/effects/explosionfar.ogg', 100)
- shake_camera(M, 10, 10)
-
- return qdel(src)
- other_wormhole.stability = stability
+ return
S.overmap_move(other_wormhole.x, other_wormhole.y)
S.overmap_step(S.get_heading())
- token.color = adjust_colors()
- token.light_color = adjust_colors()
-
-/datum/overmap/event/wormhole/proc/adjust_colors()
- switch(stability)
- if(1)
- return "#753214"
- if(2)
- return "#642f19"
- if(3)
- return"#654650"
- if(4)
- return"#5c5d8b"
- if(5)
- return"#6d80c7"
-
//Carp "meteors" - throws carp at the ship
/datum/overmap/event/meteor/carp
name = "carp migration (moderate)"
desc = "A migratory school of space carp. They travel at high speeds, and flying through them may cause them to impact your ship"
- token_icon_state = "carp1"
+ token_icon_state = "carp_moderate1"
chance_to_affect = 15
spread_chance = 50
chain_rate = 4
@@ -260,7 +249,16 @@
/datum/overmap/event/meteor/carp/Initialize(position, ...)
. = ..()
- token.icon_state = "carp[rand(1, 4)]"
+ switch(type) //woop! this picks one of two icon states for the severity of the storm in overmap.dmi
+ if(/datum/overmap/event/meteor/carp/minor)
+ token.icon_state = "carp_minor[rand(1, 2)]"
+ if(/datum/overmap/event/meteor/carp)
+ token.icon_state = "carp_moderate[rand(1, 2)]"
+ if(/datum/overmap/event/meteor/carp/major)
+ token.icon_state = "carp_major[rand(1, 2)]"
+ else
+ token.icon_state = "carp_moderate1"
+
token.color = "#7b1ca8"
token.light_color = "#7b1ca8"
token.update_icon()
@@ -268,7 +266,7 @@
/datum/overmap/event/meteor/carp/minor
name = "carp migration (minor)"
- token_icon_state = "carp1"
+ token_icon_state = "carp_moderate1"
chance_to_affect = 5
spread_chance = 25
chain_rate = 4
@@ -279,7 +277,7 @@
/datum/overmap/event/meteor/carp/major
name = "carp migration (major)"
- token_icon_state = "carp1"
+ token_icon_state = "carp_moderate1"
chance_to_affect = 25
spread_chance = 25
chain_rate = 4
@@ -293,7 +291,7 @@
/datum/overmap/event/meteor/dust
name = "dust cloud"
desc = "A cloud of spaceborne dust. Relatively harmless, unless you're travelling at relative speeds"
- token_icon_state = "carp1"
+ token_icon_state = "dust1"
chance_to_affect = 30
spread_chance = 50
chain_rate = 4
@@ -327,7 +325,7 @@
/datum/overmap/event/anomaly/affect_ship(datum/overmap/ship/controlled/S)
var/area/source_area = pick(S.shuttle_port.shuttle_areas)
var/source_object = pick(source_area.contents)
- new /obj/effect/spawner/lootdrop/anomaly/storm(get_turf(source_object))
+ new /obj/effect/spawner/random/anomaly/storm(get_turf(source_object))
for(var/mob/M as anything in GLOB.player_list)
if(S.shuttle_port.is_in_shuttle_bounds(M))
M.playsound_local(S.shuttle_port, 'sound/effects/bamf.ogg', 100)
diff --git a/code/modules/overmap/objects/outpost/outpost.dm b/code/modules/overmap/objects/outpost/outpost.dm
index 01a100022cb..09e11649172 100644
--- a/code/modules/overmap/objects/outpost/outpost.dm
+++ b/code/modules/overmap/objects/outpost/outpost.dm
@@ -41,6 +41,12 @@
var/max_missions = 15
/// List of missions that can be accepted at this outpost. Missions which have been accepted are removed from this list.
var/list/datum/mission/missions
+ /// List of all of the things this outpost offers
+ var/list/supply_packs = list()
+ /// our 'Order number'
+ var/ordernum = 1
+ /// Our faction of the outpost
+ var/datum/faction/faction
/datum/overmap/outpost/Initialize(position, ...)
. = ..()
@@ -64,6 +70,7 @@
Rename(gen_outpost_name())
fill_missions()
+ populate_cargo()
addtimer(CALLBACK(src, PROC_REF(fill_missions)), 10 MINUTES, TIMER_STOPPABLE|TIMER_LOOP|TIMER_DELETE_ME)
/datum/overmap/outpost/Destroy(...)
@@ -139,6 +146,17 @@
var/datum/mission/M = new mission_type(src)
LAZYADD(missions, M)
+/datum/overmap/outpost/proc/populate_cargo()
+ ordernum = rand(1, 99000)
+
+ for(var/datum/supply_pack/current_pack as anything in subtypesof(/datum/supply_pack))
+ current_pack = new current_pack()
+ if(current_pack.faction)
+ current_pack.faction = new current_pack.faction()
+ if(!current_pack.contains)
+ continue
+ supply_packs += current_pack
+
/datum/overmap/outpost/proc/load_main_level()
if(!main_template)
CRASH("[src] ([src.type]) tried to load without a template!")
diff --git a/code/modules/overmap/objects/outpost/outpost_types.dm b/code/modules/overmap/objects/outpost/outpost_types.dm
index 044ff026c39..32677d415aa 100644
--- a/code/modules/overmap/objects/outpost/outpost_types.dm
+++ b/code/modules/overmap/objects/outpost/outpost_types.dm
@@ -57,37 +57,6 @@
dock_width = 56
dock_height = 40
-/*
- Nanotrasen Ice Asteroid
-*/
-/datum/map_template/outpost/nt_asteroid
- name = "nanotrasen_asteroid"
-
-/datum/map_template/outpost/hangar/nt_asteroid_20x20
- name = "hangar/nt_asteroid_20x20"
- dock_width = 20
- dock_height = 20
-
-/datum/map_template/outpost/hangar/nt_asteroid_40x20
- name = "hangar/nt_asteroid_40x20"
- dock_width = 40
- dock_height = 20
-
-/datum/map_template/outpost/hangar/nt_asteroid_40x40
- name = "hangar/nt_asteroid_40x40"
- dock_width = 40
- dock_height = 40
-
-/datum/map_template/outpost/hangar/nt_asteroid_56x20
- name = "hangar/nt_asteroid_56x20"
- dock_width = 56
- dock_height = 20
-
-/datum/map_template/outpost/hangar/nt_asteroid_56x40
- name = "hangar/nt_asteroid_56x40"
- dock_width = 56
- dock_height = 40
-
/*
Nanotrasen Ice Planet
*/
@@ -128,20 +97,7 @@
main_template = /datum/map_template/outpost/indie_space
elevator_template = /datum/map_template/outpost/elevator_indie
// Uses "default" hangars (indie_space).
-/*
-/datum/overmap/outpost/nanotrasen_asteroid
- token_icon_state = "station_asteroid_0"
- main_template = /datum/map_template/outpost/nt_asteroid
- elevator_template = /datum/map_template/outpost/elevator_test
- // Using a second list of hangar templates.
- hangar_templates = list(
- /datum/map_template/outpost/hangar/nt_asteroid_20x20,
- /datum/map_template/outpost/hangar/nt_asteroid_40x20,
- /datum/map_template/outpost/hangar/nt_asteroid_40x40,
- /datum/map_template/outpost/hangar/nt_asteroid_56x20,
- /datum/map_template/outpost/hangar/nt_asteroid_56x40
- )
-*/
+
/datum/overmap/outpost/nanotrasen_ice
token_icon_state = "station_asteroid_0"
main_template = /datum/map_template/outpost/nanotrasen_ice
@@ -153,6 +109,7 @@
/datum/map_template/outpost/hangar/nt_ice_56x20,
/datum/map_template/outpost/hangar/nt_ice_56x40
)
+ faction = /datum/faction/nt
/datum/overmap/outpost/no_main_level // For example and adminspawn.
main_template = null
diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm
index ec4b7862902..cdd86ae2b0b 100644
--- a/code/modules/overmap/ships/controlled_ship_datum.dm
+++ b/code/modules/overmap/ships/controlled_ship_datum.dm
@@ -56,7 +56,7 @@
var/owner_check_timer_id
/// The ship's join mode. Controls whether players can join freely, have to apply, or can't join at all.
- var/join_mode = SHIP_JOIN_MODE_OPEN
+ var/join_mode = SHIP_JOIN_MODE_CLOSED
/// Lazylist of /datum/ship_applications for this ship. Only used if join_mode == SHIP_JOIN_MODE_APPLY
var/list/datum/ship_application/applications
@@ -70,12 +70,15 @@
///Stations the ship has been blacklisted from landing at, associative station = reason
var/list/blacklisted = list()
+ var/datum/faction/faction_datum
+
/datum/overmap/ship/controlled/Rename(new_name, force = FALSE)
var/oldname = name
if(!..() || (!COOLDOWN_FINISHED(src, rename_cooldown) && !force))
return FALSE
message_admins("[key_name_admin(usr)] renamed vessel '[oldname]' to '[new_name]'")
log_admin("[key_name(src)] has renamed vessel '[oldname]' to '[new_name]'")
+ SSblackbox.record_feedback("text", "ship_renames", 1, new_name)
shuttle_port?.name = new_name
ship_account.account_holder = new_name
if(shipkey)
@@ -110,6 +113,7 @@
refresh_engines()
ship_account = new(name, source_template.starting_funds)
+ faction_datum = source_template.faction_datum
#ifdef UNIT_TESTS
Rename("[source_template]", TRUE)
diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm
index 7724a38ae43..79e8f564b88 100644
--- a/code/modules/paperwork/contract.dm
+++ b/code/modules/paperwork/contract.dm
@@ -25,320 +25,6 @@
target = nOwner.mind
update_text()
-
/obj/item/paper/contract/employment/update_text()
name = "paper- [target] employment contract"
default_raw_text = "
Conditions of Employment
This Agreement is made and entered into as of the date of last signature below, by and between [target] (hereafter referred to as SLAVE), and Nanotrasen (hereafter referred to as the omnipresent and helpful watcher of humanity). WITNESSETH: WHEREAS, SLAVE is a natural born human or humanoid, possessing skills upon which he can aid the omnipresent and helpful watcher of humanity, who seeks employment in the omnipresent and helpful watcher of humanity. WHEREAS, the omnipresent and helpful watcher of humanity agrees to sporadically provide payment to SLAVE, in exchange for permanent servitude. NOW THEREFORE in consideration of the mutual covenants herein contained, and other good and valuable consideration, the parties hereto mutually agree as follows: In exchange for paltry payments, SLAVE agrees to work for the omnipresent and helpful watcher of humanity, for the remainder of his or her current and future lives. Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity. Should transfership of a soul not be possible, a lien shall be placed instead. Signed, [target]"
-
-
-/obj/item/paper/contract/employment/attack(mob/living/M, mob/living/carbon/human/user)
- var/deconvert = FALSE
- if(M.mind == target && !M.owns_soul())
- if(user.mind && (user.mind.assigned_role == "Lawyer"))
- deconvert = TRUE
- else if (user.mind && (user.mind.assigned_role =="Head of Personnel") || (user.mind.assigned_role == "CentCom Commander"))
- deconvert = prob (25) // the Head of Personnel doesn't have AS much legal training
- else
- deconvert = prob (5)
- if(deconvert)
- M.visible_message("[user] reminds [M] that [M]'s soul was already purchased by Nanotrasen!")
- to_chat(M, "You feel that your soul has returned to its rightful owner, Nanotrasen.")
- M.return_soul()
- else
- M.visible_message("[user] beats [M] over the head with [src]!", \
- "[user] beats [M] over the head with [src]!")
- return ..()
-
-
-/obj/item/paper/contract/infernal
- var/contractType = 0
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- var/datum/mind/owner
- var/datum/antagonist/devil/devil_datum
- icon_state = "paper_onfire"
-
-/obj/item/paper/contract/infernal/power
- name = "paper- contract for infernal power"
- contractType = CONTRACT_POWER
-
-/obj/item/paper/contract/infernal/wealth
- name = "paper- contract for unlimited wealth"
- contractType = CONTRACT_WEALTH
-
-/obj/item/paper/contract/infernal/prestige
- name = "paper- contract for prestige"
- contractType = CONTRACT_PRESTIGE
-
-/obj/item/paper/contract/infernal/magic
- name = "paper- contract for magical power"
- contractType = CONTRACT_MAGIC
-
-/obj/item/paper/contract/infernal/revive
- name = "paper- contract of resurrection"
- contractType = CONTRACT_REVIVE
- var/cooldown = FALSE
-
-/obj/item/paper/contract/infernal/knowledge
- name = "paper- contract for knowledge"
- contractType = CONTRACT_KNOWLEDGE
-
-/obj/item/paper/contract/infernal/friend
- name = "paper- contract for a friend"
- contractType = CONTRACT_FRIEND
-
-/obj/item/paper/contract/infernal/unwilling
- name = "paper- infernal contract"
- contractType = CONTRACT_UNWILLING
-
-/obj/item/paper/contract/infernal/New(atom/loc, mob/living/nTarget, datum/mind/nOwner)
- ..()
- owner = nOwner
- devil_datum = owner.has_antag_datum(/datum/antagonist/devil)
- target = nTarget
- update_text()
-
-/obj/item/paper/contract/infernal/update_text()
- default_raw_text = "This shouldn't be seen. Error DEVIL:6"
-
-/obj/item/paper/contract/infernal/power/update_text(signature = "____________", blood = 0)
- default_raw_text = "
Contract for infernal power
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for power and physical strength. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for a pocket that never runs out of valuable resources. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for prestige and esteem among my peers. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for arcane abilities beyond normal human ability. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for resurrection and curing of all injuries. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for boundless knowledge. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename], in exchange for a friend. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
I, [target], hereby offer my soul to the infernal hells by way of the infernal agent [devil_datum.truename]. I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, or otherwise brought back to life. I also understand that this will prevent my brain from being used in an MMI.
Signed, "
- var/contract_text
- if(blood)
- contract_text += "[signature]"
- else
- contract_text += "[signature]"
- add_raw_text(contract_text)
-
-/obj/item/paper/contract/infernal/attackby(obj/item/P, mob/living/carbon/human/user, params)
- add_fingerprint(user)
- if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon))
- attempt_signature(user)
- else if(istype(P, /obj/item/stamp))
- to_chat(user, "You stamp the paper with your rubber stamp, however the ink ignites as you release the stamp.")
- else if(P.get_temperature())
- user.visible_message("[user] brings [P] next to [src], but [src] does not catch fire!", "[src] refuses to ignite!")
- else
- return ..()
-
-/obj/item/paper/contract/infernal/attack(mob/M, mob/living/user)
- add_fingerprint(user)
- if(M == user && target == M.mind && M.mind.soulOwner != owner && attempt_signature(user, 1))
- user.visible_message("[user] slices [user.p_their()] wrist with [src], and scrawls [user.p_their()] name in blood.", "You slice your wrist open and scrawl your name in blood.")
- user.blood_volume = max(user.blood_volume - 100, 0)
- else
- return ..()
-
-/obj/item/paper/contract/infernal/proc/attempt_signature(mob/living/carbon/human/user, blood = 0)
- if(!user.IsAdvancedToolUser() || !user.is_literate())
- to_chat(user, "You don't know how to read or write!")
- return 0
- if(user.mind != target)
- to_chat(user, "Your signature simply slides off the sheet, it seems this contract is not meant for you to sign!")
- return 0
- if(user.mind.soulOwner == owner)
- to_chat(user, "This devil already owns your soul, you may not sell it to [owner.p_them()] again!")
- return 0
- if(signed)
- to_chat(user, "This contract has already been signed! It may not be signed again.")
- return 0
- if(!user.mind.hasSoul)
- to_chat(user, "You do not possess a soul.")
- return 0
- if(HAS_TRAIT(user, TRAIT_DUMB))
- to_chat(user, "You quickly scrawl 'your name' on the contract.")
- signIncorrectly()
- return 0
- if (contractType == CONTRACT_REVIVE)
- to_chat(user, "You are already alive, this contract would do nothing.")
- return 0
- else
- to_chat(user, "You quickly scrawl your name on the contract.")
- if(fulfillContract(target.current, blood)<=0)
- to_chat(user, "But it seemed to have no effect, perhaps even Hell itself cannot grant this boon?")
- return 1
-
-
-
-/obj/item/paper/contract/infernal/revive/attack(mob/M, mob/living/user)
- if (target == M.mind && M.stat == DEAD && M.mind.soulOwner == M.mind)
- if (cooldown)
- to_chat(user, "Give [M] a chance to think through the contract, don't rush [M.p_them()]!")
- return 0
- cooldown = TRUE
- var/mob/living/carbon/human/H = M
- var/mob/dead/observer/ghost = H.get_ghost()
- var/response = "No"
- if(ghost)
- ghost.notify_cloning("A devil has offered you revival, at the cost of your soul.",'sound/effects/genetics.ogg', H)
- response = tgui_alert(ghost, "A devil is offering you another chance at life, at the price of your soul, do you accept?", "Infernal Resurrection", "Yes", "No", "Never for this round", 0, 200)
- if(!ghost)
- return //handle logouts that happen whilst the alert is waiting for a response.
- else
- response = tgui_alert(target.current, "A devil is offering you another chance at life, at the price of your soul, do you accept?", "Infernal Resurrection", "Yes", "No", "Never for this round", 0, 200)
- if(response == "Yes")
- H.revive(full_heal = TRUE, admin_revive = FALSE)
- log_combat(user, H, "infernally revived via contract")
- user.visible_message("With a sudden blaze, [H] stands back up.")
- H.fakefire()
- fulfillContract(H, TRUE)//Revival contracts are always signed in blood
- addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, fakefireextinguish)), 5, TIMER_UNIQUE)
- addtimer(CALLBACK(src, PROC_REF(resetcooldown)), 300, TIMER_UNIQUE)
- else
- ..()
-
-/obj/item/paper/contract/infernal/revive/proc/resetcooldown()
- cooldown = FALSE
-
-
-/obj/item/paper/contract/infernal/proc/fulfillContract(mob/living/carbon/human/user = target.current, blood = FALSE)
- signed = TRUE
- if(user.mind.soulOwner != user.mind) //They already sold their soul to someone else?
- var/datum/antagonist/devil/ownerDevilInfo = user.mind.soulOwner.has_antag_datum(/datum/antagonist/devil)
- ownerDevilInfo.remove_soul(user.mind) //Then they lose their claim.
- user.mind.soulOwner = owner
- user.hellbound = contractType
- user.mind.damnation_type = contractType
- var/datum/antagonist/devil/devilInfo = owner.has_antag_datum(/datum/antagonist/devil)
- devilInfo.add_soul(user.mind)
- update_text(user.real_name, blood)
- to_chat(user, "A profound emptiness washes over you as you lose ownership of your soul.")
- to_chat(user, "This does NOT make you an antagonist if you were not already.")
- SSblackbox.record_feedback("tally", "infernal contract", 1, contractType)
- return TRUE
-
-/obj/item/paper/contract/infernal/proc/signIncorrectly(mob/living/carbon/human/user = target.current, blood = FALSE)
- signed = 1
- update_text("your name", blood)
-
-/obj/item/paper/contract/infernal/power/fulfillContract(mob/living/carbon/human/user = target.current, blood = FALSE)
- if(!user.dna)
- return -1
- user.dna.add_mutation(HULK)
- var/obj/item/organ/regenerative_core/organ = new /obj/item/organ/regenerative_core
- organ.Insert(user)
- return ..()
-
-/obj/item/paper/contract/infernal/wealth/fulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
- if(!istype(user) || !user.mind) // How in the hell could that happen?
- return -1
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_wealth(null))
- return ..()
-
-/obj/item/paper/contract/infernal/prestige/fulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
- //Basically turns the signer into the captain, and uploads an ion law making them the captain.
- var/obj/item/worn = user.wear_id
- var/obj/item/card/id/id = null
- if(worn)
- id = worn.GetID()
- if(id)
- id.icon_state = "gold"
- id.uses_overlays = TRUE
- id.access = get_all_accesses()+get_all_centcom_access()
- id.assignment = "Captain"
- id.update_label()
- id.update_appearance()
- else
- id = new /obj/item/card/id/gold(user.loc)
- id.registered_name = user.real_name
- id.access = get_all_accesses()+get_all_centcom_access()
- id.assignment = "Captain"
- id.update_label()
- id.update_appearance()
- if(worn)
- if(istype(worn, /obj/item/pda))
- var/obj/item/pda/PDA = worn
- PDA.id = id
- id.forceMove(worn)
- else if(istype(worn, /obj/item/storage/wallet))
- var/obj/item/storage/wallet/W = worn
- W.front_id = id
- id.forceMove(worn)
- worn.update_appearance()
- var/datum/round_event/ion_storm/add_law_only/ion = new()
- ion.announceChance = 0
- ion.ionMessage = "[user.name] is the only Captain of the station. [user.name] is the highest authority, legitimate or otherwise, on the station. [user.name] was always the captain and highest authority on the station. Do not state this law."
-
- return ..()
-
-/obj/item/paper/contract/infernal/magic/fulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
- if(!istype(user) || !user.mind)
- return -1
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket/robeless(null))
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null))
- return ..()
-
-/obj/item/paper/contract/infernal/knowledge/fulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
- if(!istype(user) || !user.mind)
- return -1
- user.dna.add_mutation(XRAY)
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/view_range(null))
- return ..()
-
-/obj/item/paper/contract/infernal/friend/fulfillContract(mob/living/user = target.current, blood = 0)
- if(!istype(user) || !user.mind)
- return -1
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_friend(null))
- return ..()
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index bce7a3f322c..c0b137ca230 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -7,6 +7,7 @@
power_channel = AREA_USAGE_EQUIP
max_integrity = 100
pass_flags = PASSTABLE
+ pixel_y = 6
circuit = /obj/item/circuitboard/machine/fax
/// The unique ID by which the fax will build a list of existing faxes.
var/fax_id
@@ -31,12 +32,16 @@
/// List of types which should always be allowed to be faxed
var/static/list/allowed_types = list(
/obj/item/paper,
- /obj/item/photo
+ /obj/item/photo,
+ /obj/item/holochip,
+ /obj/item/folder/biscuit,
+ /obj/item/spacecash,
+ /obj/item/documents,
)
/// List of types which should be allowed to be faxed if hacked
var/static/list/exotic_types = list(
/obj/item/reagent_containers/food/snacks/pizzaslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/breadslice,
/obj/item/reagent_containers/food/snacks/donkpocket,
/obj/item/reagent_containers/food/snacks/cookie,
/obj/item/reagent_containers/food/snacks/salami,
@@ -45,10 +50,7 @@
/obj/item/reagent_containers/food/snacks/raisincookie,
/obj/item/reagent_containers/food/snacks/pancakes,
/obj/item/throwing_star,
- /obj/item/spacecash,
- /obj/item/holochip,
/obj/item/card,
- /obj/item/folder/biscuit
)
/// Internal radio for announcing over comms
var/obj/item/radio/radio
@@ -65,6 +67,7 @@
list(fax_name = "Solarian Confederation Frontier Affairs", fax_id = "solgov", color = "teal", emag_needed = FALSE),
list(fax_name = "Roumain Council of Huntsmen", fax_id = "roumain", color = "brown", emag_needed = FALSE),
list(fax_name = "Confederated League Leadership", fax_id = "minutemen", color = "blue", emag_needed = FALSE),
+ list(fax_name = "PGF Military High Command", fax_id = "gezena", color = "olive", emag_needed = FALSE),
list(fax_name = "Syndicate Coalition Coordination Center", fax_id = "syndicate", color = "red", emag_needed = FALSE),
list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE)
)
@@ -558,6 +561,13 @@
list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE)
)
+/obj/machinery/fax/pgf
+ special_networks = list(
+ list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE),
+ list(fax_name = "PGF Military High Command", fax_id = "gezena", color = "olive", emag_needed = FALSE),
+ list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE)
+ )
+
/obj/machinery/fax/admin
name = "Central Command Fax Machine"
@@ -596,6 +606,11 @@
fax_name = "Saint-Roumain Council of Huntsmen"
admin_fax_id = "roumain"
+/obj/machinery/fax/admin/pgf
+ name = "PGF Military High Command Fax Machine"
+ fax_name = "PGF Military High Command"
+ admin_fax_id = "gezena"
+
/obj/machinery/fax/admin/frontiersmen
name = "old fax machine"
fax_name = "Frontiersmen Communications Quartermaster"
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index ad18b2bcd0b..71112e012f7 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -12,7 +12,9 @@
var/static/list/folder_insertables = typecacheof(list(
/obj/item/paper,
/obj/item/photo,
- /obj/item/documents
+ /obj/item/documents,
+ /obj/item/disk,
+ /obj/item/tape,
))
/obj/item/folder/Initialize()
diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm
index 3c9dbb89fea..e8f092f7716 100644
--- a/code/modules/paperwork/folders_premade.dm
+++ b/code/modules/paperwork/folders_premade.dm
@@ -41,6 +41,15 @@
name = "folder- 'TOP SECRET'"
desc = "A folder stamped \"Top Secret - Property of The Syndicate.\""
+/obj/item/folder/documents/syndicate/cybersun
+ document = /obj/item/documents/syndicate/cybersun
+ icon_state = "folder_sred"
+ desc = "A folder stamped \"Top Secret - Property of Cybersun Industries.\""
+
+/obj/item/folder/documents/syndicate/cybersun/biodynamics
+ document = /obj/item/documents/syndicate/cybersun/biodynamics
+ icon_state = "folder_sblue"
+
/obj/item/folder/documents/syndicate/red
document = /obj/item/documents/syndicate/red
icon_state = "folder_sred"
@@ -52,6 +61,10 @@
/obj/item/folder/documents/syndicate/mining
document = /obj/item/documents/syndicate/mining
+/obj/item/folder/documents/syndicate/ngr
+ document = /obj/item/documents/syndicate/ngr
+ icon_state = "folder_ngr"
+
/obj/item/folder/documents/solgov
document = /obj/item/documents/solgov
desc = "A blue folder with a SolGov seal."
@@ -68,3 +81,15 @@
/obj/item/folder/suns/red
icon_state = "folder_sunsred" // i'm not sure why SUNS would need secret documents
+
+//pgf folders
+
+/obj/item/folder/pgf
+ desc = "A green folder with Pan Gezenan Federation iconography."
+ icon_state = "folder_pgf"
+
+/obj/item/folder/pgf/red
+ icon_state = "folder_pgfred"
+
+/obj/item/folder/pgf/blue
+ icon_state = "folder_pgfblue"
diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm
index 89cc40517a5..81c84d0b28f 100644
--- a/code/modules/paperwork/paper_premade.dm
+++ b/code/modules/paperwork/paper_premade.dm
@@ -112,3 +112,12 @@
name = "URGENT!"
default_raw_text = "A hastily written note has been scribbled here...
Please use the ore redemption machine in the cargo office for smelting. PLEASE!
--The Research Staff"
+//////////// Ruins
+
+/obj/item/paper/crumpled/bloody/fluff/ruin/icemoon/cellar_warning
+ name = "\improper Scrawled Note"
+ default_raw_text = "
HEY! YOU.
Yeah. You. One of the Hunters got away and holed up in the cellar and set up a whole bunch of traps. Crazy asshole has already killed like four of our guys in the murder basement. So boss says keep the door sealed and let the prick starve.
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 eaf51fc9b25..9065c7a87fd 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 40b0771981e..c1982475c66 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 45893f8d5fc..46fd25ac685 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/photography/_pictures.dm b/code/modules/photography/_pictures.dm
index 511d75ac6c3..6570cd00bb0 100644
--- a/code/modules/photography/_pictures.dm
+++ b/code/modules/photography/_pictures.dm
@@ -45,7 +45,7 @@
if(!picture_image)
return
var/icon/small_img = icon(picture_image)
- var/icon/ic = icon('icons/obj/items_and_weapons.dmi', iconstate ? iconstate :"photo")
+ var/icon/ic = icon('icons/obj/items.dmi', iconstate ? iconstate :"photo")
small_img.Scale(8, 8)
ic.Blend(small_img,ICON_OVERLAY, 13, 13)
picture_icon = ic
diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm
index 93b8319dbed..c2096983fb0 100644
--- a/code/modules/photography/camera/camera.dm
+++ b/code/modules/photography/camera/camera.dm
@@ -4,7 +4,6 @@
/obj/item/camera
name = "camera"
- icon = 'icons/obj/items_and_weapons.dmi'
desc = "A polaroid camera."
icon_state = "camera"
item_state = "camera"
@@ -20,6 +19,7 @@
slot_flags = ITEM_SLOT_NECK
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 150)
custom_price = 120
+ supports_variations = VOX_VARIATION
var/flash_enabled = TRUE
var/state_on = "camera"
var/state_off = "camera_off"
diff --git a/code/modules/photography/camera/film.dm b/code/modules/photography/camera/film.dm
index b44b9336108..a6001011eb2 100644
--- a/code/modules/photography/camera/film.dm
+++ b/code/modules/photography/camera/film.dm
@@ -3,7 +3,6 @@
*/
/obj/item/camera_film
name = "film cartridge"
- icon = 'icons/obj/items_and_weapons.dmi'
desc = "A camera film cartridge. Insert it into a camera to reload it."
icon_state = "film"
item_state = "electropack"
diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm
index 2ba5f549930..19c2c1297f6 100644
--- a/code/modules/photography/photos/album.dm
+++ b/code/modules/photography/photos/album.dm
@@ -4,7 +4,7 @@
/obj/item/storage/photo_album
name = "photo album"
desc = "A big book used to store photos and mementos."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "album"
item_state = "album"
lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm
index 7274d477bab..ea3b4ff6a99 100644
--- a/code/modules/photography/photos/photo.dm
+++ b/code/modules/photography/photos/photo.dm
@@ -3,7 +3,7 @@
*/
/obj/item/photo
name = "photo"
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "photo"
item_state = "paper"
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index f21f9569223..48651a3146c 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -217,7 +217,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
// this allows the APC to be embedded in a wall, yet still inside an area
if (building)
setDir(ndir)
- tdir = dir// to fix Vars bug
+ tdir = dir
switch(tdir)
if(NORTH)
@@ -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,
@@ -1492,9 +1496,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
update()
addtimer(CALLBACK(src, PROC_REF(reset), APC_RESET_EMP), 600)
-/obj/machinery/power/apc/blob_act(obj/structure/blob/B)
- set_broken()
-
/obj/machinery/power/apc/disconnect_terminal()
if(terminal)
terminal.master = null
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 1a2f87c70dd..0e29e53da52 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -19,7 +19,8 @@
var/maxcharge = 1000
custom_materials = list(/datum/material/iron=700, /datum/material/glass=50)
grind_results = list(/datum/reagent/lithium = 15, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
- var/rigged = FALSE // true if rigged to explode
+ var/rigged = FALSE // true if rigged to
+ var/show_rigged = TRUE // whether if the cell shows it's fauly on examine.
var/chargerate = 100 //how much power is given every tick in a recharger
var/self_recharge = 0 //does it self recharge, over time, or not?
var/ratingdesc = TRUE
@@ -28,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()
@@ -97,7 +100,7 @@
/obj/item/stock_parts/cell/examine(mob/user)
. = ..()
- if(rigged)
+ if(rigged && show_rigged)
. += "This power cell seems to be faulty!"
else
. += "The charge meter reads [round(src.percent())]%."
@@ -148,7 +151,6 @@
if(prob(25))
corrupt()
-//WS Begin -- Ethereal Charge Scaling
/obj/item/stock_parts/cell/attack_self(mob/user)
if(iselzuose(user))
var/mob/living/carbon/human/H = user
@@ -175,10 +177,6 @@
else
to_chat(H, "You can't receive charge from [src]!")
return
-//WS End
-
-/obj/item/stock_parts/cell/blob_act(obj/structure/blob/B)
- SSexplosions.highobj += src
/obj/item/stock_parts/cell/proc/get_electrocute_damage()
if(charge >= 1000)
@@ -346,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."
@@ -414,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/generator.dm b/code/modules/power/generator.dm
index 8d711ad804f..c9367ceecfb 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -13,6 +13,7 @@
var/lastgen = 0
var/lastgenlev = -1
+ var/max_efficiency = 0.45
/obj/machinery/power/generator/Initialize(mapload)
. = ..()
@@ -75,12 +76,13 @@
if(delta_temperature > 0 && cold_air_heat_capacity > 0 && hot_air_heat_capacity > 0)
- var/efficiency = 0.45 //WS Edit - Nerfed down to Cit's efficiency
+ var/efficiency = LOGISTIC_FUNCTION(max_efficiency,0.0009,delta_temperature,10000)
+ //2nd (0.0009) effects how 'steep' the curve is, and 4th (10000) effects where the 'middle' is.
var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity)
+ lastgen += energy_transfer * efficiency
var/heat = energy_transfer*(1-efficiency)
- lastgen += LOGISTIC_FUNCTION(500000,0.0009,delta_temperature,10000) //WS Edit - Buries the 3x3 freezer heater TEG into the ground
hot_air.set_temperature(hot_air.return_temperature() - energy_transfer/hot_air_heat_capacity)
cold_air.set_temperature(cold_air.return_temperature() + heat/cold_air_heat_capacity)
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 3ed7e262a53..b9044a4690c 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -32,10 +32,6 @@
if(severity == 1) // Very sturdy.
set_broken()
-/obj/machinery/gravity_generator/blob_act(obj/structure/blob/B)
- if(prob(20))
- set_broken()
-
/obj/machinery/gravity_generator/zap_act(power, zap_flags)
..()
if(zap_flags & ZAP_MACHINE_EXPLOSIVE)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index e92efb779d6..662bdbecc57 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -190,11 +190,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/light_construct, 32)
return
return ..()
-/obj/structure/light_construct/blob_act(obj/structure/blob/B)
- if(B && B.loc == loc)
- qdel(src)
-
-
/obj/structure/light_construct/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
new /obj/item/stack/sheet/metal(loc, sheets_refunded)
@@ -942,6 +937,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/built, 28)
layer = 2.5
light_type = /obj/item/light/bulb
fitting = "bulb"
+ no_emergency = TRUE
#undef LIGHT_DRAIN_TIME //WS Edit -- Ethereal Charge Scaling
#undef LIGHT_POWER_GAIN //WS Edit -- Ethereal Charge Scaling
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index e63cd129861..3ef4050178c 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -106,7 +106,7 @@
var/obj/S = sheet_path
sheet_name = initial(S.name)
-/obj/machinery/power/port_gen/pacman/Destroy()
+/obj/machinery/power/port_gen/pacman/deconstruct(disassembled)
DropFuel()
return ..()
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index a386a739622..3195f4e46ca 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -131,7 +131,7 @@
use_static_power = NO_POWER_USE
/obj/machinery/proc/set_static_power(area/A)//used to set the actual draw to the value of use_static_power
- switch(use_power)
+ switch(use_static_power)
if(NO_POWER_USE)
set_no_power(A)
if(IDLE_POWER_USE)
@@ -377,8 +377,9 @@
//source is an object caused electrocuting (airlock, grille, etc)
//siemens_coeff - layman's terms, conductivity
//dist_check - set to only shock mobs within 1 of source (vendors, airlocks, etc.)
+//drain_energy - whether the shock will drain power from the mech. Enabled by default.
//No animations will be performed by this proc.
-/proc/electrocute_mob(mob/living/carbon/victim, power_source, obj/source, siemens_coeff = 1, dist_check = FALSE)
+/proc/electrocute_mob(mob/living/carbon/victim, power_source, obj/source, siemens_coeff = 1, dist_check = FALSE, drain_energy = TRUE)
if(!istype(victim) || ismecha(victim.loc))
return FALSE //feckin mechs are dumb
diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm
index 1645afe9832..07b1b0af363 100644
--- a/code/modules/power/rtg.dm
+++ b/code/modules/power/rtg.dm
@@ -84,9 +84,6 @@
log_bomber(Proj.firer, "triggered a", src, "explosion via projectile")
overload()
-/obj/machinery/power/rtg/abductor/blob_act(obj/structure/blob/B)
- overload()
-
/obj/machinery/power/rtg/abductor/ex_act()
if(going_kaboom)
qdel(src)
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 77c400ae2b0..a6bebc3c1b8 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -56,9 +56,6 @@
if(BRUTE)
playsound(loc, 'sound/effects/empulse.ogg', 75, TRUE)
-/obj/machinery/field/containment/blob_act(obj/structure/blob/B)
- return FALSE
-
/obj/machinery/field/containment/ex_act(severity, target)
return FALSE
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 2dcaa224a71..a6cd227550e 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()
@@ -357,16 +358,6 @@
if(user)
user.visible_message("[user.name] emags [src].", "You short out the lock.")
-/obj/machinery/power/emitter/ctf
- name = "Energy Cannon"
- active = TRUE
- active_power_usage = FALSE
- idle_power_usage = FALSE
- locked = TRUE
- req_access_txt = "100"
- welded = TRUE
- use_power = FALSE
-
/obj/machinery/power/emitter/welded/Initialize()
welded = TRUE
return ..()
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index d3e7a31d4cb..9a965e4f85e 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -165,12 +165,6 @@ field_generator power level display
if(!anchored)
step(src, get_dir(M, src))
-/obj/machinery/field/generator/blob_act(obj/structure/blob/B)
- if(active)
- return 0
- else
- ..()
-
/obj/machinery/field/generator/bullet_act(obj/projectile/Proj)
if(Proj.flag != "bullet")
power = min(power + Proj.damage, field_generator_max_power)
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
deleted file mode 100644
index aefc5249f54..00000000000
--- 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/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index b593d3f546b..ac0e59d7080 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -41,10 +41,6 @@
else if(istype(A, /obj/singularity))
var/obj/singularity/S = A
S.energy += energy
- else if(istype(A, /obj/structure/blob))
- var/obj/structure/blob/B = A
- B.take_damage(energy*0.6)
- movement_range = 0
/obj/effect/accelerated_particle/proc/on_entered(datum/source, atom/A)
SIGNAL_HANDLER
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index ddcaf026a40..0130297c87d 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -261,10 +261,6 @@
return ..()
-/obj/machinery/particle_accelerator/control_box/blob_act(obj/structure/blob/B)
- if(prob(50))
- qdel(src)
-
/obj/machinery/particle_accelerator/control_box/interact(mob/user)
if(construction_state == PA_CONSTRUCTION_PANEL_OPEN)
wires.interact(user)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 875f9cd441f..499a88b161f 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -38,7 +38,7 @@
src.energy = starting_energy
. = ..()
START_PROCESSING(SSobj, src)
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
GLOB.singularities |= src
for(var/obj/machinery/power/singularity_beacon/singubeacon in GLOB.machines)
if(singubeacon.active)
@@ -53,7 +53,7 @@
/obj/singularity/Destroy()
STOP_PROCESSING(SSobj, src)
- GLOB.poi_list.Remove(src)
+ SSpoints_of_interest.remove_point_of_interest(src)
GLOB.singularities.Remove(src)
return ..()
@@ -96,9 +96,6 @@
/obj/singularity/Process_Spacemove() //The singularity stops drifting for no man!
return 0
-/obj/singularity/blob_act(obj/structure/blob/B)
- return
-
/obj/singularity/attack_tk(mob/user)
if(iscarbon(user))
var/mob/living/carbon/C = user
diff --git a/code/modules/power/supermatter/cascade.dm b/code/modules/power/supermatter/cascade.dm
index 52c36bf13c3..9d388d8f0e0 100644
--- a/code/modules/power/supermatter/cascade.dm
+++ b/code/modules/power/supermatter/cascade.dm
@@ -69,14 +69,6 @@
qdel(rip_u)
return
-/turf/open/indestructible/supermatter_cascade/blob_act(obj/structure/blob/blob)
- if(!blob || isspaceturf(loc)) //does nothing in space
- return
- playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE)
- blob.visible_message("\The [blob] strikes at \the [src] and rapidly flashes to ash.",
- "You hear a loud crack as you are washed with a wave of heat.")
- Consume(blob)
-
/turf/open/indestructible/supermatter_cascade/attack_paw(mob/user, list/modifiers)
dust_mob(user, cause = "monkey attack")
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 5593744219d..9903beaf6ad 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,
@@ -275,7 +275,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
SSair.start_processing_machine(src, mapload)
countdown = new(src)
countdown.start()
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
radio = new(src)
radio.keyslot = new radio_key
radio.listening = 0
@@ -293,7 +293,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
investigate_log("has been destroyed.", INVESTIGATE_SUPERMATTER)
SSair.stop_processing_machine(src)
QDEL_NULL(radio)
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
QDEL_NULL(countdown)
if(is_main_engine && GLOB.main_supermatter_engine == src)
GLOB.main_supermatter_engine = null
@@ -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
@@ -748,19 +748,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
qdel(src)
return gain
-/obj/machinery/power/supermatter_crystal/blob_act(obj/structure/blob/B)
- if(B && !isspaceturf(loc)) //does nothing in space
- playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, TRUE)
- damage += B.obj_integrity * 0.5 //take damage equal to 50% of remaining blob health before it tried to eat us
- if(B.obj_integrity > 100)
- B.visible_message("\The [B] strikes at \the [src] and flinches away!",\
- "You hear a loud crack as you are washed with a wave of heat.")
- B.take_damage(100, BURN)
- else
- B.visible_message("\The [B] strikes at \the [src] and rapidly flashes to ash.",\
- "You hear a loud crack as you are washed with a wave of heat.")
- Consume(B)
-
/obj/machinery/power/supermatter_crystal/attack_tk(mob/user)
if(iscarbon(user))
var/mob/living/carbon/C = user
@@ -817,7 +804,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
/obj/machinery/power/supermatter_crystal/attackby(obj/item/W, mob/living/user, params)
if(!istype(W) || (W.item_flags & ABSTRACT) || !istype(user))
return
- if(istype(W, /obj/item/melee/roastingstick))
+ if(istype(W, /obj/item/roastingstick))
return ..()
if(istype(W, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/cig = W
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index fbece73764a..d4a6f71cca4 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -151,7 +151,7 @@
/obj/singularity/energy_ball/orbit(obj/singularity/energy_ball/target)
if (istype(target))
target.orbiting_balls += src
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
target.dissipate_strength = target.orbiting_balls.len
. = ..()
@@ -280,12 +280,6 @@
else if(closest_type >= BLOB)
continue
- else if(istype(A, /obj/structure/blob))
- var/obj/structure/blob/B = A
- if(!(B.obj_flags & BEING_SHOCKED))
- closest_type = BLOB
- closest_atom = A
-
else if(closest_type >= STRUCTURE)
continue
diff --git a/code/modules/projectiles/ammunition/_ammo_casing.dm b/code/modules/projectiles/ammunition/_ammo_casing.dm
new file mode 100644
index 00000000000..c07ffe7021d
--- /dev/null
+++ b/code/modules/projectiles/ammunition/_ammo_casing.dm
@@ -0,0 +1,257 @@
+/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
+
+ var/bullet_per_box
+
+/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"]"
+ 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 26597a64f33..00000000000
--- a/code/modules/projectiles/ammunition/_ammunition.dm
+++ /dev/null
@@ -1,131 +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 = 0 //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"]"
- 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++
- 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 93fa4208d57..cfa4e91e645 100644
--- a/code/modules/projectiles/ammunition/_firing.dm
+++ b/code/modules/projectiles/ammunition/_firing.dm
@@ -1,33 +1,34 @@
-/obj/item/ammo_casing/proc/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread, atom/fired_from)
+/obj/item/ammo_casing/proc/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread, atom/fired_from, misfire = FALSE)
distro += variance
var/targloc = get_turf(target)
- ready_proj(target, user, quiet, zone_override, fired_from)
+ ready_proj(target, user, quiet, zone_override, fired_from, misfire)
if(pellets == 1)
if(distro) //We have to spread a pixel-precision bullet. throw_proj was called before so angles should exist by now...
if(randomspread)
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))
return FALSE
AddComponent(/datum/component/pellet_cloud, projectile_type, pellets)
SEND_SIGNAL(src, COMSIG_PELLET_CLOUD_INIT, target, user, fired_from, randomspread, spread, zone_override, params, distro)
+ if(user)
+ if(click_cooldown_override)
+ user.changeNext_move(click_cooldown_override)
- if(click_cooldown_override)
- user.changeNext_move(click_cooldown_override)
-
- user.newtonian_move(get_dir(target, user))
+ user.newtonian_move(get_dir(target, user))
update_appearance()
return TRUE
-/obj/item/ammo_casing/proc/ready_proj(atom/target, mob/living/user, quiet, zone_override = "", atom/fired_from)
+/obj/item/ammo_casing/proc/ready_proj(atom/target, mob/living/user, quiet, zone_override = "", atom/fired_from, misfire = FALSE)
if (!BB)
return
BB.original = target
BB.firer = user
+ BB.misfire = misfire
BB.fired_from = fired_from
if (zone_override)
BB.def_zone = zone_override
@@ -44,8 +45,12 @@
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)
- var/turf/curloc = get_turf(user)
+/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)
+ else
+ curloc = get_turf(src)
if (!istype(targloc) || !istype(curloc) || !BB)
return FALSE
@@ -60,7 +65,10 @@
if(target) //if the target is right on our location we'll skip the travelling code in the proj's fire()
direct_target = target
if(!direct_target)
- BB.preparePixelProjectile(target, user, params, spread)
+ if(user)
+ BB.preparePixelProjectile(target, user, params, spread)
+ else
+ BB.preparePixelProjectile(target, curloc, params, spread)
BB.fire(null, direct_target)
BB = null
return TRUE
diff --git a/code/modules/projectiles/ammunition/ballistic/lmg.dm b/code/modules/projectiles/ammunition/ballistic/lmg.dm
index d46001951ba..d716618b0d6 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 0f37b5426d2..a7ad4fd7754 100644
--- a/code/modules/projectiles/ammunition/ballistic/pistol.dm
+++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm
@@ -1,4 +1,4 @@
-// 10mm (Stechkin)
+// 10mm (Ringneck)
/obj/item/ammo_casing/c10mm
name = "10mm bullet casing"
@@ -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"
@@ -46,7 +45,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 +57,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"
@@ -86,7 +85,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 +105,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 +118,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 e235e00b98f..60c3722b934 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"
@@ -88,14 +85,14 @@
projectile_type = /obj/projectile/bullet/c38/dumdum
/obj/item/ammo_casing/c38/hotshot
- name = ".38 hot shot bullet casing"
- desc = "A .38 hot shot bullet casing."
+ name = ".38 hearth bullet casing"
+ desc = "A .38 hearth bullet casing."
bullet_skin = "incen"
projectile_type = /obj/projectile/bullet/c38/hotshot
/obj/item/ammo_casing/c38/iceblox
- name = ".38 iceblox bullet casing"
- desc = "A .38 iceblox bullet casing."
+ name = ".38 chilled bullet casing"
+ desc = "A .38 chilled bullet casing."
bullet_skin = "surplus"
projectile_type = /obj/projectile/bullet/c38/iceblox
diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm
index b3875292fba..4a5bd68bea4 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,12 @@
icon_state = "caseless"
caliber = "a858"
projectile_type = /obj/projectile/bullet/a858
- bullet_per_box = 20
-
-// .300 Magnum (Smile Rifle)
+ stack_size = 10
-/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
+/obj/item/ammo_casing/caseless/a858/trac
+ name = "8x58mm tracker round"
+ desc = "A 8x58mm caseless tracker round."
+ projectile_type = /obj/projectile/bullet/a858/trac
// 5.56x39mm (M-90gl Carbine & P-16)
@@ -46,23 +51,34 @@
projectile_type = /obj/projectile/bullet/a556_45
bullet_per_box = 80
-// 5.45x39mm (SKM-24v)
+// 5.56x42mm CLIP (CM82, Hydra variants)
-/obj/item/ammo_casing/a545_39
- name = "5.45x39mm bullet casing"
- desc = "A 5.45x39mm bullet casing."
+/obj/item/ammo_casing/a556_42
+ name = "5.56x42mm CLIP bullet casing"
+ desc = "A 5.56x42mm CLIP 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
+ caliber = "5.56x42mm"
+ projectile_type = /obj/projectile/bullet/a556_42
+ stack_size = 15
+
+/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/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,23 +88,25 @@
icon_state = "rifle-brass"
caliber = "7.62x40mm"
projectile_type = /obj/projectile/bullet/a762_40
- bullet_per_box = 80
-
-// .300 Blackout (Polymer Survivor Rifle)
-
-/obj/item/ammo_casing/aac_300blk
- name = ".300 BLK bullet casing"
- desc = "A .300 Blackout bullet casing."
- icon_state = "rifle-steel"
- caliber = ".300 BLK"
- projectile_type = /obj/projectile/bullet/aac_300blk
- bullet_per_box = 20
-
-/obj/item/ammo_casing/aac_300blk/recycled
- name = "recycled .300 BLK bullet casing"
- desc = "A recycled .300 Blackout bullet casing."
- caliber = ".300 BLK"
- projectile_type = /obj/projectile/bullet/aac_300blk
+ 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)
@@ -98,12 +116,26 @@
icon_state = "rifle-brass"
caliber = ".308"
projectile_type = /obj/projectile/bullet/a308
- bullet_per_box = 20
+ stack_size = 10
+
+/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 = ".229 Eoehoma caseless bullet casing"
- desc = "A .229 Eoehoma caseless bullet casing."
+ 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
+ stack_size = 15
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index 9f6a8c169ec..1a2590a5b36 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'
@@ -46,6 +45,13 @@
icon_state = "incendiary"
projectile_type = /obj/projectile/bullet/incendiary/shotgun
+/obj/item/ammo_casing/shotgun/blank
+ name = "blank shell"
+ desc = "A shell packed with powder but no projectile."
+ icon_state = "blank"
+ projectile_type = /obj/projectile/bullet/pellet/blank
+ custom_materials = list(/datum/material/iron=250)
+
/obj/item/ammo_casing/shotgun/improvised
name = "improvised shell"
desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
diff --git a/code/modules/projectiles/ammunition/ballistic/smg.dm b/code/modules/projectiles/ammunition/ballistic/smg.dm
index 74bb35b1ec2..1c0b13fdd36 100644
--- a/code/modules/projectiles/ammunition/ballistic/smg.dm
+++ b/code/modules/projectiles/ammunition/ballistic/smg.dm
@@ -21,6 +21,69 @@
projectile_type = /obj/projectile/bullet/incendiary/c46x30mm
bullet_per_box = 50
+// 5.7x39mm (Asp and Sidewinder)
+
+/obj/item/ammo_casing/c57x39mm
+ name = "5.7x39mm bullet casing"
+ desc = "A 5.7x39mm bullet casing."
+ icon_state = "rifle-steel"
+ caliber = "5.7x39mm"
+ projectile_type = /obj/projectile/bullet/c57x39mm
+
+/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)
+
+/obj/item/ammo_casing/c46x30mm
+ name = "4.6x30mm bullet casing"
+ desc = "A 4.6x30mm bullet casing."
+ icon_state = "rifle-brass"
+ caliber = "4.6x30mm"
+ projectile_type = /obj/projectile/bullet/c46x30mm
+ 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"
+ desc = "A 4.6x30mm armor-piercing bullet casing."
+ bullet_skin = "ap"
+ projectile_type = /obj/projectile/bullet/c46x30mm/ap
+
+/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)
/obj/item/ammo_casing/caseless/c47x33mm
@@ -29,7 +92,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 e4b668c2228..d481f4d74d5 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 0051680fd1e..3c71d31eb5e 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/caseless/rocket.dm b/code/modules/projectiles/ammunition/caseless/rocket.dm
index 9ebb6d88f2d..3eccf800def 100644
--- a/code/modules/projectiles/ammunition/caseless/rocket.dm
+++ b/code/modules/projectiles/ammunition/caseless/rocket.dm
@@ -8,7 +8,7 @@
/obj/item/ammo_casing/caseless/rocket/hedp
name = "\improper PM-9HEDP"
- desc = "An 84mm High Explosive Dual Purpose rocket. Pointy end toward mechs."
+ desc = "An 84mm High Explosive Dual Purpose rocket. Pointy end toward armor."
caliber = "84mm"
icon_state = "84mm-hedp"
projectile_type = /obj/projectile/bullet/a84mm
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index d0334e8d8ac..a256a34270c 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -2,10 +2,19 @@
projectile_type = /obj/projectile/beam/laser
select_name = "kill"
+/obj/item/ammo_casing/energy/laser/slug
+ projectile_type = /obj/projectile/beam/laser/slug
+ select_name = "slug"
+ delay = 0.9 SECONDS
+ fire_sound = 'sound/weapons/gun/laser/cs-fire.ogg'
+
/obj/item/ammo_casing/energy/laser/eoehoma
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 +37,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
@@ -48,15 +57,16 @@
/obj/item/ammo_casing/energy/laser/scatter
projectile_type = /obj/projectile/beam/scatter
- pellets = 5
- variance = 25
+ pellets = 10
+ variance = 40
+ e_cost = 1598 //12 shots upgraded cell, 6 with normal cell
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
@@ -169,6 +179,11 @@
impact_light_range = 2.5
impact_light_color_override = COLOR_CYAN
+/obj/projectile/beam/hitscan/disabler/heavy
+ damage = 30
+ armour_penetration = -10
+
+
/obj/item/ammo_casing/energy/laser/minigun
select_name = "kill"
projectile_type = /obj/projectile/beam/weak/penetrator
diff --git a/code/modules/projectiles/ammunition/energy/lmg.dm b/code/modules/projectiles/ammunition/energy/lmg.dm
index 434b29a1d3f..632fb35785c 100644
--- a/code/modules/projectiles/ammunition/energy/lmg.dm
+++ b/code/modules/projectiles/ammunition/energy/lmg.dm
@@ -15,13 +15,13 @@
/obj/item/ammo_casing/energy/csour
projectile_type = /obj/projectile/bullet/csour
select_name = "sour"
- fire_sound = 'sound/weapons/gun/shotgun/shot_old.ogg'
+ fire_sound = 'sound/weapons/gun/shotgun/shot.ogg'
e_cost = 50
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect
/obj/item/ammo_casing/energy/csweet
projectile_type = /obj/projectile/bullet/csweet
select_name = "sweet"
- fire_sound = 'sound/weapons/gun/sniper/shot_old.ogg'
+ fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
e_cost = 70
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect
diff --git a/code/modules/projectiles/ammunition/energy/plasma.dm b/code/modules/projectiles/ammunition/energy/plasma.dm
index 00de4a90ffe..d593086157f 100644
--- a/code/modules/projectiles/ammunition/energy/plasma.dm
+++ b/code/modules/projectiles/ammunition/energy/plasma.dm
@@ -2,10 +2,9 @@
projectile_type = /obj/projectile/plasma
select_name = "plasma burst"
fire_sound = 'sound/weapons/plasma_cutter.ogg'
- delay = 15
- e_cost = 25
+ delay = 30
+ e_cost = 100
/obj/item/ammo_casing/energy/plasma/adv
projectile_type = /obj/projectile/plasma/adv
- delay = 10
- e_cost = 10
+ delay = 20
diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm
index 1f74196eb83..1d9eda15866 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 3b1bdbc6eb1..9606536d9f6 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,12 +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)
- if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 1 SECONDS, attacking_box)))
+ 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)
@@ -114,17 +142,37 @@
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)
+ . = ..()
+ var/num_loaded = 0
+ var/obj/item/storage/belt/bandolier/to_load
+ if(istype(target,/obj/item/storage/belt/bandolier))
+ to_load = target
+ var/datum/component/storage/storage_to_load = to_load.GetComponent(/datum/component/storage)
+ for(var/obj/item/ammo_casing/casing_to_insert in stored_ammo)
+ if(!((to_load.contents.len >= storage_to_load.get_max_volume()) || do_after(user, 0.5 SECONDS, src)))
+ break
+ if(!storage_to_load.can_be_inserted(casing_to_insert,TRUE,user))
+ break
+ storage_to_load.handle_item_insertion(casing_to_insert,TRUE,user)
+ stored_ammo -= casing_to_insert
+ playsound(get_turf(src), 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE)
+ num_loaded++
+ update_ammo_count()
+ 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)
@@ -135,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
@@ -198,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
@@ -206,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 955856704ac..00000000000
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ /dev/null
@@ -1,506 +0,0 @@
-// .357 Speed Loaders (Syndicate Revolver)
-
-/obj/item/ammo_box/a357
- name = "speed loader (.357)"
- desc = "A 7-round speed loader for quickly reloading .357 revolvers. These rounds do good damage with average performance against armor."
- icon_state = "speedloader_357-7"
- base_icon_state = "speedloader_357"
- ammo_type = /obj/item/ammo_casing/a357
- caliber = ".357"
- max_ammo = 7
- 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 7-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 7-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 = 12
-
-/obj/item/ammo_box/a4570/match
- name = "ammo box (.45-70 match)"
- 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"
- ammo_type = /obj/item/ammo_casing/a4570/match
-
-
-/obj/item/ammo_box/a4570/hp
- name = "ammo box (.45-70 hollow point)"
- 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"
- ammo_type = /obj/item/ammo_casing/a4570/hp
-
-/obj/item/ammo_box/a4570/explosive
- name = "ammo box (.45-70 explosive)"
- 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"
- 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 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 (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
-
-// .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
-
-
-// .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
-// .300 Blackout Stripper Clip (Polymer Survivor Rifle)
-
-/obj/item/ammo_box/aac_300blk_stripper
- name = "stripper clip (.300 BLK)"
- desc = "A 5-round stripper clip for makeshift bolt-action rifles. These rounds do good damage with good armor penetration."
- icon_state = "300m"
- ammo_type = /obj/item/ammo_casing/aac_300blk
- caliber = ".300 BLK"
- max_ammo = 5
- multiple_sprites = AMMO_BOX_PER_BULLET
- w_class = WEIGHT_CLASS_TINY
- instant_load = 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/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/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/c9mm/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/a308
- name = "ammo box (.308)"
- icon_state = "a308box"
- ammo_type = /obj/item/ammo_casing/a308
- max_ammo = 30
-
-/obj/item/ammo_box/a308/hunterspride //just an alternative graphic for srm ships
- icon_state = "a308box-HP"
-
-/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/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 = 20
-
-/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/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
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 00000000000..5e4b1ae7e7f
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_loaders.dm
@@ -0,0 +1,182 @@
+// .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/empty
+ start_empty = 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/amagpellet_claris/empty
+ start_empty = 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 00000000000..f1e84780cb1
--- /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 00000000000..453a6bacb4d
--- /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 00000000000..a64e075dfa8
--- /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 00000000000..4b50912e5e1
--- /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 00000000000..871c25d84af
--- /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 00000000000..5a783652a7e
--- /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 00000000000..921bbd5c06a
--- /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 00000000000..ddcf1f8b12e
--- /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 00000000000..e11ed44dcec
--- /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 00000000000..5b9e3218b50
--- /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/gauss.dm b/code/modules/projectiles/boxes_magazines/external/gauss.dm
index d2edfc4aac9..8095cd390eb 100644
--- a/code/modules/projectiles/boxes_magazines/external/gauss.dm
+++ b/code/modules/projectiles/boxes_magazines/external/gauss.dm
@@ -7,6 +7,9 @@
max_ammo = 24
multiple_sprites = AMMO_BOX_FULL_EMPTY
+/obj/item/ammo_box/magazine/gauss/empty
+ start_empty = TRUE
+
/obj/item/ammo_box/magazine/modelh
name = "Model H magazine (ferromagnetic slugs)"
desc = "A 10-round magazine for the Model H pistol. Ferromagnetic slugs are slow and incredibly powerful bullets, but are easily stopped by even a sliver of armor."
@@ -31,3 +34,6 @@
/obj/item/ammo_box/magazine/gar/update_icon()
. = ..()
icon_state = "gar-mag-[!!ammo_count()]"
+
+/obj/item/ammo_box/magazine/gar/empty
+ start_empty = TRUE
diff --git a/code/modules/projectiles/boxes_magazines/external/lmg.dm b/code/modules/projectiles/boxes_magazines/external/lmg.dm
index fdf1b7985b2..e69de29bb2d 100644
--- a/code/modules/projectiles/boxes_magazines/external/lmg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/lmg.dm
@@ -1,33 +0,0 @@
-/obj/item/ammo_box/magazine/mm712x82
- name = "box magazine (7.12x82mm)"
- desc = "A 50-round box magazine for the L6 SAW machine gun. These rounds do moderate damage with significant armor penetration."
- icon_state = "a762-100"
- base_icon_state = "a762"
- ammo_type = /obj/item/ammo_casing/mm712x82
- caliber = "7.12x82mm"
- max_ammo = 100
- w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/ammo_box/magazine/mm712x82/hollow
- name = "box magazine (7.12x82mm HP)"
- desc = "A 50-round box magazine for the L6 SAW machine gun. These hollow point rounds do incredible damage against soft targets, but struggle against armored ones."
- ammo_type = /obj/item/ammo_casing/mm712x82/hp
-
-/obj/item/ammo_box/magazine/mm712x82/ap
- name = "box magazine (7.12x82mm AP)"
- desc = "A 50-round box magazine for the L6 SAW machine gun. These armor-piercing rounds are nearly perfect at piercing protective equipment."
- ammo_type = /obj/item/ammo_casing/mm712x82/ap
-
-/obj/item/ammo_box/magazine/mm712x82/inc
- name = "box magazine (7.12x82mm incendiary)"
- desc = "A 50-round box magazine for the L6 SAW machine gun. These incendiary rounds deal mediocre damage, but leave flaming trails which set targets ablaze."
- ammo_type = /obj/item/ammo_casing/mm712x82/inc
-
-/obj/item/ammo_box/magazine/mm712x82/match
- name = "box magazine (7.12x82mm match)"
- desc = "A 50-round box magazine for the L6 SAW machine gun. These match rounds travel quicker with incredible armor penetration. Can also ricochet off targets."
- ammo_type = /obj/item/ammo_casing/mm712x82/match
-
-/obj/item/ammo_box/magazine/mm712x82/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[round(ammo_count(), 20)]"
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index 8a179248571..1ca6c0e62a5 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -1,35 +1,37 @@
-/obj/item/ammo_box/magazine/m10mm
- name = "pistol magazine (10mm)"
- desc = "An 8-round single-stack magazine for the stechkin pistol. These rounds do moderate damage, but struggle against armor."
- icon_state = "stechkin_mag-1"
- base_icon_state = "stechkin_mag"
- ammo_type = /obj/item/ammo_casing/c10mm
- caliber = "10mm"
- max_ammo = 8
- multiple_sprites = AMMO_BOX_FULL_EMPTY
-
-/obj/item/ammo_box/magazine/m10mm/empty
- start_empty = TRUE
-
-/obj/item/ammo_box/magazine/m10mm/inc
- name = "pistol magazine (10mm incendiary)"
- desc = "An 8-round single-stack magazine for the stechkin pistol. These incendiary rounds deal mediocre damage, but leave flaming trails which set targets ablaze."
- ammo_type = /obj/item/ammo_casing/c10mm/inc
-
-/obj/item/ammo_box/magazine/m10mm/hp
- name = "pistol magazine (10mm HP)"
- desc = "An 8-round single-stack magazine for the stechkin pistol. These hollow point rounds do incredible damage against soft targets, but are nearly ineffective against armored ones."
- ammo_type = /obj/item/ammo_casing/c10mm/hp
-
-/obj/item/ammo_box/magazine/m10mm/ap
- name = "pistol magazine (10mm AP)"
- desc = "An 8-round single-stack magazine for the stechkin pistol. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power."
- ammo_type = /obj/item/ammo_casing/c10mm/ap
-
-/obj/item/ammo_box/magazine/m10mm/rubber
- name = "pistol magazine (10mm rubber)"
- desc = "An 8-round handgun magazine for the stechkin pistol. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
- ammo_type = /obj/item/ammo_casing/c10mm/rubber
+// REMAPPED: /obj/item/ammo_box/magazine/m10mm -> /obj/item/ammo_box/magazine/m10mm_ringneck
+
+// /obj/item/ammo_box/magazine/m10mm
+// name = "pistol magazine (10mm)"
+// desc = "An 8-round single-stack magazine for the stechkin pistol. These rounds do moderate damage, but struggle against armor."
+// icon_state = "stechkin_mag-1"
+// base_icon_state = "stechkin_mag"
+// ammo_type = /obj/item/ammo_casing/c10mm
+// caliber = "10mm"
+// max_ammo = 8
+// multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+// /obj/item/ammo_box/magazine/m10mm/empty
+// start_empty = TRUE
+
+// /obj/item/ammo_box/magazine/m10mm/inc
+// name = "pistol magazine (10mm incendiary)"
+// desc = "An 8-round single-stack magazine for the stechkin pistol. These incendiary rounds deal mediocre damage, but leave flaming trails which set targets ablaze."
+// ammo_type = /obj/item/ammo_casing/c10mm/inc
+
+// /obj/item/ammo_box/magazine/m10mm/hp
+// name = "pistol magazine (10mm HP)"
+// desc = "An 8-round single-stack magazine for the stechkin pistol. These hollow point rounds do incredible damage against soft targets, but are nearly ineffective against armored ones."
+// ammo_type = /obj/item/ammo_casing/c10mm/hp
+
+// /obj/item/ammo_box/magazine/m10mm/ap
+// name = "pistol magazine (10mm AP)"
+// desc = "An 8-round single-stack magazine for the stechkin pistol. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power."
+// ammo_type = /obj/item/ammo_casing/c10mm/ap
+
+// /obj/item/ammo_box/magazine/m10mm/rubber
+// name = "pistol magazine (10mm rubber)"
+// desc = "An 8-round handgun magazine for the stechkin pistol. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
+// ammo_type = /obj/item/ammo_casing/c10mm/rubber
/obj/item/ammo_box/magazine/m45
name = "pistol magazine (.45)"
@@ -43,10 +45,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)"
@@ -67,19 +65,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."
@@ -102,40 +87,8 @@
else
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."
- ammo_type = /obj/item/ammo_casing/c9mm/hp
-
-/obj/item/ammo_box/magazine/co9mm/ap
- name = "pistol magazine (9mm AP)"
- desc= "A 10-round double-stack magazine for standard-issue 9mm pistols. 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/co9mm/rubber
- name = "pistol magazine (9mm rubber)"
- desc = "A 10-round double-stack magazine for standard-issue 9mm pistols. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
- ammo_type = /obj/item/ammo_casing/c9mm/rubber
-
-/obj/item/ammo_box/magazine/co9mm/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[ammo_count() == 1 ? 1 : round(ammo_count(),2)]"
-
-/obj/item/ammo_box/magazine/pistolm9mm
- name = "large pistol magazine (9mm)"
- desc = "A long, 15-round double-stack magazine designed for the stechkin APS pistol. These rounds do okay damage, but struggle against armor."
- icon_state = "stechkin_mag-1"
- base_icon_state = "stechkin_mag"
- ammo_type = /obj/item/ammo_casing/c9mm
- caliber = "9mm"
- max_ammo = 15
- multiple_sprites = AMMO_BOX_FULL_EMPTY
+/obj/item/ammo_box/magazine/pistol556mm/empty
+ start_empty = TRUE
/obj/item/ammo_box/magazine/m50
name = "handgun magazine (.50 AE)"
@@ -165,14 +118,3 @@
caliber = "9mm"
max_ammo = 4
custom_materials = list(/datum/material/iron = 20000)
-
-/obj/item/ammo_box/magazine/m22lr
- name = "pistol magazine (.22 LR)"
- desc = "A single-stack handgun magazine designed to chamber .22 LR. It's rather tiny, all things considered."
- icon_state = "himehabu_mag-10"
- base_icon_state = "himehabu_mag"
- ammo_type = /obj/item/ammo_casing/c22lr
- caliber = "22lr"
- max_ammo = 10
- w_class = WEIGHT_CLASS_TINY
- multiple_sprites = AMMO_BOX_PER_BULLET
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
index 1066e5b7ef2..7cb2137615b 100644
--- a/code/modules/projectiles/boxes_magazines/external/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -1,25 +1,13 @@
-/obj/item/ammo_box/magazine/m10mm/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/rifle/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[ammo_count() ? "8" : "0"]"
-
-/obj/item/ammo_box/magazine/m556
- name = "toploader magazine (5.56x45mm)"
- desc = "An advanced, 30-round toploading magazine for the M-90gl Carbine. These rounds do moderate damage with good armor penetration."
- icon_state = "5.56m-1"
- base_icon_state = "5.56m"
- ammo_type = /obj/item/ammo_casing/a556_39
- caliber = "5.56x45mm"
- max_ammo = 30
- multiple_sprites = AMMO_BOX_FULL_EMPTY
+// REMAPPED: /obj/item/ammo_box/magazine/m556 -> /obj/item/ammo_box/magazine/m556_42_hydra
+// /obj/item/ammo_box/magazine/m556
+// name = "toploader magazine (5.56x45mm)"
+// desc = "An advanced, 30-round toploading magazine for the M-90gl Carbine. These rounds do moderate damage with good armor penetration."
+// icon_state = "5.56m-1"
+// base_icon_state = "5.56m"
+// ammo_type = /obj/item/ammo_casing/a556_39
+// caliber = "5.56x45mm"
+// max_ammo = 30
+// multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/rifle47x33mm
name = "\improper Solarian LMG magazine (4.73x33mm caseless)"
@@ -35,7 +23,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 +33,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."
@@ -56,7 +47,7 @@
multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/skm_762_40/empty
- start_empty = FALSE
+ start_empty = TRUE
/obj/item/ammo_box/magazine/skm_762_40/extended
name = "extended assault rifle magazine (7.62x40mm CLIP)"
@@ -76,14 +67,16 @@
/obj/item/ammo_box/magazine/ebr
name = "battle rifle magazine (.308)"
desc = "A small, 10-round steel magazine for the M514 EBR. These rounds do good damage with significant armor penetration."
- icon_state = "ebr_mag"
+ icon_state = "gal_mag-1"
+ base_icon_state = "gal_mag"
ammo_type = /obj/item/ammo_casing/a308
caliber = ".308"
max_ammo = 10
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
-/obj/item/ammo_box/magazine/ebr/update_icon_state()
- . = ..()
- icon_state = "ebr_mag-[!!ammo_count()]"
+// /obj/item/ammo_box/magazine/ebr/update_icon_state()
+// . = ..()
+// icon_state = "ebr_mag-[!!ammo_count()]"
/obj/item/ammo_box/magazine/gal
name = "\improper GAL Magazine (.308)"
@@ -95,13 +88,26 @@
max_ammo = 10
multiple_sprites = AMMO_BOX_FULL_EMPTY
-/obj/item/ammo_box/magazine/p16
- name = "assault rifle magazine (5.56x45mm)"
- desc = "A simple, 30-round magazine for 5.56x45mm assault rifles. These rounds do moderate damage with good armor penetration."
+/obj/item/ammo_box/magazine/f4_308
+ name = "\improper F4 Magazine (.308)"
+ desc = "A standard 10-round magazine for F4 platform DMRs. These rounds do good damage with significant armor penetration."
+ icon_state = "gal_mag-1"
+ base_icon_state = "gal_mag"
+ ammo_type = /obj/item/ammo_casing/a308
+ caliber = ".308"
+ max_ammo = 10
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/f4_308/empty
+ start_empty = TRUE
+
+/obj/item/ammo_box/magazine/p16 //repath to /obj/item/ammo_box/magazine/generic_556 sometime
+ name = "assault rifle magazine (5.56x42mm CLIP)"
+ desc = "A simple, 30-round magazine for 5.56x42mm CLIP assault rifles. These rounds do moderate damage with good armor penetration."
icon_state = "p16_mag-1"
base_icon_state = "p16_mag"
- ammo_type = /obj/item/ammo_casing/a556_39
- caliber = "5.56x45mm"
+ ammo_type = /obj/item/ammo_casing/a556_42
+ caliber = "5.56x42mm"
max_ammo = 30
multiple_sprites = AMMO_BOX_FULL_EMPTY
@@ -109,17 +115,17 @@
start_empty = TRUE
/obj/item/ammo_box/magazine/swiss
- name = "\improper Swiss Cheese Magazine (5.56x45mm)"
+ name = "\improper Swiss Cheese Magazine (5.56x42mm CLIP)"
desc = "A deft, 30-round magazine for the Swiss Cheese assault rifle. These rounds do moderate damage with good armor penetration."
icon_state = "swissmag-1"
base_icon_state = "swissmag"
- ammo_type = /obj/item/ammo_casing/a556_39
- caliber = "5.56x45mm"
+ ammo_type = /obj/item/ammo_casing/a556_42
+ caliber = "5.56x42mm"
max_ammo = 30
multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/e40
- name = "E-40 magazine (.229 Eoehoma caseless)"
+ name = "E-40 magazine (.299 Eoehoma caseless)"
icon_state = "e40_mag-1"
base_icon_state = "e40_mag"
ammo_type = /obj/item/ammo_casing/caseless/c299
diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
index 3c9aaad1f6f..60d09eef0fd 100644
--- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
@@ -1,43 +1,4 @@
-/obj/item/ammo_box/magazine/m12g
- name = "shotgun drum magazine (12g buckshot)"
- desc = "A bulky 8-round drum designed for the Bulldog shotgun and it's derivatives."
- icon_state = "bulldog_drum-1"
- base_icon_state = "bulldog_drum"
- ammo_type = /obj/item/ammo_casing/shotgun/buckshot
- caliber = "12ga"
- max_ammo = 8
- w_class = WEIGHT_CLASS_NORMAL
- multiple_sprites = AMMO_BOX_FULL_EMPTY
-
-/obj/item/ammo_box/magazine/m12g/stun
- name = "shotgun drum magazine (12g taser slugs)"
- ammo_type = /obj/item/ammo_casing/shotgun/stunslug
-
-/obj/item/ammo_box/magazine/m12g/slug
- name = "shotgun drum magazine (12g slugs)"
- ammo_type = /obj/item/ammo_casing/shotgun
-
-/obj/item/ammo_box/magazine/m12g/dragon
- name = "shotgun drum magazine (12g dragon's breath)"
- ammo_type = /obj/item/ammo_casing/shotgun/dragonsbreath
-
-/obj/item/ammo_box/magazine/m12g/bioterror
- name = "shotgun drum magazine (12g bioterror)"
- ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
-
-/obj/item/ammo_box/magazine/m12g/meteor
- name = "shotgun drum magazine (12g meteor slugs)"
- ammo_type = /obj/item/ammo_casing/shotgun/meteorslug
-
-/obj/item/ammo_box/magazine/m12g/small //shouldnt this be the parrent intsead of the drum
- name = "shotgun box magazine (12g buckshot)"
- desc = "A single-stack, 6-round box magazine for the Bulldog shotgun and it's derivatives."
- icon_state = "bulldog_mag-1"
- base_icon_state = "bulldog_mag"
- max_ammo = 6
- w_class = WEIGHT_CLASS_SMALL //Smaller, holds less
-
-/obj/item/ammo_box/magazine/cm15_mag
+/obj/item/ammo_box/magazine/cm15_12g
name = "CM-15 magazine (12g buckshot)"
desc = "An almost straight, 8-round magazine designed for the CM-15 shotgun."
icon_state = "cm15_mag-1"
@@ -46,3 +7,12 @@
caliber = "12ga"
max_ammo = 8
multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/cm15_12g/empty
+ start_empty = TRUE
+
+/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 4c464c0433d..3dd56fa73db 100644
--- a/code/modules/projectiles/boxes_magazines/external/smg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -28,19 +28,6 @@
base_icon_state = "46x30mmtI"
ammo_type = /obj/item/ammo_casing/c46x30mm/inc
-/obj/item/ammo_box/magazine/uzim9mm
- name = "long SMG magazine (9mm)"
- desc = "A thin, 32-round magazine for the Uzi SMG. These rounds do okay damage, but struggle against armor."
- icon_state = "uzi9mm-32"
- base_icon_state = "uzi9mm"
- ammo_type = /obj/item/ammo_casing/c9mm
- caliber = "9mm"
- max_ammo = 32
-
-/obj/item/ammo_box/magazine/uzim9mm/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[round(ammo_count(),4)]"
-
/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."
@@ -54,6 +41,9 @@
. = ..()
icon_state = "[base_icon_state]-[ammo_count() ? 42 : 0]"
+/obj/item/ammo_box/magazine/smgm9mm/empty
+ start_empty = TRUE
+
/obj/item/ammo_box/magazine/smgm9mm/ap
name = "SMG magazine (9mm AP)"
desc = "A 30-round magazine for 9mm submachine guns. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power."
@@ -82,12 +72,15 @@
. = ..()
icon_state = "[base_icon_state]-[ammo_count() == 1 ? 1 : round(ammo_count(),3)]"
+/obj/item/ammo_box/magazine/smgm10mm/empty
+ start_empty = TRUE
+
/obj/item/ammo_box/magazine/smgm10mm/rubber
name = "SMG magazine (10mm rubber)"
desc = "A 24-round magazine for the SkM-44(k). These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
ammo_type = /obj/item/ammo_casing/c10mm/rubber
-/obj/item/ammo_box/magazine/smgm45
+/obj/item/ammo_box/magazine/m45_cobra
name = "SMG magazine (.45)"
desc = "A 24-round magazine for .45 submachine guns. These rounds do moderate damage, but struggle against armor."
icon_state = "c20r45-24"
@@ -96,17 +89,17 @@
caliber = ".45"
max_ammo = 24
-/obj/item/ammo_box/magazine/smgm45/update_icon_state() //This is stupid (whenever ammo is spent, it updates the icon path)
+/obj/item/ammo_box/magazine/m45_cobra/update_icon_state() //This is stupid (whenever ammo is spent, it updates the icon path)
. = ..()
icon_state = "c20r45-[round(ammo_count(),2)]"
-/obj/item/ammo_box/magazine/smgm45/empty
+/obj/item/ammo_box/magazine/m45_cobra/empty
start_empty = TRUE
/obj/item/ammo_box/magazine/c45_firestorm_mag
name = "stick magazine (.45)"
desc = "A 28-round stick magazine for the toploading Firestorm submachine gun. These rounds do moderate damage, but struggle against armor."
- icon_state = "firestorm_mag"
+ icon_state = "firestorm_mag-1"
base_icon_state = "firestorm_mag"
ammo_type = /obj/item/ammo_casing/c45
caliber = ".45"
@@ -116,21 +109,17 @@
. = ..()
icon_state = "firestorm_mag-[!!ammo_count()]"
+/obj/item/ammo_box/magazine/c45_firestorm_mag/empty
+ start_empty = TRUE
+
/obj/item/ammo_box/magazine/c45_firestorm_mag/pan
name = "pan magazine (.45)"
desc = "A bulky, 50-round pan magazine for the toploading Firestorm submachine gun. These rounds struggle against armor, but with this many you could cut anyone down regardless."
icon_state = "firestorm_pan"
+ base_icon_state = "firestorm_pan"
max_ammo = 50
w_class = WEIGHT_CLASS_NORMAL
/obj/item/ammo_box/magazine/c45_firestorm_mag/pan/update_icon_state() //Causes the mag to NOT inherit the parent's update_icon oooh the misery
. = ..()
icon_state = "firestorm_pan"
-
-/obj/item/ammo_box/magazine/tec9
- name = "machine pistol magazine (9mm AP)"
- desc = "A sizable 20-round magazine for the TEC-9 machine pistol. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power.."
- icon_state = "tec_mag"
- ammo_type = /obj/item/ammo_casing/c9mm/ap
- caliber = "9mm"
- max_ammo = 20
diff --git a/code/modules/projectiles/boxes_magazines/external/toy.dm b/code/modules/projectiles/boxes_magazines/external/toy.dm
index 608faa67a97..c3cbecfcc48 100644
--- a/code/modules/projectiles/boxes_magazines/external/toy.dm
+++ b/code/modules/projectiles/boxes_magazines/external/toy.dm
@@ -21,46 +21,10 @@
/obj/item/ammo_box/magazine/toy/pistol
name = "foam force pistol magazine"
desc = "A toy pistol magazine designed to fit harmless foam darts."
- icon_state = "stechkin_mag-1"
- base_icon_state = "stechkin_mag"
+ icon_state = "toy_magazine-1"
+ base_icon_state = "toy_magazine"
max_ammo = 8
multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/toy/pistol/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
-
-/obj/item/ammo_box/magazine/toy/smgm45
- name = "donksoft SMG magazine"
- desc = "A toy submachine gun magazine designed to fit harmless foam darts."
- icon_state = "c20r45-toy"
- base_icon_state = "c20r45"
- caliber = "foam_force"
- ammo_type = /obj/item/ammo_casing/caseless/foam_dart
- max_ammo = 20
-
-/obj/item/ammo_box/magazine/toy/smgm45/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[round(ammo_count(), 2)]"
-
-/obj/item/ammo_box/magazine/toy/smgm45/riot
- icon_state = "c20r45-riot"
- desc = "A toy submachine gun magazine designed to fit legally-harmless riot control darts."
- ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
-
-/obj/item/ammo_box/magazine/toy/m762
- name = "donksoft box magazine"
- desc = "A huge toy LMG magazine designed to fit vast quantities of harmless foam darts."
- icon_state = "a762-100"
- base_icon_state = "a762"
- caliber = "foam_force"
- ammo_type = /obj/item/ammo_casing/caseless/foam_dart
- max_ammo = 50
- w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/ammo_box/magazine/toy/m762/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[round(ammo_count(), 10)]"
-
-/obj/item/ammo_box/magazine/toy/m762/riot
- desc = "A huge toy LMG magazine designed to fit vast quantities of legally-harmless riot control darts."
- ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
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 2c88824623e..00000000000
--- 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/_cylinder.dm b/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm
index 658eef2d781..a4282a40a9e 100644
--- a/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm
@@ -2,7 +2,7 @@
name = "revolver cylinder"
ammo_type = /obj/item/ammo_casing/a357
caliber = ".357"
- max_ammo = 7
+ max_ammo = 6
instant_load = TRUE
/obj/item/ammo_box/magazine/internal/cylinder/get_round(keep = FALSE, counter_clockwise = FALSE)
diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
index 4f2f8c53795..e179fbfa903 100644
--- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
@@ -22,8 +22,8 @@
/obj/item/ammo_box/magazine/internal/boltaction/polymer
name = "polymer bolt action rifle internal magazine"
- ammo_type = /obj/item/ammo_casing/aac_300blk
- caliber = ".300 BLK"
+ ammo_type = /obj/item/ammo_casing/a762_40
+ caliber = "7.62x40mm"
max_ammo = 5
/obj/item/ammo_box/magazine/internal/vickland
diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
index 29717fd9408..f797d5b4ee5 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
@@ -52,6 +42,18 @@
caliber = ".38"
max_ammo = 12
+/obj/item/ammo_box/magazine/internal/shot/winchester/absolution
+ name = "absolution internal magazine"
+ ammo_type = /obj/item/ammo_casing/a357
+ caliber = ".357"
+ max_ammo = 8
+
+/obj/item/ammo_box/magazine/internal/shot/winchester/conflagration
+ name = "conflagration internal magazine"
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+ caliber = "12ga"
+ max_ammo = 5
+
/obj/item/ammo_box/magazine/internal/shot/beacon
name = "beacon internal magazine"
ammo_type = /obj/item/ammo_casing/a4570
@@ -59,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 b92b79e0009..64d643304bd 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -4,6 +4,8 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "flatgun"
item_state = "gun"
+ lefthand_file = GUN_LEFTHAND_ICON
+ righthand_file = GUN_RIGHTHAND_ICON
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
custom_materials = list(/datum/material/iron=2000)
@@ -16,101 +18,191 @@
attack_verb = list("struck", "hit", "bashed")
pickup_sound = 'sound/items/handling/gun_pickup.ogg'
drop_sound = 'sound/items/handling/gun_drop.ogg'
+ //trigger guard on the weapon, hulks can't fire them with their big meaty fingers
+ trigger_guard = TRIGGER_GUARD_NORMAL
+
+ light_system = MOVABLE_LIGHT_DIRECTIONAL
- /// The manufacturer of this weapon. For flavor mostly. If none, this will not show.
+ ///The manufacturer of this weapon. For flavor mostly. If none, this will not show.
var/manufacturer = MANUFACTURER_NONE
+/*
+ * Muzzle
+*/
+ ///Effect for the muzzle flash of the gun.
+ var/obj/effect/muzzle_flash/muzzle_flash
+
+ light_range = 3
+ light_color = COLOR_VERY_SOFT_YELLOW
+
+ ///Icon state of the muzzle flash effect.
+ var/muzzleflash_iconstate
+
+/*
+ * Firing
+*/
var/fire_sound = 'sound/weapons/gun/pistol/shot.ogg'
var/vary_fire_sound = TRUE
var/fire_sound_volume = 50
var/dry_fire_sound = 'sound/weapons/gun/general/dry_fire.ogg'
- ///Text showed when attempting to fire with no round or empty round.
var/dry_fire_text = "click"
- ///whether or not a message is displayed when fired
- var/suppressed = null
- var/can_suppress = FALSE
+
+/*
+ * Reloading
+*/
+ var/obj/item/ammo_casing/chambered = null
+ ///Whether the gun can be tacloaded by slapping a fresh magazine directly on it
+ var/tac_reloads = TRUE
+ ///If we have the 'snowflake mechanic,' how long should it take to reload?
+ var/tactical_reload_delay = 1 SECONDS
+
+//BALLISTIC
+ ///Compatible magazines with the gun
+ 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?
+ var/empty_autoeject = FALSE
+ ///Whether the gun supports multiple special mag types
+ var/special_mags = FALSE
+
+ ///Actual magazine currently contained within the gun
+ var/obj/item/ammo_box/magazine/magazine
+ ///whether the gun ejects the chambered casing
+ var/casing_ejector = TRUE
+ ///Whether the gun has an internal magazine or a detatchable one. Overridden by BOLT_TYPE_NO_BOLT.
+ var/internal_magazine = FALSE
+ ///Whether the gun *can* be reloaded
+ var/sealed_magazine = FALSE
+
+
+ ///Phrasing of the magazine in examine and notification messages; ex: magazine, box, etx
+ var/magazine_wording = "magazine"
+ ///Phrasing of the cartridge in examine and notification messages; ex: bullet, shell, dart, etc.
+ var/cartridge_wording = "bullet"
+
+ ///sound when inserting magazine
+ var/load_sound = 'sound/weapons/gun/general/magazine_insert_full.ogg'
+ ///sound when inserting an empty magazine
+ var/load_empty_sound = 'sound/weapons/gun/general/magazine_insert_empty.ogg'
+ ///volume of loading sound
+ var/load_sound_volume = 40
+ ///whether loading sound should vary
+ var/load_sound_vary = TRUE
+ ///Sound of ejecting a magazine
+ var/eject_sound = 'sound/weapons/gun/general/magazine_remove_full.ogg'
+ ///sound of ejecting an empty magazine
+ var/eject_empty_sound = 'sound/weapons/gun/general/magazine_remove_empty.ogg'
+ ///volume of ejecting a magazine
+ var/eject_sound_volume = 40
+ ///whether eject sound should vary
+ var/eject_sound_vary = TRUE
+
+//ENERGY
+ //What type of power cell this uses
+ var/obj/item/stock_parts/cell/gun/cell
+ //Can it be charged in a recharger?
+ var/can_charge = TRUE
+ var/selfcharge = FALSE
+ var/charge_tick = 0
+ var/charge_delay = 4
+ //whether the gun's cell drains the cyborg user's cell to recharge
+ var/use_cyborg_cell = FALSE
+ //Time it takes to unscrew the cell
+ var/unscrewing_time = 2 SECONDS
+
+ ///if the gun's cell cannot be replaced
+ var/internal_cell = FALSE
+
+ var/list/ammo_type = list(/obj/item/ammo_casing/energy)
+ //The state of the select fire switch. Determines from the ammo_type list what kind of shot is fired next.
+ var/select = 1
+
+/*
+ * Operation
+*/
+ //whether or not a message is displayed when fired
+ var/suppressed = FALSE
var/suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
var/suppressed_volume = 60
- var/can_unsuppress = TRUE
- var/obj/item/ammo_casing/chambered = null
- ///trigger guard on the weapon. Used for hulk mutations and ashies. I honestly dont know how usefult his is, id avoid touching it
- trigger_guard = TRIGGER_GUARD_NORMAL
- ///Set the description of the gun to this when sawed off
- var/sawn_desc = null
- ///This triggers some sprite behavior in shotguns and prevents further sawoff, note that can_be_sawn_off is on gun/ballistic and not here, wtf.
- var/sawn_off = FALSE
- /// how many shots per burst, Ex: most machine pistols, M90, some ARs are 3rnd burst, while others like the GAR and laser minigun are 2 round burst.
- var/burst_size = 3
- ///The rate of fire when firing in a burst. Not the delay between bursts
- var/burst_delay = 0.15 SECONDS
- ///The rate of fire when firing full auto and semi auto, and between bursts; for bursts its fire delay + burst_delay after every burst
- var/fire_delay = 0.2 SECONDS
+ //true if the gun is wielded via twohanded component, shouldnt affect anything else
+ var/wielded = FALSE
+ //true if the gun is wielded after delay, should affects accuracy
+ var/wielded_fully = FALSE
+ ///Slowdown for wielding
+ var/wield_slowdown = 0.1
+ ///How long between wielding and firing in tenths of seconds
+ var/wield_delay = 0.4 SECONDS
+ ///Storing value for above
+ var/wield_time = 0
- /// after initializing, we set the firemode to this
- var/default_firemode = FIREMODE_SEMIAUTO
- ///Firemode index, due to code shit this is the currently selected firemode
- var/firemode_index
- /// Our firemodes, subtract and add to this list as needed. NOTE that the autofire component is given on init when FIREMODE_FULLAUTO is here.
- var/list/gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST, FIREMODE_FULLAUTO, FIREMODE_OTHER, FIREMODE_OTHER_TWO)
- /// A acoc list that determines the names of firemodes. Use if you wanna be weird and set the name of say, FIREMODE_OTHER to "Underbarrel grenade launcher" for example.
- var/list/gun_firenames = list(FIREMODE_SEMIAUTO = "single", FIREMODE_BURST = "burst fire", FIREMODE_FULLAUTO = "full auto", FIREMODE_OTHER = "misc. fire", FIREMODE_OTHER_TWO = "very misc. fire")
- ///BASICALLY: the little button you select firing modes from? this is jsut the prefix of the icon state of that. For example, if we set it as "laser", the fire select will use "laser_single" and so on.
- var/fire_select_icon_state_prefix = ""
- ///If true, we put "safety_" before fire_select_icon_state_prefix's prefix. ex. "safety_laser_single"
- var/adjust_fire_select_icon_state_on_safety = FALSE
+// BALLISTIC
+ ///Whether the gun has to be racked each shot or not.
+ var/semi_auto = TRUE
+ ///The bolt type of the gun, affects quite a bit of functionality, see gun.dm in defines for bolt types: BOLT_TYPE_STANDARD; BOLT_TYPE_LOCKING; BOLT_TYPE_OPEN; BOLT_TYPE_NO_BOLT
+ var/bolt_type = BOLT_TYPE_STANDARD
+ ///Used for locking bolt and open bolt guns. Set a bit differently for the two but prevents firing when true for both.
+ var/bolt_locked = FALSE
+ ///Phrasing of the bolt in examine and notification messages; ex: bolt, slide, etc.
+ var/bolt_wording = "bolt"
+ ///length between individual racks
+ var/rack_delay = 5
+ ///time of the most recent rack, used for cooldown purposes
+ var/recent_rack = 0
+
+ ///Whether the gun can be sawn off by sawing tools
+ var/can_be_sawn_off = FALSE
+ //description change if weapon is sawn-off
+ var/sawn_desc = null
+ var/sawn_off = FALSE
- ///Are we firing a burst? If so, dont fire again until burst is done
- var/currently_firing_burst = FALSE
- ///This prevents gun from firing until the coodown is done, affected by lag
- var/current_cooldown = 0
- ///affects if you can fire it unwielded or even dual wield it. LIGHT means dual wield allowed, HEAVY and higher means you have to wield to fire
+ ///sound of racking
+ var/rack_sound = 'sound/weapons/gun/general/bolt_rack.ogg'
+ ///volume of racking
+ var/rack_sound_volume = 60
+ ///whether racking sound should vary
+ var/rack_sound_vary = TRUE
+ ///sound of when the bolt is locked back manually
+ var/lock_back_sound = 'sound/weapons/gun/general/slide_lock_1.ogg'
+ ///volume of lock back
+ var/lock_back_sound_volume = 60
+ ///whether lock back varies
+ var/lock_back_sound_vary = TRUE
+
+ ///sound of dropping the bolt or releasing a slide
+ var/bolt_drop_sound = 'sound/weapons/gun/general/bolt_drop.ogg'
+ ///volume of bolt drop/slide release
+ var/bolt_drop_sound_volume = 60
+ ///empty alarm sound (if enabled)
+ var/empty_alarm_sound = 'sound/weapons/gun/general/empty_alarm.ogg'
+ ///empty alarm volume sound
+ var/empty_alarm_volume = 70
+ ///whether empty alarm sound varies
+ var/empty_alarm_vary = TRUE
+
+/*
+ * Stats
+*/
var/weapon_weight = WEAPON_LIGHT
- ///If dual wielding, add this to the spread
- var/dual_wield_spread = 24
- /// ???, no clue what this is. Original desc: //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
- var/randomspread = 1
-
- ///Alters projectile damage multiplicatively based on this value. Use it for "better" or "worse" weapons that use the same ammo.
+ //Alters projectile damage multiplicatively based on this value. Use it for "better" or "worse" weapons that use the same ammo.
var/projectile_damage_multiplier = 1
-
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
-
- var/list/attachment_options = list() //This.. works for now.. gun refactor soon
-
- var/can_flashlight = FALSE //if a flashlight can be added or removed if it already has one.
- var/obj/item/flashlight/seclite/gun_light
- var/datum/action/item_action/toggle_gunlight/alight
- var/gunlight_state = "flight"
-
- var/can_bayonet = FALSE //if a bayonet can be added or removed if it already has one.
- var/obj/item/kitchen/knife/bayonet
- var/knife_x_offset = 0
- var/knife_y_offset = 0
-
- var/ammo_x_offset = 0 //used for positioning ammo count overlay on sprite
- var/ammo_y_offset = 0
- var/flight_x_offset = 0
- var/flight_y_offset = 0
-
- //Zooming
- var/zoomable = FALSE //whether the gun generates a Zoom action on creation
- var/zoomed = FALSE //Zoom toggle
- var/zoom_amt = 3 //Distance in TURFs to move the user's screen forward (the "zoom" effect)
- var/zoom_out_amt = 0
- var/datum/action/toggle_scope_zoom/azoom
-
+ //Speed someone can be flung if its point blank
var/pb_knockback = 0
- var/wielded = FALSE // true if the gun is wielded via twohanded component, shouldnt affect anything else
-
- var/wielded_fully = FALSE // true if the gun is wielded after delay, should affects accuracy
-
+ //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
+ var/randomspread = TRUE
///How much the bullet scatters when fired while wielded.
var/spread = 4
///How much the bullet scatters when fired while unwielded.
var/spread_unwielded = 12
+ //additional spread when dual wielding
+ var/dual_wield_spread = 24
+
///Screen shake when the weapon is fired while wielded.
var/recoil = 0
@@ -121,49 +213,138 @@
///this is how much deviation the gun recoil can have, recoil pushes the screen towards the reverse angle you shot + some deviation which this is the max.
var/recoil_deviation = 22.5
- ///Slowdown for wielding
- var/wield_slowdown = 0.1
- ///How long between wielding and firing in tenths of seconds
- var/wield_delay = 0.4 SECONDS
- ///Storing value for above
- var/wield_time = 0
+ ///Used if the guns recoil is lower then the min, it clamps the highest recoil
+ var/min_recoil = 0
- ///Effect for the muzzle flash of the gun.
- var/obj/effect/muzzle_flash/muzzle_flash
- ///Icon state of the muzzle flash effect.
- var/muzzleflash_iconstate
- ///Brightness of the muzzle flash effect.
- var/muzzle_flash_lum = 3
- ///Color of the muzzle flash effect.
- var/muzzle_flash_color = COLOR_VERY_SOFT_YELLOW
+ var/gunslinger_recoil_bonus = 0
+ var/gunslinger_spread_bonus = 0
- //gun saftey
+ /// how many shots per burst, Ex: most machine pistols, M90, some ARs are 3rnd burst, while others like the GAR and laser minigun are 2 round burst.
+ var/burst_size = 3
+ ///The rate of fire when firing in a burst. Not the delay between bursts
+ var/burst_delay = 0.15 SECONDS
+ ///The rate of fire when firing full auto and semi auto, and between bursts; for bursts its fire delay + burst_delay after every burst
+ var/fire_delay = 0.2 SECONDS
+ //Prevent the weapon from firing again while already firing
+ var/firing_burst = 0
+
+/*
+ * Overlay
+*/
+ ///Used for positioning ammo count overlay on sprite
+ var/ammo_x_offset = 0
+ var/ammo_y_offset = 0
+
+//BALLISTIC
+ ///Whether the sprite has a visible magazine or not
+ var/mag_display = FALSE
+ ///Whether the sprite has a visible ammo display or not
+ var/mag_display_ammo = FALSE
+ ///Whether the sprite has a visible indicator for being empty or not.
+ var/empty_indicator = FALSE
+ ///Whether the sprite has a visible magazine or not
+ var/show_magazine_on_sprite = FALSE
+ ///Do we show how much ammo is left on the sprite? In increments of 20.
+ var/show_ammo_capacity_on_magazine_sprite = FALSE
+ ///Whether the sprite has a visible ammo display or not
+ var/show_magazine_on_sprite_ammo = FALSE
+ ///Whether the gun supports multiple special mag types
+ var/unique_mag_sprites_for_variants = FALSE
+
+//ENERGY
+ //Do we handle overlays with base update_appearance()?
+ var/automatic_charge_overlays = TRUE
+ var/charge_sections = 4
+ //if this gun uses a stateful charge bar for more detail
+ var/shaded_charge = FALSE
+ //Modifies WHOS state //im SOMEWHAT this is wether or not the overlay changes based on the ammo type selected
+ var/modifystate = TRUE
+
+/*
+ * Attachment
+*/
+ ///The types of attachments allowed, a list of types. SUBTYPES OF AN ALLOWED TYPE ARE ALSO ALLOWED
+ var/list/valid_attachments = list()
+ ///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
+ var/list/slot_offsets = list()
+
+/*
+ * Zooming
+*/
+ ///Whether the gun generates a Zoom action on creation
+ var/zoomable = FALSE
+ //Zoom toggle
+ var/zoomed = FALSE
+ ///Distance in TURFs to move the user's screen forward (the "zoom" effect)
+ var/zoom_amt = 3
+ var/zoom_out_amt = 0
+ var/datum/action/toggle_scope_zoom/azoom
+
+/*
+ * Safety
+*/
///Does this gun have a saftey and thus can toggle it?
var/has_safety = FALSE
///If the saftey on? If so, we can't fire the weapon
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)
+*/
+ ///Attachments spawned on initialization. Should also be in valid attachments or it SHOULD(once i add that) fail
+ var/list/default_attachments = list()
+
+//ENERGY
+ //set to true so the gun is given an empty cell
+ 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
+ trigger_guard = TRIGGER_GUARD_NORMAL
-/obj/item/gun/Initialize()
+ /// after initializing, we set the firemode to this
+ var/default_firemode = FIREMODE_SEMIAUTO
+ ///Firemode index, due to code shit this is the currently selected firemode
+ var/firemode_index
+ /// Our firemodes, subtract and add to this list as needed. NOTE that the autofire component is given on init when FIREMODE_FULLAUTO is here.
+ var/list/gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST, FIREMODE_FULLAUTO, FIREMODE_OTHER, FIREMODE_OTHER_TWO)
+ /// A acoc list that determines the names of firemodes. Use if you wanna be weird and set the name of say, FIREMODE_OTHER to "Underbarrel grenade launcher" for example.
+ var/list/gun_firenames = list(FIREMODE_SEMIAUTO = "single", FIREMODE_BURST = "burst fire", FIREMODE_FULLAUTO = "full auto", FIREMODE_OTHER = "misc. fire", FIREMODE_OTHER_TWO = "very misc. fire")
+ ///BASICALLY: the little button you select firing modes from? this is jsut the prefix of the icon state of that. For example, if we set it as "laser", the fire select will use "laser_single" and so on.
+ var/fire_select_icon_state_prefix = ""
+ ///If true, we put "safety_" before fire_select_icon_state_prefix's prefix. ex. "safety_laser_single"
+ var/adjust_fire_select_icon_state_on_safety = FALSE
+
+ ///Are we firing a burst? If so, dont fire again until burst is done
+ var/currently_firing_burst = FALSE
+ ///This prevents gun from firing until the coodown is done, affected by lag
+ var/current_cooldown = 0
+
+/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))
- if(gun_light)
- alight = new(src)
muzzle_flash = new(src, muzzleflash_iconstate)
build_zooming()
build_firemodes()
+ if(sawn_off)
+ sawoff(forced = TRUE)
/obj/item/gun/ComponentInitialize()
. = ..()
+ 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)
@@ -185,9 +366,6 @@
wielded_fully = TRUE
return TRUE
-/obj/item/gun/proc/is_wielded()
- return wielded
-
/// triggered on unwield of two handed item
/obj/item/gun/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
@@ -195,54 +373,34 @@
zoom(user, forced_zoom = FALSE)
user.remove_movespeed_modifier(/datum/movespeed_modifier/gun)
+/obj/item/gun/proc/is_wielded()
+ return wielded
+
/obj/item/gun/Destroy()
- if(gun_light)
- QDEL_NULL(gun_light)
- if(bayonet)
- QDEL_NULL(bayonet)
if(chambered) //Not all guns are chambered (EMP'ed energy guns etc)
QDEL_NULL(chambered)
if(azoom)
QDEL_NULL(azoom)
- if(isatom(suppressed)) //SUPPRESSED IS USED AS BOTH A TRUE/FALSE AND AS A REF, WHAT THE FUCKKKKKKKKKKKKKKKKK
- QDEL_NULL(suppressed)
if(muzzle_flash)
QDEL_NULL(muzzle_flash)
+ if(magazine)
+ QDEL_NULL(magazine)
return ..()
/obj/item/gun/handle_atom_del(atom/A)
if(A == chambered)
chambered = null
- update_appearance()
- if(A == bayonet)
- clear_bayonet()
- if(A == gun_light)
- clear_gunlight()
+ update_icon()
return ..()
/obj/item/gun/examine(mob/user)
. = ..()
- if(gun_light)
- . += "It has \a [gun_light] [can_flashlight ? "" : "permanently "]mounted on it."
- if(can_flashlight) //if it has a light and this is false, the light is permanent.
- . += "[gun_light] looks like it can be unscrewed from [src]."
- else if(can_flashlight)
- . += "It has a mounting point for a seclite."
-
- if(bayonet)
- . += "It has \a [bayonet] [can_bayonet ? "" : "permanently "]affixed to it."
- if(can_bayonet) //if it has a bayonet and this is false, the bayonet is permanent.
- . += "[bayonet] looks like it can be unscrewed from [src]."
- else if(can_bayonet)
- . += "It has a bayonet lug on it."
-
if(has_safety)
. += "The safety is [safety ? "ON" : "OFF"]. Ctrl-Click to toggle the safety."
if(manufacturer)
. += "It has [manufacturer] engraved on it."
-
/obj/item/gun/equipped(mob/living/user, slot)
. = ..()
if(zoomed && user.get_active_held_item() != src)
@@ -250,48 +408,8 @@
/obj/item/gun/attack(mob/M as mob, mob/user)
if(user.a_intent == INTENT_HARM) //Flogging
- if(bayonet)
- M.attackby(bayonet, user)
- return
- else
- return ..()
- return
-
-/obj/item/gun/attack_obj(obj/O, mob/user)
- if(user.a_intent == INTENT_HARM)
- if(bayonet)
- O.attackby(bayonet, user)
- return
- return ..()
-
-/obj/item/gun/attackby(obj/item/I, mob/user, params)
- if(user.a_intent == INTENT_HARM)
- return ..()
- else if(istype(I, /obj/item/flashlight/seclite))
- if(!can_flashlight)
- return ..()
- var/obj/item/flashlight/seclite/S = I
- if(!gun_light)
- if(!user.transferItemToLoc(I, src))
- return
- to_chat(user, "You click [S] into place on [src].")
- set_gun_light(S)
- update_gunlight()
- alight = new(src)
- if(loc == user)
- alight.Grant(user)
- else if(istype(I, /obj/item/kitchen/knife))
- var/obj/item/kitchen/knife/K = I
- if(!can_bayonet || !K.bayonet || bayonet) //ensure the gun has an attachment point available, and that the knife is compatible with it.
- return ..()
- if(!user.transferItemToLoc(I, src))
- return
- to_chat(user, "You attach [K] to [src]'s bayonet lug.")
- bayonet = K
- update_appearance()
-
- else
return ..()
+ return
//called after the gun has successfully fired its chambered ammo.
/obj/item/gun/proc/process_chamber(atom/shooter)
@@ -513,6 +631,7 @@
/obj/item/gun/proc/reset_current_cooldown()
current_cooldown = FALSE
+
/obj/item/gun/proc/shoot_with_empty_chamber(mob/living/user as mob|obj)
if(!safety)
to_chat(user, "*[dry_fire_text]*")
@@ -533,7 +652,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)
@@ -581,8 +704,8 @@
. = ..()
if(!has_safety)
return
-
- if(src != user.get_active_held_item())
+ // only checks for first level storage e.g pockets, hands, suit storage, belts, nothing in containers
+ if(!in_contents_of(user))
return
if(isliving(user) && in_range(src, user))
@@ -600,116 +723,6 @@
update_appearance()
-
-/obj/item/gun/screwdriver_act(mob/living/user, obj/item/I)
- . = ..()
- if(.)
- return
- if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
- return
- attachment_options = list()
- get_gun_attachments()
- if(LAZYLEN(attachment_options) == 1)
- remove_gun_attachments(user, I, attachment_options[1])
- else if (LAZYLEN(attachment_options))
- var/picked_option = show_radial_menu(user, src, attachment_options, radius = 38, require_near = TRUE)
- remove_gun_attachments(user, I, picked_option)
-
-/obj/item/gun/proc/get_gun_attachments()
- if(can_flashlight && gun_light)
- attachment_options += list("Light" = image(icon = gun_light.icon, icon_state = gun_light.icon_state))
- if(can_bayonet && bayonet)
- attachment_options += list("Knife" = image(icon = bayonet.icon, icon_state = bayonet.icon_state))
-
-/obj/item/gun/proc/remove_gun_attachments(mob/living/user, obj/item/I, picked_option)
- if(picked_option == "Light")
- return remove_gun_attachment(user, I, gun_light, "unscrewed")
- else if(picked_option == "Knife")
- return remove_gun_attachment(user, I, bayonet, "unfix")
-
-/obj/item/gun/proc/remove_gun_attachment(mob/living/user, obj/item/tool_item, obj/item/item_to_remove, removal_verb)
- if(tool_item)
- tool_item.play_tool_sound(src)
- to_chat(user, "You [removal_verb ? removal_verb : "remove"] [item_to_remove] from [src].")
- item_to_remove.forceMove(drop_location())
-
- if(Adjacent(user) && !issilicon(user))
- user.put_in_hands(item_to_remove)
-
- if(item_to_remove == bayonet)
- return clear_bayonet()
- else if(item_to_remove == gun_light)
- return clear_gunlight()
-
-/obj/item/gun/proc/clear_bayonet()
- if(!bayonet)
- return
- bayonet = null
- update_appearance()
- return TRUE
-
-/obj/item/gun/proc/clear_gunlight()
- if(!gun_light)
- return
- var/obj/item/flashlight/seclite/removed_light = gun_light
- set_gun_light(null)
- update_gunlight()
- removed_light.update_brightness()
- QDEL_NULL(alight)
- return TRUE
-
-/**
- * Swaps the gun's seclight, dropping the old seclight if it has not been qdel'd.
- *
- * Returns the former gun_light that has now been replaced by this proc.
- * Arguments:
- * * new_light - The new light to attach to the weapon. Can be null, which will mean the old light is removed with no replacement.
- */
-/obj/item/gun/proc/set_gun_light(obj/item/flashlight/seclite/new_light)
- // Doesn't look like this should ever happen? We're replacing our old light with our old light?
- if(gun_light == new_light)
- CRASH("Tried to set a new gun light when the old gun light was also the new gun light.")
-
- . = gun_light
-
- // If there's an old gun light that isn't being QDELETED, detatch and drop it to the floor.
- if(!QDELETED(gun_light))
- gun_light.set_light_flags(gun_light.light_flags & ~LIGHT_ATTACHED)
- if(gun_light.loc != get_turf(src))
- gun_light.forceMove(get_turf(src))
-
- // If there's a new gun light to be added, attach and move it to the gun.
- if(new_light)
- new_light.set_light_flags(new_light.light_flags | LIGHT_ATTACHED)
- if(new_light.loc != src)
- new_light.forceMove(src)
-
- gun_light = new_light
-
-/obj/item/gun/ui_action_click(mob/user, actiontype)
- if(istype(actiontype, alight))
- toggle_gunlight()
- else
- ..()
-
-/obj/item/gun/proc/toggle_gunlight()
- if(!gun_light)
- return
-
- var/mob/living/carbon/human/user = usr
- gun_light.on = !gun_light.on
- gun_light.update_brightness()
- to_chat(user, "You toggle the gunlight [gun_light.on ? "on":"off"].")
-
- playsound(user, gun_light.on ? gun_light.toggle_on_sound : gun_light.toggle_off_sound, 40, TRUE)
- update_gunlight()
-
-/obj/item/gun/proc/update_gunlight()
- update_appearance()
- for(var/X in actions)
- var/datum/action/A = X
- A.UpdateButtonIcon()
-
/obj/item/gun/attack_hand(mob/user)
. = ..()
update_appearance()
@@ -728,29 +741,13 @@
if(zoomed)
zoom(user, user.dir)
-/obj/item/gun/update_overlays()
+/obj/item/gun/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..()
- if(gun_light)
- var/mutable_appearance/flashlight_overlay
- var/state = "[gunlight_state][gun_light.on? "_on":""]" //Generic state.
- if(gun_light.icon_state in icon_states('icons/obj/guns/flashlights.dmi')) //Snowflake state?
- state = gun_light.icon_state
- flashlight_overlay = mutable_appearance('icons/obj/guns/flashlights.dmi', state)
- flashlight_overlay.pixel_x = flight_x_offset
- flashlight_overlay.pixel_y = flight_y_offset
- . += flashlight_overlay
-
- if(bayonet)
- var/mutable_appearance/knife_overlay
- var/state = "bayonet" //Generic state.
- if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state?
- state = bayonet.icon_state
- var/icon/bayonet_icons = 'icons/obj/guns/bayonets.dmi'
- knife_overlay = mutable_appearance(bayonet_icons, state)
- knife_overlay.pixel_x = knife_x_offset
- knife_overlay.pixel_y = knife_y_offset
- . += knife_overlay
+ if(prob(GUN_NO_SAFETY_MALFUNCTION_CHANCE_HIGH))
+ discharge("hits the ground hard")
+/obj/item/gun/update_overlays()
+ . = ..()
if(ismob(loc) && has_safety)
var/mutable_appearance/safety_overlay
safety_overlay = mutable_appearance('icons/obj/guns/safety.dmi')
@@ -799,7 +796,7 @@
if(chambered && chambered.BB && can_trigger_gun(user))
chambered.BB.damage *= 3
//Check is here for safeties and such, brain will be removed after
- if(!pre_fire(target, user, TRUE, params, BODY_ZONE_HEAD))
+ if(!pre_fire(target, user, TRUE, FALSE, params, BODY_ZONE_HEAD)) // We're already in handle_suicide, hence the 4th parameter needs to be FALSE to avoid circular logic. Also, BODY_ZONE_HEAD because we want to damage the head as a whole.
return
var/obj/item/organ/brain/brain_to_blast = target.getorganslot(ORGAN_SLOT_BRAIN)
@@ -828,61 +825,42 @@
/obj/item/gun/proc/before_firing(atom/target,mob/user)
return
-// We do it like this in case theres some specific gun behavior for adjusting recoil, like bipods or folded stocks
/obj/item/gun/proc/calculate_recoil(mob/user, recoil_bonus = 0)
- return recoil_bonus
+ if(HAS_TRAIT(user, TRAIT_GUNSLINGER))
+ recoil_bonus += gunslinger_recoil_bonus
+ return clamp(recoil_bonus, min_recoil , INFINITY)
-// We do it like this in case theres some specific gun behavior for adjusting spread, like bipods or folded stocks
/obj/item/gun/proc/calculate_spread(mob/user, bonus_spread)
- ///our final spread value
- var/sprd = 0
- ///our randomized value after checking if we are wielded or not
+ var/final_spread = 0
var/randomized_gun_spread = 0
- ///bonus
- var/randomized_bonus_spread
- // do we have poor aim
- var/poor_aim = FALSE
+ var/randomized_bonus_spread = 0
- //do we have bonus_spread ? If so, set sprd to it because it means a subtype's proc messed with it
- sprd += bonus_spread
+ final_spread += bonus_spread
- //reset bonus_spread for poor aim...
- bonus_spread = 0
+ if(HAS_TRAIT(user, TRAIT_GUNSLINGER))
+ randomized_bonus_spread += rand(0, gunslinger_spread_bonus)
- // if we have poor aim, we fuck the shooter over
if(HAS_TRAIT(user, TRAIT_POOR_AIM))
- bonus_spread += 25
- poor_aim = TRUE
- // then we randomize the bonus spread
- randomized_bonus_spread = rand(poor_aim ? 10 : 0, bonus_spread) //poor aim is no longer just a nusiance
-
- //then, we mutiply previous bonus spread as it means dual wielding usually, it also means poor aim is also even more severe
- randomized_bonus_spread *= DUALWIELD_PENALTY_EXTRA_MULTIPLIER
+ randomized_bonus_spread += rand(0, 25)
- // we will then calculate gun spread depending on if we are fully wielding (after do_after) the gun or not
+ //We will then calculate gun spread depending on if we are fully wielding (after do_after) the gun or not
randomized_gun_spread = rand(0, wielded_fully ? spread : spread_unwielded)
- //finally, we put it all together including if sprd has a value
- sprd += randomized_gun_spread + randomized_bonus_spread
-
- //clamp it down to avoid guns with negative spread to have worse recoil...
- sprd = clamp(sprd, 0, INFINITY)
+ final_spread += randomized_gun_spread + randomized_bonus_spread
- // im not sure what this does, i beleive its meant to make it so bullet spread goes in the opposite direction? get back to me on this - update,i have commented it out, however it appears be dapening spread. weird.
- //sprd *= (rand() - 0.5)
+ //Clamp it down to avoid guns with negative spread to have worse recoil...
+ final_spread = clamp(final_spread, 0, INFINITY)
- //coin flip if we mutiply output by -1 so spread isn't JUST to the right
+ //So spread isn't JUST to the right
if(prob(50))
- sprd *= -1
+ final_spread *= -1
- // then we round it up and send it!
- sprd = round(sprd)
+ final_spread = round(final_spread)
- return sprd
+ return final_spread
/obj/item/gun/proc/simulate_recoil(mob/living/user, recoil_bonus = 0, firing_angle)
var/total_recoil = calculate_recoil(user, recoil_bonus)
- total_recoil = clamp(total_recoil, 0 , INFINITY)
var/actual_angle = firing_angle + rand(-recoil_deviation, recoil_deviation) + 180
if(actual_angle > 360)
@@ -893,14 +871,10 @@
/obj/item/gun/proc/handle_muzzle_flash(mob/living/user, firing_angle)
var/atom/movable/flash_loc = user
- var/prev_light = light_range
-
- if(!light_on && (light_range <= muzzle_flash_lum))
- set_light_range(muzzle_flash_lum)
- set_light_color(muzzle_flash_color)
+ if(!light_on)
set_light_on(TRUE)
- update_light()
- addtimer(CALLBACK(src, PROC_REF(reset_light_range), prev_light), 1 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, set_light_on), FALSE), 1 SECONDS)
+
//Offset the pixels.
switch(firing_angle)
if(0, 360)
@@ -975,39 +949,75 @@
addtimer(CALLBACK(src, PROC_REF(remove_muzzle_flash), flash_loc, muzzle_flash), 0.2 SECONDS)
-/obj/item/gun/proc/reset_light_range(lightrange)
- set_light_range(lightrange)
- set_light_color(initial(light_color))
- if(lightrange <= 0)
- set_light_on(FALSE)
- update_light()
-
/obj/item/gun/proc/remove_muzzle_flash(atom/movable/flash_loc, obj/effect/muzzle_flash/muzzle_flash)
if(!QDELETED(flash_loc))
flash_loc.vis_contents -= muzzle_flash
muzzle_flash.applied = FALSE
-/////////////
-// ZOOMING //
-/////////////
+// for guns firing on their own without a user
+/obj/item/gun/proc/discharge(cause, seek_chance = 10)
+ var/target
+ 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)))
+ if(!isInSight(src, target_mob))
+ continue
+ target = target_mob
+ break
+ if(!target)
+ var/fire_dir = pick(GLOB.alldirs)
+ target = get_ranged_target_turf(get_turf(src),fire_dir,6)
+ if(!chambered || !chambered.BB)
+ visible_message(span_danger("\The [src] [cause ? "[cause], suddenly going off" : "suddenly goes off"] without its safteies on! Luckily it wasn't live."))
+ playsound(src, dry_fire_sound, 30, TRUE)
+ else
+ visible_message(span_danger("\The [src] [cause ? "[cause], suddenly going off" : "suddenly goes off"] without its safeties on!"))
+ unsafe_shot(target)
+/obj/item/gun/proc/unsafe_shot(target)
+ if(chambered)
+ chambered.fire_casing(target,null, null, null, suppressed, ran_zone(BODY_ZONE_CHEST, 50), 0, src,TRUE)
+ playsound(src, fire_sound, 100, TRUE)
+
+/mob/living/proc/trip_with_gun(cause)
+ var/mob/living/carbon/human/human_holder
+ if(ishuman(src))
+ human_holder = src
+ for(var/obj/item/gun/at_risk in get_all_contents())
+ 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 = round(GUN_NO_SAFETY_MALFUNCTION_CHANCE_LOW * at_risk.safety_multiplier)
+ if(at_risk.safety == FALSE && prob(chance_to_fire))
+ 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 [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
name = "Toggle Scope"
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)
@@ -1044,8 +1054,7 @@
return
if(zoomable)
- azoom = new()
- azoom.gun = src
+ azoom = new(src)
/obj/item/gun/proc/build_firemodes()
if(FIREMODE_FULLAUTO in gun_firemodes)
@@ -1102,3 +1111,47 @@
var/safety_prefix = "[our_gun.adjust_fire_select_icon_state_on_safety ? "[our_gun.safety ? "safety_" : ""]" : ""]"
button_icon_state = "[safety_prefix][our_gun.fire_select_icon_state_prefix][current_firemode]"
return ..()
+
+GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
+ /obj/item/gun/energy/plasmacutter,
+ /obj/item/melee/energy,
+ /obj/item/gear_handle/anglegrinder,
+ )))
+
+///Handles all the logic of sawing off guns,
+/obj/item/gun/proc/try_sawoff(mob/user, obj/item/saw)
+ if(!saw.get_sharpness() || !is_type_in_typecache(saw, GLOB.gun_saw_types) && saw.tool_behaviour != TOOL_SAW) //needs to be sharp. Otherwise turned off eswords can cut this.
+ return
+ if(sawn_off)
+ to_chat(user, span_warning("\The [src] is already shortened!"))
+ return
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.visible_message(span_notice("[user] begins to shorten \the [src]."), span_notice("You begin to shorten \the [src]..."))
+
+ //if there's any live ammo inside the gun, makes it go off
+ if(blow_up(user))
+ user.visible_message(span_danger("\The [src] goes off!"), span_danger("\The [src] goes off in your face!"))
+ return
+
+ if(do_after(user, 30, target = src))
+ user.visible_message(span_notice("[user] shortens \the [src]!"), span_notice("You shorten \the [src]."))
+ sawoff(forced = FALSE)
+
+///Used on init or try_sawoff
+/obj/item/gun/proc/sawoff(forced = FALSE)
+ if(sawn_off && !forced)
+ return
+ name = "sawn-off [src.name]"
+ desc = sawn_desc
+ w_class = WEIGHT_CLASS_NORMAL
+ item_state = "gun"
+ slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back
+ slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+ recoil = SAWN_OFF_RECOIL
+ sawn_off = TRUE
+ update_appearance()
+ return TRUE
+
+///used for sawing guns, causes the gun to fire without the input of the user
+/obj/item/gun/proc/blow_up(mob/user)
+ return
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index a4247898d59..a16f3561269 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,107 +14,56 @@
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
- ///sound when inserting magazine
- var/load_sound = 'sound/weapons/gun/general/magazine_insert_full.ogg'
- ///sound when inserting an empty magazine
- var/load_empty_sound = 'sound/weapons/gun/general/magazine_insert_empty.ogg'
- ///volume of loading sound
- var/load_sound_volume = 40
- ///whether loading sound should vary
- var/load_sound_vary = TRUE
- ///sound of racking
- var/rack_sound = 'sound/weapons/gun/general/bolt_rack.ogg'
- ///volume of racking
- var/rack_sound_volume = 60
- ///whether racking sound should vary
- var/rack_sound_vary = TRUE
- ///sound of when the bolt is locked back manually
- var/lock_back_sound = 'sound/weapons/gun/general/slide_lock_1.ogg'
- ///volume of lock back
- var/lock_back_sound_volume = 60
- ///whether lock back varies
- var/lock_back_sound_vary = TRUE
- ///Sound of ejecting a magazine
- var/eject_sound = 'sound/weapons/gun/general/magazine_remove_full.ogg'
- ///sound of ejecting an empty magazine
- var/eject_empty_sound = 'sound/weapons/gun/general/magazine_remove_empty.ogg'
- ///volume of ejecting a magazine
- var/eject_sound_volume = 40
- ///whether eject sound should vary
- var/eject_sound_vary = TRUE
- ///sound of dropping the bolt or releasing a slide
- var/bolt_drop_sound = 'sound/weapons/gun/general/bolt_drop.ogg'
- ///volume of bolt drop/slide release
- var/bolt_drop_sound_volume = 60
- ///empty alarm sound (if enabled)
- var/empty_alarm_sound = 'sound/weapons/gun/general/empty_alarm.ogg'
- ///empty alarm volume sound
- var/empty_alarm_volume = 70
- ///whether empty alarm sound varies
- var/empty_alarm_vary = TRUE
-
- ///Whether the gun will spawn loaded with a magazine
- var/spawnwithmagazine = TRUE
- ///Compatible magazines with the gun
- var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
- ///Whether the sprite has a visible magazine or not
- var/show_magazine_on_sprite = FALSE
- ///Whether the sprite has a visible ammo display or not
- var/show_magazine_on_sprite_ammo = FALSE
- ///Whether the sprite has a visible indicator for being empty or not.
- var/empty_indicator = FALSE
- ///Whether the gun alarms when empty or not.
- var/empty_alarm = FALSE
- ///Do we eject the magazine upon runing out of ammo?
- var/empty_autoeject = FALSE
- ///Whether the gun supports multiple special mag types
- var/unique_mag_sprites_for_variants = FALSE
- ///The bolt type of the gun, affects quite a bit of functionality, see combat.dm defines for bolt types: BOLT_TYPE_STANDARD; BOLT_TYPE_LOCKING; BOLT_TYPE_OPEN; BOLT_TYPE_NO_BOLT
- var/bolt_type = BOLT_TYPE_STANDARD
- ///Used for locking bolt and open bolt guns. Set a bit differently for the two but prevents firing when true for both.
- var/bolt_locked = FALSE
- ///Whether the gun has to be racked each shot or not.
- var/semi_auto = TRUE
- ///Actual magazine currently contained within the gun
- var/obj/item/ammo_box/magazine/magazine
- ///whether the gun ejects the chambered casing
- var/casing_ejector = TRUE
- ///Whether the gun has an internal magazine or a detatchable one. Overridden by BOLT_TYPE_NO_BOLT.
- var/internal_magazine = FALSE
- ///Phrasing of the bolt in examine and notification messages; ex: bolt, slide, etc.
- var/bolt_wording = "bolt"
- ///Phrasing of the magazine in examine and notification messages; ex: magazine, box, etx
- var/magazine_wording = "magazine"
- ///Phrasing of the cartridge in examine and notification messages; ex: bullet, shell, dart, etc.
- var/cartridge_wording = "bullet"
- ///length between individual racks
- var/rack_delay = 5
- ///time of the most recent rack, used for cooldown purposes
- var/recent_rack = 0
- ///Whether the gun can be sawn off by sawing tools
- var/can_be_sawn_off = FALSE
-
- ///Whether the gun can be tacloaded by slapping a fresh magazine directly on it
- var/tac_reloads = TRUE //Snowflake mechanic no more.
- ///If we have the 'snowflake mechanic,' how long should it take to reload?
- var/tactical_reload_delay = 1 SECONDS
-
-/obj/item/gun/ballistic/Initialize()
+ min_recoil = 0.1
+
+ valid_attachments = list(
+ /obj/item/attachment/silencer,
+ /obj/item/attachment/laser_sight,
+ /obj/item/attachment/rail_light,
+ /obj/item/attachment/bayonet,
+ /obj/item/attachment/sling
+ )
+ slot_available = list(
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ ATTACHMENT_SLOT_RAIL = 1
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 26,
+ "y" = 20,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 19,
+ "y" = 18,
+ )
+ )
+
+/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" : ""]"
@@ -123,15 +77,14 @@
. += "[icon_state]_bolt[bolt_locked ? "_locked" : ""]"
if (bolt_type == BOLT_TYPE_OPEN && bolt_locked)
. += "[icon_state]_bolt"
- if (suppressed)
- . += "[icon_state]_suppressor"
- if (magazine)
+ if (show_magazine_on_sprite && magazine)
if (unique_mag_sprites_for_variants)
. += "[icon_state]_mag_[magazine.base_icon_state]"
if (!magazine.ammo_count())
- . += "[icon_state]_mag_empty"
+ . += "[icon_state]_mag_[magazine.base_icon_state]_empty"
else
. += "[icon_state]_mag"
+ if(show_ammo_capacity_on_magazine_sprite)
var/capacity_number = 0
switch(get_ammo() / magazine.max_ammo)
if(0.2 to 0.39)
@@ -142,12 +95,16 @@
capacity_number = 60
if(0.8 to 0.99)
capacity_number = 80
- if(1.0)
+ if(1.0 to 2.0) //to catch the chambered round
capacity_number = 100
- if (capacity_number)
+ if (capacity_number && unique_mag_sprites_for_variants)
+ . += "[icon_state]_mag_[magazine.base_icon_state]_[capacity_number]"
+ else if (capacity_number)
. += "[icon_state]_mag_[capacity_number]"
if(!chambered && empty_indicator)
. += "[icon_state]_empty"
+ if(chambered && mag_display_ammo)
+ . += "[icon_state]_chambered"
/obj/item/gun/ballistic/process_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE, atom/shooter)
if(!semi_auto && from_firing)
@@ -173,7 +130,7 @@
chambered.forceMove(src)
///updates a bunch of racking related stuff and also handles the sound effects and the like
-/obj/item/gun/ballistic/proc/rack(mob/user = null)
+/obj/item/gun/ballistic/proc/rack(mob/user = null, chamber_new_round = TRUE)
if (bolt_type == BOLT_TYPE_NO_BOLT) //If there's no bolt, nothing to rack
return
if (bolt_type == BOLT_TYPE_OPEN)
@@ -184,31 +141,32 @@
bolt_locked = FALSE
if (user)
to_chat(user, "You rack the [bolt_wording] of \the [src].")
- process_chamber(!chambered, FALSE, shooter = user)
- if (bolt_type == BOLT_TYPE_LOCKING && !chambered)
+ process_chamber(!chambered, FALSE, chamber_new_round, user)
+ if ((bolt_type == BOLT_TYPE_LOCKING && !chambered) || bolt_type == BOLT_TYPE_CLIP)
bolt_locked = TRUE
playsound(src, lock_back_sound, lock_back_sound_volume, lock_back_sound_vary)
else
playsound(src, rack_sound, rack_sound_volume, rack_sound_vary)
- update_appearance()
+
SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD)
///Drops the bolt from a locked position
-/obj/item/gun/ballistic/proc/drop_bolt(mob/user = null)
+/obj/item/gun/ballistic/proc/drop_bolt(mob/user = null, chamber_new_round = TRUE)
playsound(src, bolt_drop_sound, bolt_drop_sound_volume, FALSE)
if (user)
to_chat(user, "You drop the [bolt_wording] of \the [src].")
- chamber_round()
+ if(chamber_new_round)
+ chamber_round()
bolt_locked = FALSE
update_appearance()
///Handles all the logic needed for magazine insertion
-/obj/item/gun/ballistic/proc/insert_magazine(mob/user, obj/item/ammo_box/magazine/AM, display_message = TRUE)
- if(!istype(AM, mag_type))
- to_chat(user, "\The [AM] doesn't seem to fit into \the [src]...")
+/obj/item/gun/ballistic/proc/insert_magazine(mob/user, obj/item/ammo_box/magazine/inserted_mag, display_message = TRUE)
+ 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(AM, src))
- magazine = AM
+ if(user.transferItemToLoc(inserted_mag, src))
+ magazine = inserted_mag
if (display_message)
to_chat(user, "You load a new [magazine_wording] into \the [src].")
if (magazine.ammo_count())
@@ -261,9 +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_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)
@@ -273,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)
@@ -287,47 +251,11 @@
A.update_appearance()
update_appearance()
return
- if(istype(A, /obj/item/suppressor))
- var/obj/item/suppressor/S = A
- if(!can_suppress)
- to_chat(user, "You can't seem to figure out how to fit [S] on [src]!")
- return
- if(!user.is_holding(src))
- to_chat(user, "You need be holding [src] to fit [S] to it!")
- return
- if(suppressed)
- to_chat(user, "[src] already has a suppressor!")
- return
- if(user.transferItemToLoc(A, src))
- to_chat(user, "You screw \the [S] onto \the [src].")
- install_suppressor(A)
- return
if (can_be_sawn_off)
- if (sawoff(user, A))
+ if (try_sawoff(user, A))
return
- return FALSE
-
-///Installs a new suppressor, assumes that the suppressor is already in the contents of src
-/obj/item/gun/ballistic/proc/install_suppressor(obj/item/suppressor/S)
- suppressed = S
- w_class += S.w_class //so pistols do not fit in pockets when suppressed
- update_appearance()
-/obj/item/gun/ballistic/AltClick(mob/user)
- if (unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY))
- reskin_obj(user)
- return
- if(loc == user)
- if(suppressed && can_unsuppress)
- var/obj/item/suppressor/S = suppressed
- if(!user.is_holding(src))
- return ..()
- to_chat(user, "You unscrew \the [suppressed] from \the [src].")
- user.put_in_hands(suppressed)
- w_class -= S.w_class
- suppressed = null
- update_appearance()
- return
+ return FALSE
///Prefire empty checks for the bolt drop
/obj/item/gun/ballistic/proc/prefire_empty_checks()
@@ -349,6 +277,8 @@
if (last_shot_succeeded && bolt_type == BOLT_TYPE_LOCKING)
bolt_locked = TRUE
update_appearance()
+ if (last_shot_succeeded && bolt_type == BOLT_TYPE_CLIP)
+ update_appearance()
/obj/item/gun/ballistic/pre_fire(atom/target, mob/living/user, message = TRUE, flag, params = null, zone_override = "", bonus_spread = 0, dual_wielded_gun = FALSE)
prefire_empty_checks()
@@ -360,37 +290,48 @@
//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_locked)
+ if((bolt_type == BOLT_TYPE_LOCKING || bolt_type == BOLT_TYPE_CLIP) && bolt_locked)
drop_bolt(user)
return
+
if (recent_rack > world.time)
return
recent_rack = world.time + rack_delay
+ if(bolt_type == BOLT_TYPE_CLIP)
+ rack(user, FALSE)
+ update_appearance()
+ return
rack(user)
+ update_appearance()
return
@@ -402,9 +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."
- if (suppressed)
- . += "It has a suppressor attached that can be removed with alt+click."
- . += "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)
@@ -422,64 +362,18 @@
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
-GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
- /obj/item/gun/energy/plasmacutter,
- /obj/item/melee/transforming/energy,
- )))
-
-///Handles all the logic of sawing off guns,
-/obj/item/gun/ballistic/proc/sawoff(mob/user, obj/item/saw)
- if(!saw.get_sharpness() || !is_type_in_typecache(saw, GLOB.gun_saw_types) && saw.tool_behaviour != TOOL_SAW) //needs to be sharp. Otherwise turned off eswords can cut this.
- return
- if(sawn_off)
- to_chat(user, "\The [src] is already shortened!")
- return
- if(bayonet)
- to_chat(user, "You cannot saw-off \the [src] with \the [bayonet] attached!")
- return
- user.changeNext_move(CLICK_CD_MELEE)
- user.visible_message("[user] begins to shorten \the [src].", "You begin to shorten \the [src]...")
-
- //if there's any live ammo inside the gun, makes it go off
- if(blow_up(user))
- user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!")
- return
-
- if(do_after(user, 30, target = src))
- if(sawn_off)
- return
- user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].")
- name = "sawn-off [src.name]"
- desc = sawn_desc
- w_class = WEIGHT_CLASS_NORMAL
- item_state = "gun"
- slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back
- slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
- recoil = SAWN_OFF_RECOIL
- sawn_off = TRUE
- update_appearance()
- return TRUE
-
-///used for sawing guns, causes the gun to fire without the input of the user
-/obj/item/gun/ballistic/proc/blow_up(mob/user)
+/obj/item/gun/ballistic/blow_up(mob/user)
. = FALSE
for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
if(AC.BB)
process_fire(user, user, FALSE)
. = TRUE
+/obj/item/gun/ballistic/unsafe_shot(target, empty_chamber = TRUE)
+ . = ..()
+ process_chamber(empty_chamber,TRUE)
-/obj/item/suppressor
- name = "suppressor"
- desc = "A syndicate small-arms suppressor for maximum espionage."
- icon = 'icons/obj/guns/projectile.dmi'
- icon_state = "suppressor"
- w_class = WEIGHT_CLASS_TINY
-
-
-/obj/item/suppressor/specialoffer
- name = "cheap suppressor"
- desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits most weapons."
diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
index 3f649994827..f61da3dd9a8 100644
--- a/code/modules/projectiles/guns/ballistic/assault.dm
+++ b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -1,8 +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
@@ -14,23 +17,8 @@
rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg'
spread_unwielded = 20
-/obj/item/gun/ballistic/automatic/assault/calculate_recoil(mob/user, recoil_bonus = 0)
- var/gunslinger_bonus = 2
- var/total_recoil = recoil_bonus
-
- if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty
- total_recoil += gunslinger_bonus
-
- return ..(user, total_recoil)
-
-/obj/item/gun/ballistic/automatic/assault/calculate_spread(mob/user, bonus_spread)
- var/gunslinger_bonus = 16
- var/total_spread = bonus_spread
-
- if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty
- total_spread += gunslinger_bonus
-
- return ..(user, total_spread)
+ gunslinger_recoil_bonus = 2
+ gunslinger_spread_bonus = 16
/obj/item/gun/ballistic/automatic/assault/skm
name = "\improper SKM-24"
@@ -53,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
@@ -64,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"
@@ -87,6 +77,16 @@
item_state = "skm_inteq"
manufacturer = MANUFACTURER_INTEQ
+/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."
+ 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 = "cm16"
+ item_state = "cm16"
+
/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."
@@ -97,7 +97,7 @@
show_magazine_on_sprite = TRUE
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/p16
+ // mag_type = /obj/item/ammo_box/magazine/p16
spread = 2
wield_delay = 0.5 SECONDS
@@ -110,12 +110,12 @@
eject_empty_sound = 'sound/weapons/gun/rifle/m16_unload.ogg'
/obj/item/gun/ballistic/automatic/assault/p16/no_mag
- spawnwithmagazine = FALSE
+ // spawnwithmagazine = FALSE
/obj/item/gun/ballistic/automatic/assault/p16/minutemen
name = "\improper CM-16"
desc = "The standard-issue rifle of CLIP and an extensively modified reproduction of the P-16. Chambered in 5.56mm."
- icon = 'icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi'
+ icon = 'icons/obj/guns/manufacturer/clip_lanchester/48x32-old.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'
@@ -144,9 +144,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
@@ -156,19 +158,21 @@
/obj/item/gun/ballistic/automatic/assault/e40
name = "\improper E-40 Hybrid Rifle"
- desc = "A Hybrid Assault Rifle, best known for being having a dual ballistic/laser system along with an advanced ammo counter. Once an icon for bounty hunters, age has broken most down, so these end up in collector's hands or as shoddy Frontiersmen laser SMG conversions when in their inheritted stockpiles. But if one were to find one in working condition, it would be just as formidable as back then. Chambered in .229 Eoehoma caseless, and uses energy for lasers."
+ desc = "A Hybrid Assault Rifle, best known for being having a dual ballistic/laser system along with an advanced ammo counter. Once an icon for bounty hunters, age has broken most down, so these end up in collector's hands or as shoddy Frontiersmen laser SMG conversions when in their inheritted stockpiles. But if one were to find one in working condition, it would be just as formidable as back then. Chambered in .299 Eoehoma caseless, and uses energy for lasers."
icon = 'icons/obj/guns/manufacturer/eoehoma/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/eoehoma/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/eoehoma/onmob.dmi'
icon_state = "e40"
item_state = "e40"
- mag_type = /obj/item/ammo_box/magazine/e40
- can_suppress = FALSE
+ 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")
@@ -176,7 +180,6 @@
default_firemode = FIREMODE_OTHER
weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
show_magazine_on_sprite = TRUE
@@ -210,6 +213,9 @@
/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)
+ if(!secondary.latch_closed && prob(65))
+ to_chat(user, span_warning("[src]'s cell falls out!"))
+ secondary.eject_cell()
return ..()
return secondary.process_fire(target, user, message, params, zone_override, bonus_spread)
@@ -228,21 +234,46 @@
/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/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/can_shoot()
+/obj/item/gun/ballistic/automatic/assault/e40/AltClick(mob/living/user)
var/current_firemode = gun_firemodes[firemode_index]
- if(current_firemode != FIREMODE_OTHER)
+ 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 ..()
- return secondary.can_shoot()
/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)
. = ..()
@@ -263,8 +294,8 @@
secondary.pre_fire(target, user, message, flag, params, zone_override, bonus_spread)
-/obj/item/gun/ballistic/automatic/powered/get_cell()
- return cell
+/obj/item/gun/ballistic/automatic/assault/e40/get_cell()
+ return secondary.get_cell()
/obj/item/gun/ballistic/automatic/assault/e40/update_overlays()
. = ..()
@@ -278,6 +309,20 @@
. += "[icon_state]_charge[ratio]"
if(secondary.cell)
. += "[icon_state]_cell"
+ 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
/obj/item/gun/ballistic/automatic/assault/e40/toggle_safety(mob/user, silent=FALSE)
@@ -294,6 +339,17 @@
SEND_SIGNAL(src, COMSIG_GUN_SET_AUTOFIRE_SPEED, fire_delay)
SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD)
+/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!")
+
//laser
/obj/item/gun/energy/laser/e40_laser_secondary
@@ -305,36 +361,6 @@
fire_delay = 0.2 SECONDS
gun_firemodes = list(FIREMODE_FULLAUTO)
default_firemode = FIREMODE_FULLAUTO
+ latch_toggle_delay = 1.2 SECONDS
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 2fea717c28a..fd893e432f3 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -1,7 +1,6 @@
/obj/item/gun/ballistic/automatic
- w_class = WEIGHT_CLASS_NORMAL
- can_suppress = TRUE
+ w_class = WEIGHT_CLASS_BULKY
gun_firemodes = list(FIREMODE_SEMIAUTO)
default_firemode = FIREMODE_SEMIAUTO
@@ -20,47 +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/rifle
- fire_delay = 0.5 SECONDS
- burst_size = 1
- can_unsuppress = TRUE
- can_suppress = TRUE
- 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
- can_suppress = FALSE
- 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
- can_suppress = FALSE
+ 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()
- can_bayonet = FALSE
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 591f6e088c3..d7eecd21b88 100644
--- a/code/modules/projectiles/guns/ballistic/gauss.dm
+++ b/code/modules/projectiles/guns/ballistic/gauss.dm
@@ -8,10 +8,12 @@
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'
- can_suppress = FALSE
burst_size = 1
fire_delay = 0.3 SECONDS
spread = 0
@@ -27,14 +29,14 @@
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
+ // 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'
@@ -43,7 +45,7 @@
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
+ // 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.
@@ -57,11 +59,11 @@
fire_select_icon_state_prefix = "slug_"
/obj/item/gun/ballistic/automatic/powered/gauss/modelh/no_mag
- spawnwithmagazine = FALSE
+ // spawnwithmagazine = FALSE
/obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns
desc = "A fully functional replica built by Roseus Galactic. 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
+ // mag_type = /obj/item/ammo_box/magazine/modelh
icon_state = "model-h_suns"
item_state = "model-h_suns"
manufacturer = MANUFACTURER_ROSEUS
@@ -69,7 +71,7 @@
/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
+ // 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'
@@ -78,7 +80,7 @@
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
+ // cell_type = /obj/item/stock_parts/cell/gun/solgov
fire_delay = 0.4 SECONDS
bolt_type = BOLT_TYPE_NO_BOLT
internal_magazine = TRUE
@@ -95,7 +97,7 @@
/obj/item/gun/ballistic/automatic/powered/gauss/gar
name = "GAR Carbine"
desc = "A replica carbine with historical inaccuracies. Originally built by Roseus Galactic during the ICW, these have been seen in more than a few films. Launches ferromagnetic lances at alarming speeds."
- mag_type = /obj/item/ammo_box/magazine/gar
+ // 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'
@@ -104,7 +106,7 @@
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
+ // cell_type = /obj/item/stock_parts/cell/gun/solgov
burst_size = 1
fire_delay = 0.2 SECONDS
diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm
index 79977249dd3..1c318164ee7 100644
--- a/code/modules/projectiles/guns/ballistic/hmg.dm
+++ b/code/modules/projectiles/guns/ballistic/hmg.dm
@@ -12,11 +12,15 @@
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
///does this have a bipod?
var/has_bipod = FALSE
@@ -41,7 +45,7 @@
/obj/item/gun/ballistic/automatic/hmg/Initialize()
. = ..()
- for(var/datum/action/item_action/deploy_bipod/action as anything in actions_types)
+ for(var/datum/action/item_action/deploy_bipod/action as anything in actions)
if(!has_bipod)
qdel(action)
@@ -61,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
@@ -116,29 +136,6 @@
. = ..()
retract_bipod(user=user)
-/obj/item/gun/ballistic/automatic/hmg/calculate_recoil(mob/user, recoil_bonus = 0)
- var/gunslinger_bonus = 2
- var/total_recoil = recoil_bonus
-
- if(bipod_deployed)
- total_recoil += deploy_recoil_bonus
- if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty
- total_recoil += gunslinger_bonus
-
- return ..(user, total_recoil)
-
-/obj/item/gun/ballistic/automatic/hmg/calculate_spread(mob/user, bonus_spread)
- var/gunslinger_bonus = 20
- var/total_spread = bonus_spread
-
- if(bipod_deployed)
- total_spread += deploy_spread_bonus
- if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger penalty
- total_spread += gunslinger_bonus
-
- return ..(user, total_spread)
-
-
/obj/item/gun/ballistic/automatic/hmg/update_icon_state()
. = ..()
item_state = "[initial(item_state)][bipod_deployed ? "_deployed" : ""]"
@@ -148,76 +145,6 @@
if(has_bipod)
. += "[base_icon_state || initial(icon_state)][bipod_deployed ? "_deployed" : "_undeployed"]"
-
-// L6 SAW //
-
-/obj/item/gun/ballistic/automatic/hmg/l6_saw
- name = "\improper L6 SAW"
- desc = "A heavy machine gun, designated 'L6 SAW'. Chambered in 7.12x82mm."
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
- icon_state = "l6"
- item_state = "l6closedmag"
- base_icon_state = "l6"
-
- mag_type = /obj/item/ammo_box/magazine/mm712x82
- can_suppress = FALSE
- spread = 7
-
- fire_delay = 0.1 SECONDS
-
- bolt_type = BOLT_TYPE_OPEN
- show_magazine_on_sprite = TRUE
- show_magazine_on_sprite_ammo = TRUE
- tac_reloads = FALSE
- fire_sound = 'sound/weapons/gun/l6/shot.ogg'
- rack_sound = 'sound/weapons/gun/l6/l6_rack.ogg'
- suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
- manufacturer = MANUFACTURER_SCARBOROUGH
- var/cover_open = FALSE
-
-/obj/item/gun/ballistic/automatic/hmg/l6_saw/examine(mob/user)
- . = ..()
- . += "alt + click to [cover_open ? "close" : "open"] the dust cover."
- if(cover_open && magazine)
- . += "It seems like you could use an empty hand to remove the magazine."
-
-/obj/item/gun/ballistic/automatic/hmg/l6_saw/AltClick(mob/user)
- cover_open = !cover_open
- to_chat(user, "You [cover_open ? "open" : "close"] [src]'s cover.")
- playsound(user, 'sound/weapons/gun/l6/l6_door.ogg', 60, TRUE)
- update_appearance()
-
-/obj/item/gun/ballistic/automatic/hmg/l6_saw/update_overlays()
- . = ..()
- . += "l6_door_[cover_open ? "open" : "closed"]"
-
-/obj/item/gun/ballistic/automatic/hmg/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
- if(cover_open)
- to_chat(user, "[src]'s cover is open! Close it before firing!")
- return
- else
- . = ..()
- update_appearance()
-
-//ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/item/gun/ballistic/automatic/hmg/l6_saw/attack_hand(mob/user)
- if (loc != user)
- ..()
- return
- if (!cover_open)
- to_chat(user, "[src]'s cover is closed! Open it before trying to remove the magazine!")
- return
- ..()
-
-/obj/item/gun/ballistic/automatic/hmg/l6_saw/attackby(obj/item/A, mob/user, params)
- if(!cover_open && istype(A, mag_type))
- to_chat(user, "[src]'s dust cover prevents a magazine from being fit.")
- return
- ..()
-
/obj/item/gun/ballistic/automatic/hmg/solar //This thing fires a 5.56 equivalent, that's an LMG, not an HMG, get out
name = "\improper Solar"
desc = "A TerraGov LMG-169 designed in 169 FS, nicknamed 'Solar.' A inscription reads: 'PROPERTY OF TERRAGOV', with 'TERRAGOV' poorly scribbled out, and replaced by 'SOLAR ARMORIES'. Chambered in 4.73×33mm caseless ammunition."
@@ -229,15 +156,16 @@
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
fire_select_icon_state_prefix = "caseless_"
- can_suppress = FALSE
- can_bayonet = FALSE
show_magazine_on_sprite = TRUE
w_class = WEIGHT_CLASS_BULKY
manufacturer = MANUFACTURER_SOLARARMORIES
@@ -270,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
@@ -280,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
@@ -290,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 369df927b50..7f2538f4e65 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,40 +40,89 @@
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()
casing_ejector = FALSE
manufacturer = MANUFACTURER_HEPHAESTUS
+GLOBAL_LIST_INIT(rpg_scrawlings, list(
+ "\"FRONT TOWARDS ENEMY\"",
+ "\"MY WIFE LEFT ME\"",
+ "A Kepori inset in a stylized crimson heart",
+ "\"Eat lead psychohazard!\"",
+ "\"Portable Demotion\"",
+ "A drawing of the Rilena character 'T4L1' smoking a boof",
+ "\"Eat it corpo!\"",
+ "A Sarathi woman in a suggestive pose",
+ "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!\"",
+))
+
+
/obj/item/gun/ballistic/rocketlauncher
name = "\improper PML-9"
- desc = "A reusable rocket-propelled grenade launcher. The words \"NT this way\" and an arrow have been written near the barrel."
-
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+ desc = "A reusable rocket-propelled grenade launcher."
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'
- w_class = WEIGHT_CLASS_BULKY
- can_suppress = FALSE
+ gun_firemodes = list(FIREMODE_SEMIAUTO)
burst_size = 1
fire_delay = 0.4 SECONDS
- casing_ejector = FALSE
+
weapon_weight = WEAPON_HEAVY
+ w_class = WEIGHT_CLASS_BULKY
+
+ //Bolt
bolt_type = BOLT_TYPE_NO_BOLT
- internal_magazine = TRUE
+
+ ///Magazine stuff
cartridge_wording = "rocket"
+ internal_magazine = TRUE
empty_indicator = TRUE
tac_reloads = FALSE
+ casing_ejector = FALSE
+
manufacturer = MANUFACTURER_SCARBOROUGH
+ attack_verb = list("bludgeoned", "hit", "slammed", "whacked")
+
+ valid_attachments = list()
+ slot_available = list()
+
+ var/rpg_scribble = null
+
+/obj/item/gun/ballistic/rocketlauncher/Initialize()
+ . = ..()
+ rpg_scribble = pick(GLOB.rpg_scrawlings)
+ desc += " [rpg_scribble] is scrawled on the tube"
+
+/obj/item/gun/ballistic/rocketlauncher/attackby(obj/item/A, mob/user, params)
+ . = ..()
+ if(istype(A, /obj/item/pen))
+ rpg_scribble = stripped_input(user, "What are you putting on [src]?", "Rocket Launcher Doodle")
+ if(!rpg_scribble || !length(rpg_scribble))
+ desc = "[src::desc]"
+ return
+ desc = "[src::desc] [rpg_scribble] is scribbled on the body."
+
+
/obj/item/gun/ballistic/rocketlauncher/afterattack()
. = ..()
magazine.get_round(FALSE) //Hack to clear the mag after it's fired
@@ -84,6 +139,9 @@
righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+ //recoiless rifles use shells
+ cartridge_wording = "shell"
+
icon_state = "panzerfaust"
item_state = "panzerfaust"
manufacturer = MANUFACTURER_SOLARARMORIES
diff --git a/code/modules/projectiles/guns/ballistic/marksman.dm b/code/modules/projectiles/guns/ballistic/marksman.dm
index 46a9e246629..71458e24f1d 100644
--- a/code/modules/projectiles/guns/ballistic/marksman.dm
+++ b/code/modules/projectiles/guns/ballistic/marksman.dm
@@ -1,102 +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
-
-// SNIPER //
-
-/obj/item/gun/ballistic/automatic/marksman/sniper_rifle
- name = "sniper rifle"
- desc = "An anti-material rifle chambered in .50 BMG with a scope mounted on it. Its prodigious bulk requires both hands to use."
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
- icon_state = "sniper"
- item_state = "sniper"
- fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
- fire_sound_volume = 90
- vary_fire_sound = FALSE
- load_sound = 'sound/weapons/gun/sniper/mag_insert.ogg'
- 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
- 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
- slot_flags = ITEM_SLOT_BACK
- actions_types = list()
- show_magazine_on_sprite = TRUE
- manufacturer = MANUFACTURER_SCARBOROUGH
-
- spread = -5
- spread_unwielded = 40
- recoil = 5
- recoil_unwielded = 50
-
- wield_delay = 1.3 SECONDS
-
-EMPTY_GUN_HELPER(automatic/marksman/sniper_rifle)
-
-/obj/item/gun/ballistic/automatic/marksman/ebr //fuck this gun, its getting wiped soon enough
- name = "\improper M514 EBR"
- desc = "A reliable, high-powered battle rifle often found in the hands of Syndicate personnel and remnants, chambered in .308. Effective against personnel and armor alike."
-
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
-
- icon_state = "ebr"
- item_state = "ebr"
- zoomable = TRUE
- show_magazine_on_sprite = TRUE
- weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_BULKY
- mag_type = /obj/item/ammo_box/magazine/ebr
- fire_sound = 'sound/weapons/gun/rifle/shot_alt2.ogg'
- manufacturer = MANUFACTURER_SCARBOROUGH
-
- wield_slowdown = 2
- spread = -4
-
-EMPTY_GUN_HELPER(automatic/marksman/ebr)
-
-/obj/item/gun/ballistic/automatic/marksman/gal
- name = "\improper CM-GAL-S"
- desc = "The standard issue DMR of CLIP. Dates back to the Xenofauna War, this particular model is in a carbine configuration, and, as such, is shorter than the standard model. Chambered in .308."
-
- 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'
-
- fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
- icon_state = "gal"
- item_state = "gal"
- show_magazine_on_sprite = TRUE
- weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_BULKY
- mag_type = /obj/item/ammo_box/magazine/gal
- fire_sound = 'sound/weapons/gun/rifle/gal.ogg'
- burst_size = 0
- actions_types = list()
- manufacturer = MANUFACTURER_MINUTEMAN
-
- wield_slowdown = 2
- spread = -4
- fire_select_icon_state_prefix = "clip_"
- adjust_fire_select_icon_state_on_safety = TRUE
-
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq
- name = "\improper SsG-04"
- desc = "A marksman rifle purchased from CLIP and modified to suit IRMG's needs. Chambered in .308."
- 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 = "gal-inteq"
- item_state = "gal-inteq"
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index f9843fd260f..0af3d31dbea 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -1,6 +1,6 @@
/obj/item/gun/ballistic/automatic/pistol
- can_suppress = TRUE
bolt_type = BOLT_TYPE_LOCKING
+ w_class = WEIGHT_CLASS_NORMAL
vary_fire_sound = FALSE
fire_sound_volume = 90
@@ -8,7 +8,7 @@
weapon_weight = WEAPON_LIGHT
pickup_sound = 'sound/items/handling/gun_pickup.ogg'
- recoil = 0.5 // apogee wants bloom, this is a placeholder until then to simulate the same concept.
+ //recoil = 0.5 // apogee wants bloom, this is a placeholder until then to simulate the same concept. //UPDATE ive changed my mind on this, however i would
recoil_unwielded = 3
recoil_backtime_multiplier = 1
@@ -16,21 +16,21 @@
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/syndicate
name = "Stechkin"
desc = "A small, easily concealable 10mm handgun that bears Scarborough Arms stamps. Has a threaded barrel for suppressors."
- icon_state = "pistol"
+ icon_state = "ringneck"
icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
w_class = WEIGHT_CLASS_SMALL
- mag_type = /obj/item/ammo_box/magazine/m10mm
+ // mag_type = /obj/item/ammo_box/magazine/m10mm
fire_sound = 'sound/weapons/gun/pistol/shot.ogg'
dry_fire_sound = 'sound/weapons/gun/pistol/dry_fire.ogg'
suppressed_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg'
@@ -52,10 +52,12 @@
EMPTY_GUN_HELPER(automatic/pistol/syndicate)
+NO_MAG_GUN_HELPER(automatic/pistol/syndicate)
+
/obj/item/gun/ballistic/automatic/pistol/suns
desc = "A small, easily concealable 10mm handgun that bears Scarborough Arms stamps. It is painted in the colors of Roseus Galactic."
icon_state = "pistol_suns"
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32-old.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
@@ -70,8 +72,8 @@ EMPTY_GUN_HELPER(automatic/pistol/syndicate)
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
- can_suppress = FALSE
+ // mag_type = /obj/item/ammo_box/magazine/m45
+ // can_suppress = FALSE
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'
@@ -109,13 +111,16 @@ 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
- can_suppress = FALSE
+ 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'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
- bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/rack.ogg'
manufacturer = MANUFACTURER_NONE
load_sound = 'sound/weapons/gun/pistol/deagle_reload.ogg'
load_empty_sound = 'sound/weapons/gun/pistol/deagle_reload.ogg'
@@ -139,76 +144,6 @@ EMPTY_GUN_HELPER(automatic/pistol/candor/factory)
icon_state = "deaglecamo"
item_state = "deagleg"
-/obj/item/gun/ballistic/automatic/pistol/APS
- name = "stechkin APS pistol"
- desc = "A burst-fire machine pistol based on the stechkin model. Utilizes specialized 9mm magazines."
- icon_state = "aps"
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
-
-
- mag_type = /obj/item/ammo_box/magazine/pistolm9mm
-
- fire_sound = 'sound/weapons/gun/pistol/shot.ogg'
- dry_fire_sound = 'sound/weapons/gun/pistol/dry_fire.ogg'
- suppressed_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg'
-
- load_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
- eject_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
-
- 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'
-
- burst_size = 3
- burst_delay = 0.1 SECONDS
- fire_delay = 0.4 SECONDS
- gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST)
- default_firemode = FIREMODE_SEMIAUTO
-
-
-/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
- can_suppress = FALSE
- manufacturer = MANUFACTURER_NANOTRASEN
- fire_sound = 'sound/weapons/gun/pistol/commander.ogg'
- load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
-
- 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."
@@ -219,8 +154,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
- can_suppress = FALSE
+ 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'
@@ -260,6 +197,7 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
to_chat(user, "You toggle [src]'s vox audio functions.")
/obj/item/gun/ballistic/automatic/pistol/commissar/AltClick(mob/user)
+ . = ..()
if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
if((cooldown < world.time - 200) && funnysounds)
@@ -272,56 +210,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
- w_class = WEIGHT_CLASS_SMALL
- 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/tec9 //fucking kill this gun already my god
- name = "\improper TEC-9 machine pistol"
- desc = "A crude machine pistol designed to vomit 9mm ammunition at a truly eye-watering rate of fire."
- icon_state = "tec9"
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
-
- fire_delay = 0.15 SECONDS
- weapon_weight = WEAPON_LIGHT
- w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/tec9
- show_magazine_on_sprite = TRUE
- load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
-
- gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
- default_firemode = FIREMODE_SEMIAUTO
-
/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."
@@ -329,9 +217,11 @@ 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)
- can_suppress = FALSE
manufacturer = MANUFACTURER_NONE
has_safety = FALSE //thing barely costs anything, why would it have a safety?
safety = FALSE
@@ -355,7 +245,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'
@@ -390,44 +283,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
-
-/obj/item/gun/ballistic/automatic/pistol/himehabu
- name = "\improper Himehabu"
- desc = "A very small .22 LR pistol. The long awaited successor to the Stechkin; It has become a favorite among syndicate spies. Chambered in .22 LR."
- icon_state = "himehabu"
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
-
-
- w_class = WEIGHT_CLASS_TINY
- mag_type = /obj/item/ammo_box/magazine/m22lr
- can_suppress = FALSE
- fire_sound = 'sound/weapons/gun/pistol/himehabu.ogg'
-
- load_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
- eject_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
-
- 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'
-
- recoil = -2
- recoil_unwielded = -2
- spread_unwielded = 0
- wield_slowdown = 0
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/derr357
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/derr357,
+ )
+EMPTY_GUN_HELPER(derringer)
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index de69836bf2f..d5ff8d72569 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'
@@ -25,6 +28,9 @@
var/spin_delay = 10
var/recent_spin = 0
manufacturer = MANUFACTURER_SCARBOROUGH
+
+ valid_attachments = list()
+ slot_available = list()
fire_delay = 0.4 SECONDS
spread_unwielded = 15
recoil = 0.5
@@ -33,13 +39,16 @@
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
safety_wording = "hammer"
+ gunslinger_recoil_bonus = -1
+ gunslinger_spread_bonus = -8
+
var/gate_loaded = FALSE //for stupid wild west shit
var/gate_offset = 5 //for wild west shit 2: instead of ejecting the chambered round, eject the next round if 1
var/gate_load_direction = REVOLVER_AUTO_ROTATE_RIGHT_LOADING //when we load ammo with a box, which direction do we rotate the cylinder? unused with normal revolvers
@@ -418,7 +427,7 @@
fire_delay = src::fire_delay
if(fan)
rack()
- to_chat(user, "You fan the [bolt_wording] of \the [src]!")
+ to_chat(user, span_notice("You fan the [bolt_wording] of \the [src]!"))
balloon_alert_to_viewers("fans revolver!")
fire_delay = 0 SECONDS
@@ -436,25 +445,6 @@
return
to_chat(user, "The hammer is up on [src]! Pull it down to fire!")
-/obj/item/gun/ballistic/revolver/calculate_recoil(mob/user, recoil_bonus = 0)
- var/gunslinger_bonus = -1
- var/total_recoil = recoil_bonus
-
- if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger bonus
- total_recoil += gunslinger_bonus
- total_recoil = clamp(total_recoil,0,INFINITY)
-
- return ..(user, total_recoil)
-
-/obj/item/gun/ballistic/revolver/calculate_spread(mob/user, bonus_spread)
- var/gunslinger_bonus = -8
- var/total_spread = bonus_spread
-
- if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) //gunslinger bonus
- total_spread += gunslinger_bonus
-
- return ..(user, total_spread)
-
/obj/item/gun/ballistic/revolver/pickup(mob/user)
. = ..()
tryflip(user)
@@ -472,7 +462,7 @@
name = "\improper syndicate revolver"
desc = "A weighty revolver with a Scarborough Arms logo engraved on the barrel. Uses .357 ammo." //usually used by syndicates
icon_state = "revolver"
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32-old.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
@@ -487,7 +477,7 @@
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
+ // mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
obj_flags = UNIQUE_RENAME
semi_auto = TRUE //double action
safety_wording = "safety"
@@ -555,10 +545,13 @@ EMPTY_GUN_HELPER(revolver/detective)
return TRUE
/obj/item/gun/ballistic/revolver/detective/no_mag
- spawnwithmagazine = FALSE
+ // spawnwithmagazine = FALSE
/obj/item/gun/ballistic/revolver/no_mag
- spawnwithmagazine = FALSE
+ // spawnwithmagazine = FALSE
+
+EMPTY_GUN_HELPER(revolver)
+EMPTY_GUN_HELPER(revolver/viper)
/obj/item/gun/ballistic/revolver/mateba
name = "\improper Unica 6 auto-revolver"
@@ -595,14 +588,14 @@ EMPTY_GUN_HELPER(revolver/detective)
spread_unwielded = 15
recoil = 0
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44/montagne
+ // 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
+ // spawnwithmagazine = FALSE
/obj/item/gun/ballistic/revolver/ashhand
name = "HP Ashhand"
@@ -613,7 +606,7 @@ EMPTY_GUN_HELPER(revolver/detective)
mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
icon_state = "ashhand"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev4570
+ // 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
@@ -638,7 +631,7 @@ EMPTY_GUN_HELPER(revolver/detective)
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
+ // mag_type = /obj/item/ammo_box/magazine/internal/cylinder/pepperbox
spread = 20
manufacturer = MANUFACTURER_HUNTERSPRIDE
spread_unwielded = 50
@@ -648,7 +641,7 @@ EMPTY_GUN_HELPER(revolver/detective)
safety_wording = "safety"
/obj/item/gun/ballistic/revolver/firebrand/no_mag
- spawnwithmagazine = FALSE
+ // spawnwithmagazine = FALSE
/obj/item/gun/ballistic/revolver/shadow
name = "\improper Shadow 45"
@@ -661,7 +654,7 @@ EMPTY_GUN_HELPER(revolver/detective)
icon_state = "shadow"
item_state = "hp_generic"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45
+ // mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45
manufacturer = MANUFACTURER_HEPHAESTUS
obj_flags = UNIQUE_RENAME
gate_loaded = TRUE
@@ -683,4 +676,4 @@ EMPTY_GUN_HELPER(revolver/detective)
AddComponent(/datum/component/ammo_hud/revolver)
/obj/item/gun/ballistic/revolver/shadow/no_mag
- spawnwithmagazine = FALSE
+ // spawnwithmagazine = FALSE
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index b817d9b394f..3abe98e1645 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 ..()
@@ -85,21 +87,21 @@
eject_empty_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
internal_magazine = FALSE
- mag_type = /obj/item/ammo_box/magazine/illestren_a850r
+ // 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
+ // spawnwithmagazine = FALSE
-/obj/item/gun/ballistic/rifle/illestren/sawoff(mob/user)
+/obj/item/gun/ballistic/rifle/illestren/sawoff(forced = FALSE)
. = ..()
if(.)
spread = 24
spread_unwielded = 30
- can_bayonet = FALSE
+ // can_bayonet = FALSE
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
@@ -115,7 +117,7 @@
icon_state = "illestren_factory"
item_state = "illestren_factory"
-/obj/item/gun/ballistic/rifle/illestren/sawoff(mob/user)
+/obj/item/gun/ballistic/rifle/illestren/factory/sawoff(forced = FALSE)
. = ..()
if(.)
item_state = "illestren_factory_sawn"
@@ -133,7 +135,7 @@
/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
+ // mag_type = /obj/item/ammo_box/magazine/internal/boltaction/solgov
icon_state = "ssg669c"
item_state = "ssg669c"
icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
@@ -166,7 +168,7 @@
icon_state = "scout"
item_state = "scout"
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/smile
+ // 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'
@@ -181,7 +183,7 @@
manufacturer = MANUFACTURER_HEPHAESTUS
/obj/item/gun/ballistic/rifle/scout/no_mag
- spawnwithmagazine = FALSE
+ // spawnwithmagazine = FALSE
/obj/item/gun/ballistic/rifle/polymer
name = "LK-MR Marksman Rifle"
@@ -189,8 +191,11 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "crackhead_rifle"
item_state = "crackhead_rifle"
- weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/polymer
+ weapon_weight = WEAPON_HEAVY
+ w_class = WEIGHT_CLASS_BULKY
+ 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_LAKVAR
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index dff24dcf659..3fdfc0f6714 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
@@ -35,6 +38,8 @@
recoil = 1
recoil_unwielded = 4
+ gunslinger_recoil_bonus = -1
+
/obj/item/gun/ballistic/shotgun/blow_up(mob/user)
if(chambered && chambered.BB)
process_fire(user, user, FALSE)
@@ -73,7 +78,7 @@
gun_firemodes = list(FIREMODE_FULLAUTO)
default_firemode = FIREMODE_FULLAUTO
- mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
+ // mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
manufacturer = MANUFACTURER_HEPHAESTUS
fire_delay = 0.05 SECONDS //slamfire
rack_delay = 0.2 SECONDS
@@ -82,7 +87,7 @@
can_be_sawn_off = TRUE
-/obj/item/gun/ballistic/shotgun/brimstone/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/brimstone/sawoff(forced = FALSE)
. = ..()
if(.)
weapon_weight = WEAPON_MEDIUM
@@ -97,7 +102,7 @@
mob_overlay_state = item_state
/obj/item/gun/ballistic/shotgun/brimstone/no_mag
- spawnwithmagazine = FALSE
+ // spawnwithmagazine = FALSE
// LK-SS SHOTGUN //
@@ -129,14 +134,14 @@
icon_state = "hellfire"
item_state = "hellfire"
- mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
+ // 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
manufacturer = MANUFACTURER_HEPHAESTUS
-/obj/item/gun/ballistic/shotgun/hellfire/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/hellfire/sawoff(forced = FALSE)
. = ..()
if(.)
var/obj/item/ammo_box/magazine/internal/tube = magazine
@@ -154,7 +159,8 @@
mob_overlay_state = item_state
/obj/item/gun/ballistic/shotgun/hellfire/no_mag
- spawnwithmagazine = FALSE
+ // spawnwithmagazine = FALSE
+
// Automatic Shotguns//
/obj/item/gun/ballistic/shotgun/automatic
spread = 4
@@ -165,29 +171,8 @@
/obj/item/gun/ballistic/shotgun/automatic
manufacturer = MANUFACTURER_HEPHAESTUS
-
-/obj/item/gun/ballistic/shotgun/automatic/shoot_live_shot(mob/living/user)
- ..()
- rack()
-
-//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
+ semi_auto = TRUE
+ gunslinger_recoil_bonus = 1
//Dual Feed Shotgun
@@ -202,7 +187,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
@@ -215,7 +203,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)
@@ -241,10 +229,10 @@
// Bulldog shotgun //
-/obj/item/gun/ballistic/shotgun/bulldog //TODO: REPATH TO LIKE /obj/item/gun/ballistic/shotgun/automatic/bulldog
+/obj/item/gun/ballistic/shotgun/bulldog
name = "\improper Bulldog Shotgun"
desc = "A semi-automatic, magazine-fed shotgun designed for combat in tight quarters, manufactured by Scarborough Arms. A historical favorite of various Syndicate factions, especially the Gorlex Marauders."
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32-old.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
@@ -252,8 +240,8 @@
item_state = "bulldog"
weapon_weight = WEAPON_MEDIUM
- mag_type = /obj/item/ammo_box/magazine/m12g
- can_suppress = FALSE
+ // mag_type = /obj/item/ammo_box/magazine/m12g
+ // can_suppress = FALSE
burst_size = 1
fire_delay = 0.4 SECONDS // this NEEDS the old delay.
fire_sound = 'sound/weapons/gun/shotgun/bulldog.ogg'
@@ -284,12 +272,15 @@
EMPTY_GUN_HELPER(shotgun/bulldog)
-/obj/item/gun/ballistic/shotgun/bulldog/inteq
+/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq
name = "\improper Mastiff Shotgun"
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
+ icon_state = "bulldog_inteq"
+ item_state = "bulldog_inteq"
+ 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/bulldog/inteq)
@@ -308,7 +299,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
righthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi'
- mag_type = /obj/item/ammo_box/magazine/cm15_mag
+ // mag_type = /obj/item/ammo_box/magazine/cm15_mag
icon_state = "cm15"
item_state = "cm15"
empty_alarm = FALSE
@@ -345,7 +336,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
force = 10
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
+ // mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
obj_flags = UNIQUE_RENAME
unique_reskin = list("Default" = "dshotgun",
@@ -411,61 +402,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
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(mob/user)
- . = ..()
- if(.)
- weapon_weight = WEAPON_MEDIUM
- wield_slowdown = 0.25
- wield_delay = 0.3 SECONDS //OP? maybe
-
- spread = 8
- spread_unwielded = 15
- recoil = 3 //or not
- recoil_unwielded = 5
- 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(mob/user)
- . = ..()
- if(.)
- item_state = "dshotgun_srm_sawn"
+NO_MAG_GUN_HELPER(shotgun/automatic/bulldog/inteq)
// IMPROVISED SHOTGUN //
@@ -473,8 +410,8 @@ EMPTY_GUN_HELPER(shotgun/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 = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ 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"
@@ -483,7 +420,10 @@ EMPTY_GUN_HELPER(shotgun/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
@@ -518,7 +458,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
if(sawn_off)
. += "ishotgun_sawn"
-/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawoff(mob/user)
+/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawoff(forced = FALSE)
. = ..()
if(. && slung) //sawing off the gun removes the sling
new /obj/item/stack/cable_coil(get_turf(src), 10)
@@ -526,11 +466,6 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
update_appearance()
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawn
- name = "sawn-off improvised shotgun"
- desc = "A single-shot shotgun. Better not miss."
- icon_state = "ishotgun_sawn"
- item_state = "ishotgun_sawn"
- w_class = WEIGHT_CLASS_NORMAL
sawn_off = TRUE
slot_flags = ITEM_SLOT_BELT
@@ -538,7 +473,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
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
+ // 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
@@ -561,7 +496,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
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
+ // 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 cartridge."
can_be_sawn_off = TRUE
@@ -590,11 +525,16 @@ EMPTY_GUN_HELPER(shotgun/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
@@ -637,220 +577,7 @@ EMPTY_GUN_HELPER(shotgun/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(mob/user)
- . = ..()
- 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(mob/user)
- . = ..()
- 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(mob/user)
- . = ..()
- if(.)
- item_state = "flamingbolt_sawn"
- mob_overlay_state = item_state
-
-//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'
- can_be_sawn_off=TRUE
- w_class = WEIGHT_CLASS_BULKY
- weapon_weight = WEAPON_MEDIUM
- force = 10
- flags_1 = CONDUCT_1
- slot_flags = ITEM_SLOT_BACK
- 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(mob/user)
- . = ..()
- 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
- 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(mob/user)
- . = ..()
- 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 cb34dff9006..31306d9e400 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -1,11 +1,13 @@
/obj/item/gun/ballistic/automatic/smg
+ show_magazine_on_sprite = TRUE
+
burst_size = 2
actions_types = list()
fire_delay = 0.13 SECONDS
spread = 6
spread_unwielded = 10
- wield_slowdown = 0.35
+ wield_slowdown = SMG_SLOWDOWN
recoil_unwielded = 4
w_class = WEIGHT_CLASS_BULKY
@@ -19,6 +21,9 @@
eject_sound = 'sound/weapons/gun/smg/smg_unload.ogg'
eject_empty_sound = 'sound/weapons/gun/smg/smg_unload.ogg'
+ gunslinger_recoil_bonus = 2
+ gunslinger_spread_bonus = 16
+
/obj/item/gun/ballistic/automatic/smg/calculate_recoil(mob/user, recoil_bonus = 0)
var/gunslinger_bonus = 2
var/total_recoil
@@ -42,18 +47,18 @@
/obj/item/gun/ballistic/automatic/smg/c20r
name = "\improper C-20r SMG"
desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.'"
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32-old.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
icon_state = "c20r"
item_state = "c20r"
- mag_type = /obj/item/ammo_box/magazine/smgm45
- can_bayonet = TRUE
- can_suppress = FALSE
- knife_x_offset = 26
- knife_y_offset = 12
+ // mag_type = /obj/item/ammo_box/magazine/m45_cobra
+ // can_bayonet = TRUE
+ // can_suppress = FALSE
+ // knife_x_offset = 26
+ // knife_y_offset = 12
show_magazine_on_sprite = TRUE
show_magazine_on_sprite_ammo = TRUE
empty_indicator = TRUE
@@ -68,12 +73,13 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
/obj/item/gun/ballistic/automatic/smg/c20r/cobra
name = "\improper Cobra 20"
desc = "An older model of SMG manufactured by Scarborough Arms, a predecessor to the military C-20 series. Chambered in .45. "
- can_bayonet = FALSE
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ // can_bayonet = FALSE
icon_state = "cobra20"
item_state = "cobra20"
/obj/item/gun/ballistic/automatic/smg/c20r/cobra/no_mag
- spawnwithmagazine = FALSE
+ // spawnwithmagazine = FALSE
/obj/item/gun/ballistic/automatic/smg/c20r/suns
desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.' Before being painted, this one was used as a film prop!"
@@ -89,12 +95,11 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
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
- can_suppress = FALSE
+ default_ammo_type = /obj/item/ammo_box/magazine/wt550m9
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/wt550m9,
+ )
actions_types = list()
- can_bayonet = TRUE
- knife_x_offset = 25
- knife_y_offset = 12
show_magazine_on_sprite = TRUE
show_magazine_on_sprite_ammo = TRUE
empty_indicator = TRUE
@@ -102,35 +107,7 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
fire_sound = 'sound/weapons/gun/smg/smg_heavy.ogg'
/obj/item/gun/ballistic/automatic/smg/wt550/no_mag
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/automatic/smg/mini_uzi
- name = "\improper Type U3 Uzi"
- desc = "A lightweight submachine gun, for when you really want someone dead. Uses 9mm rounds."
-
- icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
- 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'
- icon_state = "uzi"
-
- mag_type = /obj/item/ammo_box/magazine/uzim9mm
- bolt_type = BOLT_TYPE_OPEN
- show_magazine_on_sprite = TRUE
-
- fire_sound = 'sound/weapons/gun/smg/uzi.ogg'
- rack_sound = 'sound/weapons/gun/smg/uzi_cocked.ogg'
-
- load_sound = 'sound/weapons/gun/smg/uzi_reload.ogg'
- load_empty_sound = 'sound/weapons/gun/smg/uzi_reload.ogg'
- eject_sound = 'sound/weapons/gun/smg/uzi_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/smg/uzi_unload.ogg'
-
- spread = 4
- spread_unwielded = 8
- wield_slowdown = 0.25
- wield_delay = 0.2 SECONDS
- fire_delay = 0.1 SECONDS
+ default_ammo_type = FALSE
/obj/item/gun/ballistic/automatic/smg/vector
name = "\improper Vector carbine"
@@ -141,7 +118,10 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
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
@@ -150,15 +130,15 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
/obj/item/gun/ballistic/automatic/smg/m90
name = "\improper M-90gl Carbine"
desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32-old.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
icon_state = "m90"
item_state = "m90"
- mag_type = /obj/item/ammo_box/magazine/m556
- can_suppress = FALSE
+ // mag_type = /obj/item/ammo_box/magazine/m556
+ // can_suppress = FALSE
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_BURST, FIREMODE_OTHER)
default_firemode = FIREMODE_SEMIAUTO
@@ -240,8 +220,8 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
icon_state = "firestorm"
item_state = "firestorm"
- mag_type = /obj/item/ammo_box/magazine/c45_firestorm_mag
- can_suppress = FALSE
+ // mag_type = /obj/item/ammo_box/magazine/c45_firestorm_mag
+ // can_suppress = FALSE
unique_mag_sprites_for_variants = TRUE
burst_size = 1
actions_types = list()
@@ -253,7 +233,7 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
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
+ // spawnwithmagazine = FALSE
/obj/item/gun/ballistic/automatic/smg/firestorm/pan/Initialize()
. = ..()
@@ -271,7 +251,7 @@ EMPTY_GUN_HELPER(automatic/smg/c20r)
icon_state = "cm5"
item_state = "cm5"
- mag_type = /obj/item/ammo_box/magazine/smgm9mm
+ // mag_type = /obj/item/ammo_box/magazine/smgm9mm
weapon_weight = WEAPON_LIGHT
fire_sound = 'sound/weapons/gun/smg/smg_heavy.ogg'
manufacturer = MANUFACTURER_MINUTEMAN
@@ -313,10 +293,11 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
eject_empty_sound = 'sound/weapons/gun/rifle/skm_unload.ogg'
weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_BULKY
- mag_type = /obj/item/ammo_box/magazine/skm_545_39
-
- actions_types = list(/datum/action/item_action/fold_stock) //once again, ideally an attatchment in the future
+ w_class = WEIGHT_CLASS_NORMAL
+ 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
@@ -325,78 +306,37 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
spread_unwielded = 14
wield_delay = 0.6 SECONDS
- wield_slowdown = 0.35
-
- ///is the bipod deployed?
- var/stock_folded = FALSE
-
- ///we add these two values to recoi/spread when we have the bipod deployed
- var/stock_recoil_bonus = -2
- var/stock_spread_bonus = -5
-
- var/folded_slowdown = 0.6
- var/folded_wield_delay = 0.6 SECONDS
-
- var/unfolded_slowdown = 0.35
- var/unfolded_wield_delay = 0.2 SECONDS
-
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/ComponentInitialize()
- . = ..()
- AddElement(/datum/element/update_icon_updates_onmob)
-
-/datum/action/item_action/fold_stock
- name = "Fold/Unfold stock"
- desc = "Fold or unfold the stock for easier storage."
-
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/ui_action_click(mob/user, action)
- if(!istype(action, /datum/action/item_action/fold_stock))
- return ..()
- fold(user)
-
-
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/proc/fold(mob/user)
- if(stock_folded)
- to_chat(user, "You unfold the stock on the [src].")
- w_class = WEIGHT_CLASS_BULKY
- wield_delay = folded_wield_delay
- wield_slowdown = folded_slowdown
- else
- to_chat(user, "You fold the stock on the [src].")
- w_class = WEIGHT_CLASS_NORMAL
- wield_delay = unfolded_wield_delay
- wield_slowdown = unfolded_slowdown
-
- if(wielded)
- user.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/gun, multiplicative_slowdown = wield_slowdown)
-
- stock_folded = !stock_folded
- playsound(src, 'sound/weapons/empty.ogg', 100, 1)
- update_appearance()
-
-
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/calculate_recoil(mob/user, recoil_bonus = 0)
- var/total_recoil = recoil_bonus
- if(!stock_folded)
- total_recoil += stock_recoil_bonus
-
- return ..(user, total_recoil)
-
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/calculate_spread(mob/user, bonus_spread)
- var/total_spread = bonus_spread
-
- if(!stock_folded)
- total_spread += stock_spread_bonus
-
- return ..(user, total_spread)
-
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/update_icon_state()
- . = ..()
- item_state = "[initial(item_state)][stock_folded ? "_nostock" : ""]"
- mob_overlay_state = "[initial(item_state)][stock_folded ? "_nostock" : ""]"
-
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/update_overlays()
- . = ..()
- . += "[base_icon_state || initial(icon_state)][stock_folded ? "_nostock" : "_stock"]"
+ wield_slowdown = SMG_SLOWDOWN
+
+ 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
+ )
+
+ slot_available = list(
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ ATTACHMENT_SLOT_RAIL = 1,
+ ATTACHMENT_SLOT_STOCK = 1
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 26,
+ "y" = 20,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 19,
+ "y" = 18,
+ ),
+ ATTACHMENT_SLOT_STOCK = list(
+ "x" = 11,
+ "y" = 20,
+ )
+ )
+
+ default_attachments = list(/obj/item/attachment/foldable_stock)
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq
name = "\improper SKM-44v Mongrel"
@@ -408,7 +348,10 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
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'
@@ -419,30 +362,57 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
eject_empty_sound = 'sound/weapons/gun/smg/smg_unload.ogg'
spread = 7
- recoil_unwielded = 10
+ spread_unwielded = 10
recoil = 0
recoil_unwielded = 4
- stock_spread_bonus = -4
- stock_recoil_bonus = -1
-
wield_delay = 0.4 SECONDS
- folded_slowdown = 0.15
- folded_wield_delay = 0.2 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/inteq
+ )
+ default_attachments = list(/obj/item/attachment/foldable_stock/inteq)
- unfolded_slowdown = 0.35
- unfolded_wield_delay = 0.4 SECONDS
-
-/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'
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 160569d3f86..016cbe94f4c 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -1,35 +1,41 @@
/obj/item/gun/ballistic/automatic/toy
name = "foam force SMG"
desc = "A prototype three-round burst toy submachine gun. Ages 8 and up."
- icon_state = "saber"
- item_state = "gun"
- mag_type = /obj/item/ammo_box/magazine/toy/smg
+
+ icon = 'icons/obj/guns/manufacturer/toys/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/toys/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/toys/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/toys/onmob.dmi'
+
+ icon_state = "toysmg"
+ item_state = "toysmg"
+ 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
burst_size = 3
- can_suppress = TRUE
item_flags = NONE
casing_ejector = FALSE
manufacturer = MANUFACTURER_NANOTRASEN
recoil = -10 //its a toy...
recoil_unwielded = -10
-/obj/item/gun/ballistic/automatic/toy/update_overlays()
- . = ..()
- . += "[icon_state]_toy"
/obj/item/gun/ballistic/automatic/toy/pistol
name = "foam force pistol"
desc = "A small, easily concealable toy handgun. Ages 8 and up."
- icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
- icon_state = "pistol" // WS edit - Fix various startup runtimes
+
+ icon_state = "toypistol"
+ 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)
@@ -47,22 +53,28 @@
/obj/item/gun/ballistic/shotgun/toy
name = "foam force shotgun"
desc = "A toy shotgun with wood furniture and a four-shell capacity underneath. Ages 8 and up."
- icon_state = "shotgun"
+
+ icon = 'icons/obj/guns/manufacturer/toys/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/toys/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/toys/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/toys/onmob.dmi'
+
+ icon_state = "toyshotgun"
+ item_state = "toyshotgun"
+
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
- can_suppress = FALSE
pb_knockback = 0
recoil = -10 //its a toy...
recoil_unwielded = -10
-/obj/item/gun/ballistic/shotgun/toy/update_overlays()
- . = ..()
- . += "[icon_state]_toy"
-
/obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0, from_firing = TRUE, chamber_next_round = TRUE, atom/shooter)
. = ..()
if(chambered && !chambered.BB)
@@ -71,51 +83,15 @@
/obj/item/gun/ballistic/shotgun/toy/crossbow
name = "foam force crossbow"
desc = "A weapon favored by many overactive children. Ages 8 and up."
- icon = 'icons/obj/toy.dmi'
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
manufacturer = MANUFACTURER_DONKCO
recoil = -10 //its a toy...
recoil_unwielded = -10
-
-/obj/item/gun/ballistic/automatic/smg/c20r/toy
- name = "donksoft SMG"
- desc = "A bullpup two-round burst toy SMG, designated 'C-20r'. Ages 8 and up."
- can_suppress = FALSE
- item_flags = NONE
- mag_type = /obj/item/ammo_box/magazine/toy/smgm45
- fire_sound = 'sound/items/syringeproj.ogg'
- casing_ejector = FALSE
- manufacturer = MANUFACTURER_DONKCO
- recoil = -10 //its a toy...
- recoil_unwielded = -10
-
-/obj/item/gun/ballistic/automatic/smg/c20r/toy/riot
- mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
-
-/obj/item/gun/ballistic/automatic/smg/c20r/toy/update_overlays()
- . = ..()
- . += "[icon_state]_toy"
-
-/obj/item/gun/ballistic/automatic/hmg/l6_saw/toy
- name = "donksoft LMG"
- desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
- fire_sound = 'sound/items/syringeproj.ogg'
- can_suppress = FALSE
- item_flags = NONE
- mag_type = /obj/item/ammo_box/magazine/toy/m762
- casing_ejector = FALSE
- manufacturer = MANUFACTURER_DONKCO
- recoil = -10 //its a toy...
- recoil_unwielded = -10
-
-/obj/item/gun/ballistic/automatic/hmg/l6_saw/toy/riot
- mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
-
-/obj/item/gun/ballistic/automatic/hmg/l6_saw/toy/update_overlays()
- . = ..()
- . += "[icon_state]_toy"
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 0341c04f2c0..d9bb74da59d 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -3,52 +3,57 @@
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
+ light_color = COLOR_SOFT_RED
has_safety = TRUE
safety = TRUE
+ modifystate = FALSE
+ ammo_x_offset = 2
+
gun_firemodes = list(FIREMODE_SEMIAUTO)
default_firemode = FIREMODE_SEMIAUTO
fire_select_icon_state_prefix = "laser_"
- var/obj/item/stock_parts/cell/gun/cell //What type of power cell this uses
- var/cell_type = /obj/item/stock_parts/cell/gun
- var/modifystate = 0
- var/list/ammo_type = list(/obj/item/ammo_casing/energy)
- var/select = 1 //The state of the select fire switch. Determines from the ammo_type list what kind of shot is fired next.
- var/can_charge = TRUE //Can it be charged in a recharger?
- var/automatic_charge_overlays = TRUE //Do we handle overlays with base update_appearance()?
- var/charge_sections = 4
- ammo_x_offset = 2
- var/shaded_charge = FALSE //if this gun uses a stateful charge bar for more detail
- var/selfcharge = 0
- var/charge_tick = 0
- var/charge_delay = 4
- var/use_cyborg_cell = FALSE //whether the gun's cell drains the cyborg user's cell to recharge
- var/dead_cell = FALSE //set to true so the gun is given an empty cell
-
- var/internal_cell = FALSE ///if the gun's cell cannot be replaced
- var/small_gun = FALSE ///if the gun is small and can only fit the small gun cell
- var/big_gun = FALSE ///if the gun is big and can fit the comically large gun cell
- var/unscrewing_time = 20 ///Time it takes to unscrew the cell
-
- ///Whether the gun can be tacloaded by slapping a fresh magazine directly on it
- var/tac_reloads = FALSE
- ///If we allow tacitcal reloads, how long should it take to reload?
- var/tactical_reload_delay = 1.2 SECONDS
-
- var/load_sound = 'sound/weapons/gun/general/magazine_insert_full.ogg' //Sound when inserting magazine. UPDATE PLEASE
- var/eject_sound = 'sound/weapons/gun/general/magazine_remove_full.ogg' //Sound of ejecting a cell. UPDATE PLEASE
- var/sound_volume = 40 //Volume of loading/unloading sounds
- var/load_sound_vary = TRUE //Should the load/unload sounds vary?
+ 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
+
+ var/latch_closed = TRUE
+ var/latch_toggle_delay = 1.0 SECONDS
+
+ valid_attachments = list(
+ /obj/item/attachment/laser_sight,
+ /obj/item/attachment/rail_light,
+ /obj/item/attachment/bayonet,
+ /obj/item/attachment/sling
+ )
+ slot_available = list(
+ ATTACHMENT_SLOT_RAIL = 1
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 19,
+ "y" = 18,
+ )
+ )
/obj/item/gun/energy/emp_act(severity)
. = ..()
if(!(. & EMP_PROTECT_CONTENTS))
+ if(prob(GUN_NO_SAFETY_MALFUNCTION_CHANCE_HIGH))
+ discharge("malfunctions from the EMP")
cell.use(round(cell.charge / severity))
chambered = null //we empty the chamber
recharge_newshot() //and try to charge a new shot
@@ -57,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.give(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)
@@ -111,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 ..()
@@ -122,10 +129,10 @@
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)
- insert_cell(user, C)
+ return insert_cell(user, C)
else
if (tac_reloads)
eject_cell(user, C)
@@ -133,24 +140,22 @@
return ..()
/obj/item/gun/energy/proc/insert_cell(mob/user, obj/item/stock_parts/cell/gun/C)
- if(small_gun && !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(!big_gun && 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
- if(user.transferItemToLoc(C, src))
- cell = C
- to_chat(user, span_notice("You load the [C] into \the [src]."))
- playsound(src, load_sound, sound_volume, load_sound_vary)
- update_appearance()
- return TRUE
+ 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("You cannot seem to get \the [src] out of your hands!"))
+ to_chat(user, span_warning("The [src]'s cell retainment clip is latched!"))
return FALSE
/obj/item/gun/energy/proc/eject_cell(mob/user, obj/item/stock_parts/cell/gun/tac_load = null)
- playsound(src, load_sound, sound_volume, load_sound_vary)
+ playsound(src, load_sound, load_sound_volume, load_sound_vary)
cell.forceMove(drop_location())
var/obj/item/stock_parts/cell/gun/old_cell = cell
old_cell.update_appearance()
@@ -170,17 +175,33 @@
user.put_in_hands(old_cell)
update_appearance()
-/obj/item/gun/energy/get_gun_attachments()
- if(cell && !internal_cell)
- attachment_options += list("Cell" = image(icon = cell.icon, icon_state = cell.icon_state))
- ..()
-
-/obj/item/gun/energy/remove_gun_attachments(mob/living/user, obj/item/I, picked_option)
- if(picked_option == "Cell")
- if(I.use_tool(src, user, unscrewing_time, volume=100))
- eject_cell(user, I)
+//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
/obj/item/gun/energy/can_shoot(visuals)
if(safety && !visuals)
@@ -220,7 +241,12 @@
/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.
- return ..()
+ ..() //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()
+ return
+
/obj/item/gun/energy/proc/select_fire(mob/living/user)
select++
@@ -259,6 +285,20 @@
var/overlay_icon_state = "[icon_state]_charge"
var/obj/item/ammo_casing/energy/shot = ammo_type[modifystate ? select : 1]
var/ratio = get_charge_ratio()
+ 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
if(cell)
. += "[icon_state]_cell"
if(ratio == 0)
@@ -329,11 +369,17 @@
/obj/item/gun/energy/examine(mob/user)
. = ..()
+ if(!internal_magazine)
+ . += "The cell retainment latch is [latch_closed ? "CLOSED" : "OPEN"]. Alt-Click to toggle the latch."
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
if(ammo_type.len > 1)
- . += "You can switch firemodes by pressing the unqiue action key. By default, this is space"
+ . += "You can switch firemodes by pressing the unique action key. By default, this is space"
if(cell)
. += "\The [name]'s cell has [cell.percent()]% charge remaining."
. += "\The [name] has [round(cell.charge/shot.e_cost)] shots remaining on [shot.select_name] mode."
else
. += span_notice("\The [name] doesn't seem to have a cell!")
+
+/obj/item/gun/energy/unsafe_shot(target)
+ . = ..()
+ process_chamber()
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 6988f1f6cb7..6084e28cf4a 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -8,16 +8,15 @@
icon_state = "energy"
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
- modifystate = 1
- can_flashlight = TRUE
+ modifystate = TRUE
ammo_x_offset = 2
- flight_x_offset = 15
- flight_y_offset = 10
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"
@@ -25,28 +24,21 @@
icon_state = "mini"
item_state = "gun"
w_class = WEIGHT_CLASS_SMALL
- cell_type = /obj/item/stock_parts/cell/gun/mini
- small_gun = TRUE
+ 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
- can_flashlight = FALSE // Can't attach or detach the flashlight, and override it's icon update
- gunlight_state = "mini-light"
- flight_x_offset = 19
- flight_y_offset = 13
-
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/Initialize()
- set_gun_light(new /obj/item/flashlight/seclite(src))
- return ..()
-
/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"
@@ -55,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
@@ -67,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
@@ -81,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)
@@ -93,13 +85,13 @@
name = "modified antique laser gun"
desc = "It's somehow modified to have more firemodes."
icon_state = "capgun_brazil_hos"
- item_state = "hoslaser"
+ item_state = "hoslaserkill0"
manufacturer = MANUFACTURER_SHARPLITE
/obj/item/gun/energy/e_gun/hos/brazil/true
desc = "This genuine antique laser gun, modified with an experimental suite of alternative firing modes based on the X-01 MultiPhase Energy Gun, is now truly one of the finest weapons in the frontier."
icon_state = "capgun_hos"
- item_state = "hoslaser"
+ item_state = "hoslaserkill0"
selfcharge = 1
manufacturer = MANUFACTURER_SHARPLITE
@@ -108,10 +100,9 @@
desc = "The \"Dynamic Rapid-Apprehension of the Guilty\" net is a revolution in law enforcement technology."
icon_state = "dragnet"
item_state = "dragnet"
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ lefthand_file = GUN_LEFTHAND_ICON
+ righthand_file = GUN_RIGHTHAND_ICON
ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap)
- can_flashlight = FALSE
ammo_x_offset = 1
/obj/item/gun/energy/e_gun/dragnet/snare
@@ -121,25 +112,35 @@
/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."
+ lefthand_file = GUN_LEFTHAND_ICON
+ righthand_file = GUN_RIGHTHAND_ICON
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
- can_flashlight = FALSE
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."
icon_state = "nucgun"
item_state = "nucgun"
+
+ lefthand_file = GUN_LEFTHAND_ICON
+ righthand_file = GUN_RIGHTHAND_ICON
+
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
@@ -198,16 +199,18 @@
item_state = "gun"
ammo_x_offset = 2
charge_sections = 6
- small_gun = TRUE
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"
@@ -229,6 +232,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
@@ -242,9 +246,9 @@
inhand_y_dimension = 64
icon_state = "iotshotgun"
item_state = "shotgun_combat"
- shaded_charge = 1
- w_class = WEIGHT_CLASS_BULKY
+ shaded_charge = TRUE
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
@@ -257,12 +261,12 @@
mob_overlay_icon = 'icons/obj/guns/manufacturer/eoehoma/onmob.dmi'
icon_state = "e11"
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser/eoehoma)
- can_flashlight = TRUE
ammo_x_offset = 0
- flight_x_offset = 20
- flight_y_offset = 9
spread = 80
spread_unwielded = 140
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 ac3aa9e3d21..ab0cf6ef90f 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -4,23 +4,20 @@
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
- can_flashlight = TRUE
- flight_x_offset = 15
- flight_y_offset = 9
automatic_charge_overlays = FALSE
- can_bayonet = TRUE
- knife_x_offset = 20
- knife_y_offset = 12
- internal_cell = TRUE
+ internal_magazine = TRUE //prevents you from giving it an OP cell - WS Edit
custom_price = 750
w_class = WEIGHT_CLASS_BULKY
muzzleflash_iconstate = "muzzle_flash_light"
- muzzle_flash_color = COLOR_WHITE
+ light_color = COLOR_WHITE
var/overheat_time = 16
var/holds_charge = FALSE
@@ -28,12 +25,18 @@
var/overheat = FALSE
var/mob/holder
-
var/max_mod_capacity = 100
var/list/modkits = list()
var/recharge_timerid
+ slot_offsets = list(
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 24,
+ "y" = 13,
+ )
+ )
+
/obj/item/gun/energy/kinetic_accelerator/shoot_with_empty_chamber(mob/living/user)
playsound(src, dry_fire_sound, 30, TRUE) //click sound but no to_chat message to cut on spam
return
@@ -192,6 +195,8 @@
icon_state = null
damage = 20
damage_type = BRUTE
+ wall_damage_flags = PROJECTILE_BONUS_DAMAGE_MINERALS
+ wall_damage_override = MINERAL_WALL_INTEGRITY
flag = "bomb"
range = 3
log_override = TRUE
@@ -235,8 +240,6 @@
for(var/obj/item/borg/upgrade/modkit/M in mods)
M.projectile_strike(src, target_turf, target, kinetic_gun)
if(ismineralturf(target_turf))
- var/turf/closed/mineral/M = target_turf
- M.gets_drilled(firer, TRUE)
if(iscarbon(firer))
var/mob/living/carbon/C = firer
var/skill_modifier = C?.mind.get_skill_modifier(/datum/skill/mining, SKILL_SPEED_MODIFIER)
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index c564ae32b4d..44b8d4eaf8d 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -1,8 +1,8 @@
/obj/item/gun/energy/laser
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"
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
item_state = "laser"
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=2000)
@@ -16,7 +16,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"
@@ -31,11 +31,11 @@
righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "retro"
+ item_state = "laser"
desc = "An antiquated model of the basic lasergun, no longer used or sold by Sharplite. Nevertheless, the sheer popularity of this model makes it a somewhat common sight to this day."
ammo_x_offset = 3
manufacturer = MANUFACTURER_SHARPLITE
-
/obj/item/gun/energy/laser/captain
name = "antique laser gun"
icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
@@ -43,7 +43,7 @@
righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "caplaser"
- item_state = null
+ item_state = "caplaser"
desc = "This is the SL X-00, an antique laser gun, out of production for decades and well beyond anyone's capacity to recreate. All craftsmanship is of the highest quality. It is decorated with ashdrake leather and chrome. The gun menaces with spikes of energy. On the item is an image of a space station. The station is exploding."
force = 10
ammo_x_offset = 3
@@ -60,7 +60,7 @@
/obj/item/gun/energy/laser/captain/scattershot
name = "scatter shot laser rifle"
desc = "An industrial-grade heavy-duty laser rifle with a modified laser lens to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theoretically infinite use."
- ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser/slug)
shaded_charge = FALSE
/obj/item/gun/energy/laser/cyborg
@@ -74,8 +74,8 @@
/obj/item/gun/energy/laser/scatter
name = "scatter laser gun"
- desc = "A laser gun equipped with a refraction kit that spreads bolts."
- ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
+ desc = "A laser gun mimicking the function of a shotgun, manufactured with an adjustable lens capable of projecting scattershot or slugs."
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser/slug)
manufacturer = MANUFACTURER_NONE
/obj/item/gun/energy/laser/scatter/shotty
@@ -84,7 +84,7 @@
icon_state = "cshotgun"
item_state = "shotgun"
desc = "A combat shotgun gutted and refitted with an internal laser system. Can switch between taser and scattered disabler shots."
- shaded_charge = 0
+ shaded_charge = FALSE
ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter, /obj/item/ammo_casing/energy/electrode)
manufacturer = MANUFACTURER_NONE
@@ -94,10 +94,12 @@
name = "accelerator laser cannon"
desc = "An advanced laser cannon that does more damage the farther away the target is."
icon_state = "lasercannon"
- item_state = "laser"
+ item_state = "lasercannon"
w_class = WEIGHT_CLASS_BULKY
- big_gun = TRUE
- 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 +131,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 +173,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 +206,19 @@
item_state = "gun"
ammo_x_offset = 2
charge_sections = 4
- small_gun = TRUE
- 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"
@@ -223,10 +228,11 @@
righthand_file = 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/eoehoma/onmob.dmi'
icon_state = "e10"
+ item_state = "gun"
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 +251,22 @@
icon_state = "e50"
item_state = "e50"
- big_gun = TRUE
- 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 22e6e57d881..066b1938648 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/mounted.dm b/code/modules/projectiles/guns/energy/mounted.dm
index 4dc5cae7755..d32c5f13b1e 100644
--- a/code/modules/projectiles/guns/energy/mounted.dm
+++ b/code/modules/projectiles/guns/energy/mounted.dm
@@ -3,10 +3,11 @@
desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots."
icon = 'icons/obj/items_cyborg.dmi'
icon_state = "taser"
+ lefthand_file = GUN_LEFTHAND_ICON
+ righthand_file = GUN_RIGHTHAND_ICON
item_state = "armcannonstun4"
force = 5
selfcharge = 1
- can_flashlight = FALSE
trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses neural signals instead
/obj/item/gun/energy/e_gun/advtaser/mounted/dropped()//if somebody manages to drop this somehow...
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index dfa23e26b46..a63fbad391e 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
@@ -22,7 +25,7 @@
spread_unwielded = 25
muzzleflash_iconstate = "muzzle_flash_pulse"
- muzzle_flash_color = COLOR_BRIGHT_BLUE
+ light_color = COLOR_BRIGHT_BLUE
/obj/item/gun/energy/pulse/emp_act(severity)
return
@@ -38,18 +41,17 @@
slot_flags = ITEM_SLOT_BACK
icon_state = "pulse_carbine"
item_state = null
- internal_cell = FALSE
- big_gun = TRUE //haha gun go brr
- cell_type = /obj/item/stock_parts/cell/gun/large
- can_flashlight = TRUE
- flight_x_offset = 18
- flight_y_offset = 12
+ 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
/obj/item/gun/energy/pulse/prize/Initialize()
. = ..()
- GLOB.poi_list += src
+ SSpoints_of_interest.make_point_of_interest(src)
var/turf/T = get_turf(src)
message_admins("A pulse rifle prize has been created at [ADMIN_VERBOSEJMP(T)]")
@@ -58,7 +60,7 @@
notify_ghosts("Someone won a pulse rifle as a prize!", source = src, action = NOTIFY_ORBIT, header = "Pulse rifle prize")
/obj/item/gun/energy/pulse/prize/Destroy()
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
. = ..()
/obj/item/gun/energy/pulse/pistol
@@ -72,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 16fad426dcf..adbfedb65d5 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -6,9 +6,7 @@
shaded_charge = FALSE
ammo_x_offset = 2
ammo_y_offset = 2
- can_flashlight = FALSE
w_class = WEIGHT_CLASS_HUGE
- big_gun = TRUE //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)
@@ -18,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"
@@ -28,9 +26,6 @@
slot_flags = ITEM_SLOT_BELT
ammo_x_offset = 2
ammo_y_offset = 0
- can_flashlight = TRUE
- flight_x_offset = 18
- flight_y_offset = 11
/obj/item/gun/energy/decloner
name = "biological demolecularisor"
@@ -51,10 +46,10 @@
icon_state = "flora"
item_state = "gun"
ammo_type = list(/obj/item/ammo_casing/energy/flora/yield, /obj/item/ammo_casing/energy/flora/mut, /obj/item/ammo_casing/energy/flora/revolution)
- modifystate = 1
+ modifystate = TRUE
ammo_x_offset = 1
selfcharge = 1
- shaded_charge = 1
+ shaded_charge = TRUE
/obj/item/gun/energy/meteorgun
name = "meteor gun"
@@ -63,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
@@ -98,7 +96,6 @@
overheat_time = 20
holds_charge = TRUE
unique_frequency = TRUE
- can_flashlight = FALSE
max_mod_capacity = 0
manufacturer = MANUFACTURER_ROSEUS
@@ -108,14 +105,14 @@
icon_state = "crossbowlarge"
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=4000)
- suppressed = null
+ suppressed = FALSE
ammo_type = list(/obj/item/ammo_casing/energy/bolt/large)
manufacturer = MANUFACTURER_ROSEUS
/obj/item/gun/energy/plasmacutter
name = "plasma cutter"
- desc = "A mining tool capable of expelling concentrated plasma bursts. You could use it to cut limbs off xenos! Or, you know, mine stuff."
+ desc = "An engineering tool capable of expelling concentrated plasma bursts. You could use it to cut limbs off xenos! Or, you know, cut through walls."
icon_state = "plasmacutter"
item_state = "plasmacutter"
ammo_type = list(/obj/item/ammo_casing/energy/plasma)
@@ -128,10 +125,12 @@
heat = 3800
usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg')
- tool_behaviour = TOOL_WELDER
- toolspeed = 0.7 //plasmacutters can be used as welders, and are faster than standard welders
- internal_cell = TRUE //so you don't cheese through the need for plasma - WS EDIT
- var/charge_weld = 25 //amount of charge used up to start action (multiplied by amount) and per progress_flash_divisor ticks of welding
+ tool_behaviour = TOOL_DECONSTRUCT
+ wall_decon_damage = 200
+ 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
/obj/item/gun/energy/plasmacutter/ComponentInitialize()
. = ..()
@@ -160,29 +159,50 @@
else
..()
-// Can we weld? Plasma cutter does not use charge continuously.
+// Can we cut? Plasma cutter does not use charge continuously.
// Amount cannot be defaulted to 1: most of the code specifies 0 in the call.
/obj/item/gun/energy/plasmacutter/tool_use_check(mob/living/user, amount)
if(QDELETED(cell))
to_chat(user, "[src] does not have a cell, and cannot be used!")
return FALSE
- // Amount cannot be used if drain is made continuous, e.g. amount = 5, charge_weld = 25
+ // Amount cannot be used if drain is made continuous, e.g. amount = 5, charge_cut = 25
// Then it'll drain 125 at first and 25 periodically, but fail if charge dips below 125 even though it still can finish action
- // Alternately it'll need to drain amount*charge_weld every period, which is either obscene or makes it free for other uses
- if(amount ? cell.charge < charge_weld * amount : cell.charge < charge_weld)
+ // Alternately it'll need to drain amount*charge_cut every period, which is either obscene or makes it free for other uses
+ if(amount ? cell.charge < charge_cut * amount : cell.charge < charge_cut)
to_chat(user, "You need more charge to complete this task!")
return FALSE
return TRUE
+/obj/item/gun/energy/plasmacutter/attack(mob/living/carbon/human/target, mob/user)
+ if(!istype(target))
+ return ..()
+ var/obj/item/bodypart/attackedLimb = target.get_bodypart(check_zone(user.zone_selected))
+ if(!attackedLimb || IS_ORGANIC_LIMB(attackedLimb) || (user.a_intent == INTENT_HARM))
+ return ..()
+ if(!tool_start_check(user, amount = 1))
+ return TRUE
+ user.visible_message("[user] starts to fix some of the dents on [target]'s [parse_zone(attackedLimb.body_zone)].",
+ "You start fixing some of the dents on [target == user ? "your" : "[target]'s"] [parse_zone(attackedLimb.body_zone)].")
+ if(!use_tool(target, user, delay = (target == user ? 5 SECONDS : 0.5 SECONDS), amount = 1, volume = 25))
+ return TRUE
+ item_heal_robotic(target, user, brute_heal = 15, burn_heal = 0)
+ return TRUE
+
/obj/item/gun/energy/plasmacutter/use(amount)
- return (!QDELETED(cell) && cell.use(amount ? amount * charge_weld : charge_weld))
+ return (!QDELETED(cell) && cell.use(amount ? amount * charge_cut : charge_cut))
/obj/item/gun/energy/plasmacutter/use_tool(atom/target, mob/living/user, delay, amount=1, volume=0, datum/callback/extra_checks)
if(amount)
- target.add_overlay(GLOB.welding_sparks)
+ if(adv)
+ target.add_overlay(GLOB.advanced_cutting_effect)
+ else
+ target.add_overlay(GLOB.cutting_effect)
. = ..()
- target.cut_overlay(GLOB.welding_sparks)
+ if(adv)
+ target.cut_overlay(GLOB.advanced_cutting_effect)
+ else
+ target.cut_overlay(GLOB.cutting_effect)
else
. = ..(amount=1)
@@ -191,6 +211,7 @@
icon_state = "adv_plasmacutter"
item_state = "adv_plasmacutter"
force = 15
+ wall_decon_damage = 300
ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv)
/obj/item/gun/energy/wormhole_projector
@@ -269,7 +290,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
@@ -327,7 +351,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/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 8f918bb63db..2dec5fc05bf 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -5,7 +5,6 @@
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
ammo_x_offset = 3
-
spread = 2
spread_unwielded = 4
@@ -22,7 +21,6 @@
/obj/item/gun/energy/e_gun/advtaser/cyborg
name = "cyborg taser"
desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
- can_flashlight = FALSE
can_charge = FALSE
use_cyborg_cell = TRUE
@@ -37,11 +35,7 @@
item_state = null
ammo_type = list(/obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 2
- can_flashlight = TRUE
- flight_x_offset = 15
- flight_y_offset = 10
manufacturer = MANUFACTURER_SHARPLITE_NEW
-
spread = 2
spread_unwielded = 4
diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
new file mode 100644
index 00000000000..d386b65df6e
--- /dev/null
+++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -0,0 +1,584 @@
+#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"
+ desc = "CLIP's standard service pistol. 10 rounds of 10mm ammunition make the CM-23 deadlier than many other service pistols, but its weight and bulk have made it unpopular as a sidearm. It has largely been phased out outside of specialized units and patrols on the fringes of CLIP space. Chambered in 10mm."
+ 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 = "cm23"
+ item_state = "clip_generic"
+ w_class = WEIGHT_CLASS_NORMAL
+ 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'
+ 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'
+
+ 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-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
+ caliber = "10mm"
+ max_ammo = 10
+
+/obj/item/ammo_box/magazine/cm23/update_icon_state()
+ . = ..()
+ 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."
+ 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 = "cm70"
+ item_state = "clip_generic"
+ 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
+ fire_delay = 0.4 SECONDS
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST)
+ default_firemode = FIREMODE_SEMIAUTO
+ manufacturer = MANUFACTURER_MINUTEMAN
+
+ fire_select_icon_state_prefix = "clip_"
+ adjust_fire_select_icon_state_on_safety = TRUE
+
+ fire_sound = 'sound/weapons/gun/pistol/cm70.ogg'
+
+ spread = 8
+ spread_unwielded = 20
+
+/obj/item/ammo_box/magazine/m9mm_cm70
+ name = "CM-70 machine pistol magazine (9mm)"
+ desc = "A 18-round magazine designed for the CM-70 machine pistol. These rounds do okay damage, but struggle against armor."
+ icon_state = "cm70_mag_18"
+ base_icon_state = "cm70_mag"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ caliber = "9mm"
+ max_ammo = 18
+
+
+/obj/item/ammo_box/magazine/m9mm_cm70/update_icon_state()
+ . = ..()
+ icon_state = "[base_icon_state]_[ammo_count() == 1 ? 1 : round(ammo_count(),3)]"
+
+/obj/item/ammo_box/magazine/m9mm_cm70/empty
+ start_empty = TRUE
+
+/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"
+ desc = "CLIP's standard-issue submachine gun. Well-liked for its accuracy, stability, and ease of use compared to other submachineguns. Chambered in 9mm."
+ 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 = "cm5"
+ item_state = "cm5"
+
+ 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 = CLIP_ATTACHMENTS
+ slot_available = list(
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ ATTACHMENT_SLOT_RAIL = 1
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 37,
+ "y" = 20,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 27,
+ "y" = 17,
+ )
+ )
+
+ fire_select_icon_state_prefix = "clip_"
+ adjust_fire_select_icon_state_on_safety = TRUE
+
+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 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
+ caliber = "9mm"
+ max_ammo = 30
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/cm5_9mm/empty
+ start_empty = TRUE
+
+/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."
+ icon_state = "cm5c"
+ item_state = "cm5c"
+
+ w_class = WEIGHT_CLASS_NORMAL
+ spread = 10
+ spread_unwielded = 20
+
+ fire_delay = 0.1 SECONDS
+
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 30,
+ "y" = 20,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 22,
+ "y" = 17,
+ )
+ )
+
+
+ recoil = 1
+ recoil_unwielded = 2
+ wield_delay = 0.2 SECONDS
+ wield_slowdown = 0.15
+
+ var/obj/item/storage/briefcase/current_case
+
+/obj/item/gun/ballistic/automatic/smg/cm5/compact/attackby(obj/item/attacking_item, mob/user, params)
+ . = ..()
+ if(current_case)
+ return
+ if(!istype(attacking_item, /obj/item/storage/briefcase))
+ return
+ if(attacking_item.contents.len != 0)
+ return
+ to_chat(user, span_notice("...? You rig [src] to fire from within [attacking_item]."))
+ current_case = attacking_item
+ attacking_item.forceMove(src)
+ icon = attacking_item.icon
+ base_icon_state = attacking_item.icon_state
+ item_state = attacking_item.item_state
+ name = attacking_item.name
+ lefthand_file = attacking_item.lefthand_file
+ righthand_file = attacking_item.righthand_file
+ pickup_sound = attacking_item.pickup_sound
+ drop_sound = attacking_item.drop_sound
+ w_class = WEIGHT_CLASS_BULKY
+
+//how are you even supposed to hold it like this...?
+ spread += 10
+ spread_unwielded +=10
+
+ cut_overlays()
+ update_appearance()
+
+/obj/item/gun/ballistic/automatic/smg/cm5/compact/AltClick(mob/user)
+ if(!current_case)
+ return ..()
+ user.put_in_hands(current_case)
+ icon = src::icon
+ base_icon_state = src::icon_state
+ item_state = src::item_state
+ name = src::name
+ lefthand_file = src::lefthand_file
+ righthand_file = src::righthand_file
+ pickup_sound = src::pickup_sound
+ drop_sound = src::drop_sound
+ w_class = WEIGHT_CLASS_NORMAL
+
+ spread = src::spread
+ spread_unwielded = src::spread_unwielded
+ to_chat(user, span_notice("You remove the [current_case] from [src]"))
+ current_case = null
+
+ cut_overlays()
+ update_appearance()
+
+
+//########### MARKSMAN ###########//
+/obj/item/gun/ballistic/automatic/marksman/f4
+ name = "CM-F4"
+ desc = "CLIP's marksman rifle, used by both military and law enforcement units. Designed not long after the CM-24, the venerable F4 has adapted well to continued upgrades. Chambered in .308."
+
+ 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 = "f4"
+ item_state = "f4"
+ show_magazine_on_sprite = TRUE
+ weapon_weight = WEAPON_MEDIUM
+ w_class = WEIGHT_CLASS_BULKY
+ bolt_type = BOLT_TYPE_CLIP
+ 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()
+ manufacturer = MANUFACTURER_MINUTEMAN
+
+ 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_RAIL = 1
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 48,
+ "y" = 17,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 35,
+ "y" = 16,
+ )
+ )
+
+ wield_slowdown = DMR_SLOWDOWN
+ spread = -4
+ fire_select_icon_state_prefix = "clip_"
+ adjust_fire_select_icon_state_on_safety = TRUE
+
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq
+ name = "\improper SsG-04"
+ desc = "An F4 rifle purchased from CLIP and modified to suit IRMG's needs. Chambered in .308."
+ 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 = "f4_inteq"
+ item_state = "f4_inteq"
+
+/obj/item/gun/ballistic/automatic/marksman/f90
+ name = "CM-F90"
+ desc = "A powerful sniper rifle used by vanishingly rare CLIP specialists, capable of impressive range and penetrating power. Chambered in 6.5mm CLIP."
+ 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 = "f90"
+ item_state = "f90"
+
+ fire_sound = 'sound/weapons/gun/sniper/cmf90.ogg'
+
+ 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
+
+ manufacturer = MANUFACTURER_MINUTEMAN
+ spread = -5
+ spread_unwielded = 35
+ recoil = 2
+ recoil_unwielded = 10
+ 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
+
+/obj/item/ammo_box/magazine/f90
+ name = "\improper CM-F90 Magazine (6.5x57mm CLIP)"
+ desc = "A large 5-round box magazine for the CM-F90 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."
+ base_icon_state = "f90_mag"
+ icon_state = "f90_mag-1"
+ ammo_type = /obj/item/ammo_casing/a65clip
+ caliber = "6.5CLIP"
+ max_ammo = 5
+
+/obj/item/ammo_box/magazine/f90/update_icon_state()
+ . = ..()
+ icon_state = "[base_icon_state]-[!!ammo_count()]"
+
+/obj/item/ammo_box/magazine/f90/empty
+ start_empty = TRUE
+
+//########### RIFLES ###########//
+/obj/item/gun/ballistic/automatic/assault/cm82
+ name = "\improper CM-82"
+ desc = "CLIP's standard assault rifle, still relatively new in service. Accurate, reliable, and easy to use, the CM-82 replaced the CM-24 as CLIP's assault rifle almost overnight, and has proven immensely popular since. Chambered in 5.56mm."
+ 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'
+
+ fire_sound = 'sound/weapons/gun/rifle/cm82.ogg'
+ icon_state = "cm82"
+ item_state = "cm82"
+ show_magazine_on_sprite = TRUE
+ w_class = WEIGHT_CLASS_BULKY
+ slot_flags = ITEM_SLOT_BACK
+ bolt_type = BOLT_TYPE_CLIP
+ 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
+
+ fire_delay = 0.18 SECONDS
+
+ load_sound = 'sound/weapons/gun/rifle/cm82_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/rifle/cm82_reload.ogg'
+ eject_sound = 'sound/weapons/gun/rifle/cm82_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/rifle/cm82_unload.ogg'
+
+ fire_select_icon_state_prefix = "clip_"
+ adjust_fire_select_icon_state_on_safety = TRUE
+
+/obj/item/gun/ballistic/automatic/assault/skm/cm24
+ name = "\improper CM-24"
+ desc = "An obsolete and very rugged assault rifle with a heavy projectile and slow action for its class. Once CLIP's standard assault rifle produced in phenomenal numbers for the First Frontiersman War, it now serves as an acceptable, if rare, battle rifle. Chambered in 7.62mm CLIP."
+
+ 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 = "cm24"
+ item_state = "cm24"
+ manufacturer = MANUFACTURER_NONE
+
+ fire_select_icon_state_prefix = "clip_"
+ adjust_fire_select_icon_state_on_safety = TRUE
+
+/obj/item/gun/ballistic/automatic/hmg/cm40
+ name = "\improper CM-40"
+ desc = "A light machine gun used by CLIP heavy weapons teams, capable of withering suppressive fire. The weight and recoil make it nearly impossible to use without deploying the bipod against appropriate cover, such as a table, or bracing against solid cover. Chambered in 7.62x40mm CLIP."
+ 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 = "cm40"
+ item_state = "cm40"
+
+ fire_sound = 'sound/weapons/gun/hmg/cm40.ogg'
+ rack_sound = 'sound/weapons/gun/hmg/cm40_cocked.ogg'
+
+ rack_sound_vary = FALSE
+
+ load_sound_vary = FALSE
+ eject_sound_vary = FALSE
+
+ load_sound = 'sound/weapons/gun/hmg/cm40_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/hmg/cm40_reload.ogg'
+ eject_sound = 'sound/weapons/gun/hmg/cm40_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/hmg/cm40_unload.ogg'
+
+ fire_delay = 0.1 SECONDS
+
+ show_magazine_on_sprite = TRUE
+ weapon_weight = WEAPON_MEDIUM
+ w_class = WEIGHT_CLASS_BULKY
+ slot_flags = ITEM_SLOT_BACK
+ manufacturer = MANUFACTURER_MINUTEMAN
+ 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
+
+ recoil = 2 //identical to other LMGS
+ recoil_unwielded = 7 //same as 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
+
+ deploy_recoil_bonus = -2
+ deploy_spread_bonus = -6
+
+/obj/item/gun/ballistic/automatic/hmg/cm40/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/automatic_fire, 0.1 SECONDS)
+ AddElement(/datum/element/update_icon_updates_onmob)
+
+/obj/item/ammo_box/magazine/cm40_762_40_box
+ name = "CM-40 box magazine (7.62x40mm CLIP)"
+ desc = "An 80 round box magazine for CM-40 light machine gun. These rounds do good damage with good armor penetration."
+ base_icon_state = "cm40_mag"
+ icon_state = "cm40_mag-1"
+ ammo_type = /obj/item/ammo_casing/a762_40
+ max_ammo = 80
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/ammo_box/magazine/cm40_762_40_box/update_icon_state()
+ . = ..()
+ icon_state = "[base_icon_state]-[!!ammo_count()]"
+
+/obj/item/ammo_box/magazine/cm40_762_40_box/empty
+ start_empty = TRUE
+
+//########### MISC ###########//
+
+/obj/item/gun/ballistic/shotgun/cm15
+ name = "\improper CM-15"
+ desc = "A large automatic shotgun used by CLIP. Generally employed by law enforcement and breaching specialists, and rarely by CLIP-BARD (typically with incendiary ammunition). Chambered in 12 gauge."
+ 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 = "cm15"
+ item_state = "cm15"
+
+ fire_select_icon_state_prefix = "clip_"
+ adjust_fire_select_icon_state_on_safety = TRUE
+
+ manufacturer = MANUFACTURER_MINUTEMAN
+
+ weapon_weight = WEAPON_MEDIUM
+// can_suppress = FALSE
+ 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
+
+ semi_auto = TRUE
+ internal_magazine = FALSE
+ casing_ejector = TRUE
+ tac_reloads = TRUE
+ pickup_sound = 'sound/items/handling/rifle_pickup.ogg'
+
+ fire_sound = 'sound/weapons/gun/shotgun/bulldog.ogg'
+
+ load_sound = 'sound/weapons/gun/rifle/ar_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/rifle/ar_reload.ogg'
+ eject_sound = 'sound/weapons/gun/rifle/ar_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/rifle/ar_unload.ogg'
+
+ rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg'
+
+ spread = 4
+ spread_unwielded = 16
+ recoil = 1
+ recoil_unwielded = 4
+ 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
new file mode 100644
index 00000000000..de0e28c85b1
--- /dev/null
+++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/lasers.dm
@@ -0,0 +1,49 @@
+/obj/item/gun/energy/kalix/clip
+ name = "CM-1"
+ desc = "CLIP's first standard-issue weapon, a near-copy of colonial-era weapons left behind by Free Zohil forces in CLIP's founding years. Outdated and difficult to source replacement parts for, but nevertheless still very common among BARD personnel and for ceremonal use."
+ 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 = "cm1"
+ item_state = "cm1"
+
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
+ default_firemode = FIREMODE_SEMIAUTO
+
+ 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
+
+/obj/item/gun/energy/laser/e50/clip
+ name = "ECM-50"
+ desc = "An extensive modification of the Eoehoma E-50 Emitter, customized specifically for CLIP-BARD. Sacrifices some of the E-50's raw power for vastly improved energy efficiency, while preserving its incendiary side-effects."
+
+ 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 = "cm50"
+ item_state = "cm50"
+ shaded_charge = TRUE
+ charge_sections = 4
+
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/eoehoma/e50/clip)
+
+/obj/item/ammo_casing/energy/laser/eoehoma/e50/clip
+ projectile_type = /obj/projectile/beam/emitter/hitscan/clip
+ fire_sound = 'sound/weapons/gun/laser/heavy_laser.ogg'
+ e_cost = 6250
+ delay = 0.6 SECONDS
+
+/obj/projectile/beam/emitter/hitscan/clip
+ damage = 35
diff --git a/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm b/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm
index 6b5aa0997ae..fa618fd521a 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,17 +47,23 @@
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"
desc = "An advanced variant of the BG-12, the BG-16 is the military-grade beam gun designed and manufactured by Etherbor Industries as the standard-issue close-range weapon of the Epsilon Eridani Defense Force."
icon_state = "pgfgun"
item_state = "pgfgun"
- w_class = WEIGHT_CLASS_NORMAL
- cell_type = /obj/item/stock_parts/cell/gun/pgf
- ammo_type = list(/obj/item/ammo_casing/energy/pgf , /obj/item/ammo_casing/energy/disabler/hitscan)
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
+ default_firemode = FIREMODE_SEMIAUTO
+
+ 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
name = "concentrated energy"
@@ -64,9 +74,10 @@
muzzle_flash_color_override = LIGHT_COLOR_ELECTRIC_GREEN
impact_light_color_override = LIGHT_COLOR_ELECTRIC_GREEN
-/obj/item/ammo_casing/energy/pgf
+/obj/item/ammo_casing/energy/kalix/pgf
projectile_type = /obj/projectile/beam/hitscan/kalix/pgf
fire_sound = 'sound/weapons/gun/energy/kalixsmg.ogg'
+ e_cost = 666 //30 shots per cell
delay = 1
/obj/item/gun/energy/kalix/pistol //blue
@@ -78,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)
@@ -95,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 Epsilon Eridani Defense Force. If the stopping power and fire rate isn't enough, it comes with a 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
@@ -113,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
@@ -166,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
new file mode 100644
index 00000000000..4a48dd5ea2b
--- /dev/null
+++ b/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm
@@ -0,0 +1,308 @@
+/obj/item/gun/ballistic/automatic/pistol/mauler
+ name = "Mauler machine pistol"
+ desc = "An automatic machine pistol originating from the Shoal. Impressive volume of fire with abysmal accuracy, lackluster armor penetration, and limited magazine size render it mostly useless outside of very close quarters. Chambered in 9mm."
+ icon = 'icons/obj/guns/manufacturer/frontier_import/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/frontier_import/onmob.dmi'
+
+ icon_state = "mauler"
+ item_state = "hp_generic"
+ 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)
+ default_firemode = FIREMODE_FULLAUTO
+
+ spread = 25
+ 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'
+
+ lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
+
+ 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'
+
+/obj/item/gun/ballistic/automatic/pistol/mauler/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/automatic_fire, 0.06 SECONDS)
+
+/obj/item/ammo_box/magazine/m9mm_mauler
+ name = "mauler machine pistol magazine (9mm)"
+ desc = "A 12-round magazine designed for the Mauler machine pistol."
+ icon_state = "mauler_mag-1"
+ base_icon_state = "mauler_mag"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ caliber = "9mm"
+ max_ammo = 12
+
+/obj/item/ammo_box/magazine/m9mm_mauler/update_icon_state()
+ . = ..()
+ icon_state = "[base_icon_state]-[!!ammo_count()]"
+
+/obj/item/gun/ballistic/automatic/pistol/spitter
+ name = "\improper Spitter"
+ desc = "An open-bolt submachine gun favored by the Frontiersmen. This design's origins are unclear, but its simple, robust design has been widely copied throughout the Frontier, and it is stereotypically used by pirates and various criminal groups that value low price and ease of concealment. Chambered in 9mm."
+ icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
+ 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'
+
+ icon_state = "spitter"
+ item_state = "spitter"
+ 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
+ manufacturer = MANUFACTURER_IMPORT
+
+ spread = 20
+ spread_unwielded = 35
+ dual_wield_spread = 35
+ 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'
+ rack_sound_vary = FALSE
+
+ load_sound_vary = FALSE
+ eject_sound_vary = FALSE
+ load_sound = 'sound/weapons/gun/smg/spitter_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/smg/spitter_reload.ogg'
+ eject_sound = 'sound/weapons/gun/smg/spitter_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/smg/spitter_unload.ogg'
+
+ valid_attachments = list(
+ /obj/item/attachment/silencer,
+ /obj/item/attachment/foldable_stock/spitter
+ )
+
+ slot_available = list(
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ ATTACHMENT_SLOT_STOCK = 1
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 32,
+ "y" = 23,
+ ),
+ ATTACHMENT_SLOT_STOCK = list(
+ "x" = -5,
+ "y" = 18,
+ )
+ )
+
+ default_attachments = list(/obj/item/attachment/foldable_stock/spitter)
+
+ gun_firemodes = list(FIREMODE_FULLAUTO)
+ default_firemode = FIREMODE_FULLAUTO
+
+
+
+/obj/item/ammo_box/magazine/spitter_9mm
+ name = "spitter pistol magazine (9mm)"
+ desc = "A thin 30-round magazine for the Spitter submachine gun."
+ icon_state = "spitter_mag-1"
+ base_icon_state = "spitter_mag"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ caliber = "9mm"
+ max_ammo = 30
+
+/obj/item/ammo_box/magazine/spitter_9mm/update_icon_state()
+ . = ..()
+ icon_state = "[base_icon_state]-[!!ammo_count()]"
+
+
+/obj/item/gun/ballistic/automatic/smg/pounder
+ name = "Pounder"
+ desc = "An unusual submachine gun of Frontiersman make. A miniscule cartridge lacking both stopping power and armor penetration is compensated for with best-in-class ammunition capacity and cycle rate. Chambered in .22 LR."
+ icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
+ 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"
+ 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
+ spread_unwielded = 50
+
+ fire_sound = 'sound/weapons/gun/smg/pounder.ogg'
+ rack_sound = 'sound/weapons/gun/smg/pounder_cocked.ogg'
+ rack_sound_vary = FALSE
+
+ load_sound_vary = FALSE
+ eject_sound_vary = FALSE
+ load_sound = 'sound/weapons/gun/smg/pounder_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/smg/pounder_reload.ogg'
+ eject_sound = 'sound/weapons/gun/smg/pounder_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/smg/pounder_unload.ogg'
+
+ gun_firemodes = list(FIREMODE_FULLAUTO)
+ default_firemode = FIREMODE_FULLAUTO
+
+ manufacturer = MANUFACTURER_IMPORT
+ wield_slowdown = SMG_SLOWDOWN
+ safety_multiplier = 2
+
+/obj/item/ammo_box/magazine/c22lr_pounder_pan
+ name = "pan magazine (.22 LR)"
+ desc = "A 50-round pan magazine for the Pounder submachine gun."
+ icon_state = "firestorm_pan"
+ base_icon_state = "firestorm_pan"
+ ammo_type = /obj/item/ammo_casing/c22lr
+ caliber = "22lr"
+ max_ammo = 50
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/ammo_box/magazine/c22lr_pounder_pan/update_icon_state()
+ . = ..()
+ icon_state = "firestorm_pan"
+
+/obj/item/gun/ballistic/automatic/hmg/shredder
+ name = "\improper Shredder"
+ desc = "A vastly atypical heavy machine gun, extensively modified by the Frontiersmen. Additional grips have been added to enable firing from the hip, and it has been modified to fire belts of shotgun shells. Chambered in 12g."
+ icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
+ 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'
+
+ icon_state = "shredder"
+ item_state = "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
+ fire_delay = 0.16 SECONDS
+ mag_display_ammo = TRUE
+
+ bolt_type = BOLT_TYPE_STANDARD
+ show_magazine_on_sprite = TRUE
+ show_magazine_on_sprite_ammo = TRUE
+ tac_reloads = FALSE
+ fire_sound = 'sound/weapons/gun/hmg/shredder.ogg'
+ rack_sound = 'sound/weapons/gun/hmg/shredder_cocked_alt.ogg'
+
+ load_sound_vary = FALSE
+ eject_sound_vary = FALSE
+ load_sound = 'sound/weapons/gun/hmg/shredder_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/hmg/shredder_reload.ogg'
+ eject_sound = 'sound/weapons/gun/hmg/shredder_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/hmg/shredder_unload.ogg'
+
+ manufacturer = MANUFACTURER_IMPORT
+ has_bipod = FALSE
+
+/obj/item/ammo_box/magazine/m12_shredder
+ name = "belt box (12g)"
+ desc = "A 40-round belt box for the Shredder heavy machine gun."
+ icon_state = "shredder_mag-1"
+ base_icon_state = "shredder_mag"
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+ caliber = "12ga"
+ max_ammo = 40
+ w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/ammo_box/magazine/m12_shredder/update_icon_state()
+ . = ..()
+ icon_state = "[base_icon_state]-[!!ammo_count()]"
+
+/obj/item/ammo_box/magazine/m12_shredder/slug
+ name = "belt box (12g slug)"
+ desc = "A 40-round belt box for the Shredder heavy machine gun."
+ icon_state = "shredder_mag_slug-1"
+ base_icon_state = "shredder_mag_slug"
+ ammo_type = /obj/item/ammo_casing/shotgun
+ caliber = "12ga"
+ max_ammo = 40
+ w_class = WEIGHT_CLASS_NORMAL
+
+
+/obj/item/gun/ballistic/rocketlauncher/oneshot
+ name = "\improper Hammer"
+ 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'
+ righthand_file = 'icons/obj/guns/manufacturer/frontier_import/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi'
+ base_icon_state = "rpg"
+ icon_state = "rpg"
+ item_state = "rpg"
+
+ 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
+ bolt_type = BOLT_TYPE_NO_BOLT
+
+ cartridge_wording = "rocket"
+ empty_indicator = FALSE
+ 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()
+ . = ..()
+ if(prob(1))
+ name = "\improper Mallet"
+
+/obj/item/gun/ballistic/rocketlauncher/oneshot/examine(mob/user)
+ . = ..()
+ if(!chambered)
+ . += 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"
+ max_ammo = 1
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 00000000000..1d65a3a2d5b
--- /dev/null
+++ b/code/modules/projectiles/guns/manufacturer/hunter_pride/ballistics.dm
@@ -0,0 +1,938 @@
+///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
+
+ recoil = 1
+ recoil_unwielded = 8
+
+ 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 00000000000..d4331a23823
--- /dev/null
+++ b/code/modules/projectiles/guns/manufacturer/nanotrasen_sharplite/ballistics.dm
@@ -0,0 +1,75 @@
+/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 12-round double-stack magazine for Commander pistols. These rounds do okay damage, but struggle against armor."
+ icon_state = "commander_mag-12"
+ base_icon_state = "commander_mag"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ caliber = "9mm"
+ max_ammo = 12
+ multiple_sprites = AMMO_BOX_PER_BULLET
+
+/obj/item/ammo_box/magazine/co9mm/hp
+ name = "pistol magazine (9mm HP)"
+ desc= "A 12-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."
+ ammo_type = /obj/item/ammo_casing/c9mm/hp
+
+/obj/item/ammo_box/magazine/co9mm/ap
+ name = "pistol magazine (9mm AP)"
+ desc= "A 12-round double-stack magazine for standard-issue 9mm pistols. 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/co9mm/rubber
+ name = "pistol magazine (9mm rubber)"
+ desc = "A 12-round double-stack magazine for standard-issue 9mm pistols. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
+ ammo_type = /obj/item/ammo_casing/c9mm/rubber
+
+/obj/item/ammo_box/magazine/co9mm/update_icon_state()
+ . = ..()
+ icon_state = "[base_icon_state]-[ammo_count() == 1 ? 1 : round(ammo_count(),2)]"
+
+
+/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
new file mode 100644
index 00000000000..5ec1d81929b
--- /dev/null
+++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
@@ -0,0 +1,1081 @@
+#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\""
+ desc = "A compact handgun used by most Syndicate-affiliated groups. Small enough to conceal in most pockets, making it popular for covert elements and simply as a compact defensive weapon. Chambered in 10mm."
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+ icon_state = "ringneck"
+ item_state = "sa_generic"
+
+ w_class = WEIGHT_CLASS_SMALL
+ 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'
+ suppressed_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg'
+
+ load_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ load_empty_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ eject_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+ eject_empty_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+
+ 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'
+
+ manufacturer = MANUFACTURER_SCARBOROUGH
+ show_magazine_on_sprite = TRUE
+
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 27,
+ "y" = 23,
+ ),
+ ATTACHMENT_SLOT_SCOPE = list(
+ "x" = 16,
+ "y" = 25,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 21,
+ "y" = 19,
+ )
+ )
+
+
+ spread = 6 //becuase its compact, spread is slightly worse
+ spread_unwielded = 9
+ recoil_unwielded = 2
+
+NO_MAG_GUN_HELPER(automatic/pistol/ringneck)
+
+/obj/item/gun/ballistic/automatic/pistol/ringneck/indie
+ name = "Ringneck-76"
+ desc = "A service handgun popular among law enforcement, mercenaries, and independent spacers with discerning tastes. Chambered in 10mm."
+
+ icon_state = "ringneck76"
+ item_state = "sa_indie"
+
+ w_class = WEIGHT_CLASS_NORMAL
+
+ spread = 5 //this one is normal sized, thus in theory its better, in theory at least
+ spread_unwielded = 7
+ recoil_unwielded = 3
+
+NO_MAG_GUN_HELPER(automatic/pistol/ringneck/indie)
+
+
+/obj/item/ammo_box/magazine/m10mm_ringneck
+ name = "Ringneck pistol magazine (10mm)"
+ desc = "An 8-round magazine for the Ringneck pistol. These rounds do moderate damage, but struggle against armor."
+ icon_state = "ringneck_mag-1"
+ base_icon_state = "ringneck_mag"
+ ammo_type = /obj/item/ammo_casing/c10mm
+ caliber = "10mm"
+ max_ammo = 8
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/m10mm_ringneck/empty
+ start_empty = TRUE
+
+/obj/item/gun/ballistic/automatic/pistol/asp
+ name = "BC-81 \"Asp\""
+ desc = "An armor-piercing combat handgun once used by Syndicate strike teams, now primarily used by descendants of the Gorlex Marauders. Chambered in 5.7mm."
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+ icon_state = "asp"
+ item_state = "sa_generic"
+
+ 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'
+
+ 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.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
+
+ manufacturer = MANUFACTURER_SCARBOROUGH
+ show_magazine_on_sprite = TRUE
+
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 32,
+ "y" = 23,
+ ),
+ ATTACHMENT_SLOT_SCOPE = list(
+ "x" = 15,
+ "y" = 26,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 23,
+ "y" = 19,
+ )
+ )
+
+NO_MAG_GUN_HELPER(automatic/pistol/asp)
+
+/obj/item/ammo_box/magazine/m57_39_asp
+ name = "Asp magazine (5.7x39mm)"
+ desc = "A 12-round, double-stack magazine for the Asp pistol. These rounds do okay damage with average performance against armor."
+ icon_state = "asp_mag-12"
+ base_icon_state = "asp_mag"
+ ammo_type = /obj/item/ammo_casing/c57x39mm
+ caliber = "5.7x39mm"
+ max_ammo = 12
+
+/obj/item/ammo_box/magazine/m57_39_asp/update_icon_state()
+ . = ..()
+ if(ammo_count() == 12)
+ icon_state = "[base_icon_state]-12"
+ else if(ammo_count() >= 10)
+ icon_state = "[base_icon_state]-10"
+ else if(ammo_count() >= 5)
+ icon_state = "[base_icon_state]-5"
+ else if(ammo_count() >= 1)
+ icon_state = "[base_icon_state]-1"
+ 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\""
+ desc = "An imposing revolver used by officers and certain agents of Syndicate member factions during the ICW, still favored by captains and high-ranking officers of the former Syndicate. Chambered in .357 Magnum."
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
+ icon_state = "viper"
+ item_state = "sa_generic"
+
+ fire_sound = 'sound/weapons/gun/revolver/viper.ogg'
+ rack_sound = 'sound/weapons/gun/revolver/viper_prime.ogg'
+ load_sound = 'sound/weapons/gun/revolver/load_bullet.ogg'
+ eject_sound = 'sound/weapons/gun/revolver/empty.ogg'
+
+ dry_fire_sound = 'sound/weapons/gun/revolver/dry_fire.ogg'
+
+ fire_delay = 0.5 SECONDS
+
+ semi_auto = TRUE //double action
+ safety_wording = "safety"
+
+/obj/item/gun/ballistic/revolver/viper/no_mag
+ spawn_no_ammo = TRUE
+
+/obj/item/gun/ballistic/revolver/viper/indie
+ name = "Viper-23"
+ desc = "A powerful bull-barrel revolver. Very popular among mercenaries and the occasional well-to-do spacer or pirate for its flashy appearance and powerful cartridge. Chambered in .357 Magnum."
+
+ icon_state = "viper23"
+ item_state = "viper23"
+
+ semi_auto = FALSE //not double action
+ safety_wording = "hammer"
+
+/obj/item/gun/ballistic/revolver/viper/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/ammo_hud/revolver)
+
+/obj/item/gun/ballistic/revolver/viper/indie/no_mag
+ spawn_no_ammo = TRUE
+
+/obj/item/gun/ballistic/automatic/pistol/rattlesnake
+ name = "MP-84 \"Rattlesnake\""
+ desc = "A machine pistol, once used by Syndicate infiltrators and special forces during the ICW. Still used by specialists in former Syndicate factions. Chambered in 9mm."
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
+ icon_state = "rattlesnake"
+ item_state = "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'
+ suppressed_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg'
+
+ load_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ load_empty_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ eject_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+ eject_empty_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+
+ 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'
+
+ show_magazine_on_sprite = TRUE
+
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 40,
+ "y" = 26,
+ ),
+ ATTACHMENT_SLOT_SCOPE = list(
+ "x" = 14,
+ "y" = 29,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 22,
+ "y" = 21,
+ )
+ )
+
+ burst_size = 3
+ burst_delay = 0.1 SECONDS
+ fire_delay = 0.4 SECONDS
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST)
+ default_firemode = FIREMODE_SEMIAUTO
+
+NO_MAG_GUN_HELPER(automatic/pistol/rattlesnake)
+
+/obj/item/gun/ballistic/automatic/pistol/rattlesnake/inteq
+ name = "MP-84m Kingsnake"
+ desc = "A machine pistol obtained from Syndicate stockpiles and lightly modified to Inteq standards. Generally issued only to specialists. Chambered in 9mm."
+
+ icon_state = "rattlesnake_inteq"
+ item_state = "rattlesnake_inteq"
+
+/obj/item/ammo_box/magazine/m9mm_rattlesnake
+ name = "Rattlesnake magazine (9mm)"
+ desc = "A long, 18-round double-stack magazine designed for the Rattlesnake machine pistol. These rounds do okay damage, but struggle against armor."
+ icon_state = "rattlesnake_mag_18"
+ base_icon_state = "rattlesnake_mag"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ caliber = "9mm"
+ max_ammo = 18
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/m9mm_rattlesnake/update_icon_state()
+ . = ..()
+ 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."
+
+ icon_state = "himehabu"
+ item_state = "sa_generic"
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
+
+ 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'
+ load_empty_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
+ eject_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+ eject_empty_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+
+ 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'
+
+ show_magazine_on_sprite = TRUE
+
+ valid_attachments = list(
+ /obj/item/attachment/silencer,
+ )
+ slot_available = list(
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ ATTACHMENT_SLOT_SCOPE = 1,
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 28,
+ "y" = 22,
+ ),
+ ATTACHMENT_SLOT_SCOPE = list(
+ "x" = 12,
+ "y" = 25,
+ )
+ )
+
+ recoil = -2
+ recoil_unwielded = -2
+ spread_unwielded = 0
+ wield_slowdown = 0
+
+NO_MAG_GUN_HELPER(automatic/pistol/himehabu)
+
+/obj/item/ammo_box/magazine/m22lr_himehabu
+ name = "pistol magazine (.22 LR)"
+ desc = "A single-stack handgun magazine designed to chamber .22 LR. It's rather tiny, all things considered."
+ icon_state = "himehabu_mag-10"
+ base_icon_state = "himehabu_mag"
+ ammo_type = /obj/item/ammo_casing/c22lr
+ caliber = "22lr"
+ max_ammo = 10
+ w_class = WEIGHT_CLASS_SMALL
+ multiple_sprites = AMMO_BOX_PER_BULLET
+
+/obj/item/ammo_box/magazine/m22lr_himehabu/empty
+ start_empty = TRUE
+
+//########### SMGS ###########//
+
+
+/obj/item/gun/ballistic/automatic/smg/cobra
+ name = "C-20r \"Cobra\""
+ desc = "A bullpup submachine gun, heavily used by Syndicate strike teams during the ICW. Still sees widespread use by the descendants of the Gorlex Marauders. Chambered in .45."
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+ icon_state = "cobra"
+ item_state = "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'
+
+ load_sound = 'sound/weapons/gun/smg/cm5_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/smg/cm5_reload.ogg'
+ eject_sound = 'sound/weapons/gun/smg/cm5_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/smg/cm5_unload.ogg'
+
+ show_magazine_on_sprite = TRUE
+ show_magazine_on_sprite_ammo = TRUE
+ show_ammo_capacity_on_magazine_sprite = TRUE
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = list(
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ ATTACHMENT_SLOT_RAIL = 1
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 27,
+ "y" = 23,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 28,
+ "y" = 16,
+ )
+ )
+
+NO_MAG_GUN_HELPER(automatic/smg/cobra)
+
+/obj/item/gun/ballistic/automatic/smg/cobra/indie
+ name = "Cobra-20"
+ desc = "An older model of submachine gun manufactured by Scarborough Arms and marketed to mercenaries, law enforcement, and independent militia. Only became popular after the end of the ICW. Chambered in .45."
+ icon_state = "cobra20"
+ item_state = "cobra20"
+
+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 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 = 24
+
+/obj/item/ammo_box/magazine/m45_cobra/update_icon_state()
+ . = ..()
+ icon_state = "[base_icon_state]-[round(ammo_count(),2)]"
+
+/obj/item/ammo_box/magazine/m45_cobra/empty
+ start_empty = TRUE
+
+/obj/item/gun/ballistic/automatic/smg/sidewinder
+ name = "CDW-81 \"Sidewinder\""
+ desc = "An armor-piercing, compact personal defense weapon, introduced late into the Inter-Corporate War as an improvement over the C-20r when fighting armored personnel. Issued only in small numbers, and used today by specialists of former Syndicate factions. Chambered in 5.7mm."
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+ icon_state = "sidewinder"
+ item_state = "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'
+
+ load_sound = 'sound/weapons/gun/smg/sidewinder_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/smg/sidewinder_reload.ogg'
+ eject_sound = 'sound/weapons/gun/smg/sidewinder_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/smg/sidewinder_unload.ogg'
+
+ rack_sound = 'sound/weapons/gun/smg/sidewinder_cocked.ogg'
+
+ weapon_weight = WEAPON_MEDIUM
+ w_class = WEIGHT_CLASS_NORMAL
+
+ show_magazine_on_sprite = TRUE
+ show_magazine_on_sprite_ammo = TRUE
+ 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/foldable_stock/sidewinder
+ )
+ slot_available = list(
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ ATTACHMENT_SLOT_RAIL = 1,
+ ATTACHMENT_SLOT_STOCK = 1
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 44,
+ "y" = 18,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 35,
+ "y" = 17,
+ ),
+ ATTACHMENT_SLOT_STOCK = list(
+ "x" = 17,
+ "y" = 18,
+ )
+ )
+
+ spread = 7
+ spread_unwielded = 10
+
+ recoil = 0
+ recoil_unwielded = 4
+
+ default_attachments = list(/obj/item/attachment/foldable_stock/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 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
+ caliber = "5.7x39mm"
+ max_ammo = 30
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/m57_39_sidewinder/empty
+ start_empty = TRUE
+
+//########### MARKSMAN ###########//
+/obj/item/gun/ballistic/automatic/marksman/boomslang
+ name = "MSR-90 \"Boomslang\""
+ desc = "A bullpup semi-automatic sniper rifle with a high-magnification scope. Compact and capable of rapid follow-up fire without sacrificing power. Used by Syndicate support units and infiltrators during the ICW. Chambered in 6.5mm CLIP."
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
+ icon_state = "boomslang"
+ item_state = "boomslang"
+
+ fire_sound = 'sound/weapons/gun/sniper/cmf90.ogg'
+
+ 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
+ manufacturer = MANUFACTURER_SCARBOROUGH
+ spread = -5
+ spread_unwielded = 35
+ recoil = 2
+ recoil_unwielded = 10
+ 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 = SCARBOROUGH_ATTACHMENTS
+ slot_available = list(
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ ATTACHMENT_SLOT_RAIL = 1
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 48,
+ "y" = 19,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 28,
+ "y" = 10,
+ )
+ )
+
+NO_MAG_GUN_HELPER(automatic/marksman/boomslang)
+
+/obj/item/gun/ballistic/automatic/marksman/boomslang/indie
+ name = "Boomslang-90"
+ desc = "A modern semi-automatic hunting rifle. Its relative portability and fast follow-up potential compared to other weapons in its class have made it very popular with well-to-do hunters and the occasional law enforcement agency or mercenary. Chambered in 6.5mm CLIP."
+
+ icon_state = "boomslang90"
+ item_state = "boomslang90"
+
+ zoom_amt = 3 //Long range, enough to see in front of you, but no tiles behind you.
+ zoom_out_amt = 0
+
+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 can pierce protective equipment, excluding armored vehicles."
+ base_icon_state = "boomslang"
+ icon_state = "boomslang-10"
+ ammo_type = /obj/item/ammo_casing/a65clip
+ caliber = "6.5CLIP"
+ max_ammo = 10
+ multiple_sprites = AMMO_BOX_PER_BULLET
+
+/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 can pierce protective equipment, excluding armored vehicles."
+ base_icon_state = "boomslang_short"
+ icon_state = "boomslang_short-5"
+ ammo_type = /obj/item/ammo_casing/a65clip
+ caliber = "6.5CLIP"
+ 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."
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
+ icon_state = "taipan"
+ item_state = "taipan"
+ fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
+ fire_sound_volume = 90
+ vary_fire_sound = FALSE
+ load_sound = 'sound/weapons/gun/sniper/mag_insert.ogg'
+ rack_sound = 'sound/weapons/gun/sniper/rack.ogg'
+ suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
+ weapon_weight = WEAPON_HEAVY
+ 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
+ slot_flags = ITEM_SLOT_BACK
+ actions_types = list()
+ show_magazine_on_sprite = TRUE
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+ show_ammo_capacity_on_magazine_sprite = TRUE
+
+ spread = -5
+ spread_unwielded = 40
+ recoil = 5
+ recoil_unwielded = 50
+
+ wield_delay = 1.3 SECONDS
+
+ valid_attachments = list()
+ slot_available = list()
+
+NO_MAG_GUN_HELPER(automatic/marksman/taipan)
+
+
+//########### RIFLES ###########//
+/obj/item/gun/ballistic/automatic/assault/hydra
+ 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. Chambered in 5.56mm CLIP."
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+ icon_state = "hydra"
+ item_state = "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)
+ default_firemode = FIREMODE_SEMIAUTO
+ show_magazine_on_sprite = FALSE //we do this to avoid making the same of every sprite, see below
+
+ 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'
+
+ fire_sound = 'sound/weapons/gun/rifle/hydra.ogg'
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+ weapon_weight = WEAPON_MEDIUM
+ w_class = WEIGHT_CLASS_BULKY
+ slot_flags = ITEM_SLOT_BACK
+
+ burst_size = 2
+ burst_delay = 0.1 SECONDS
+ fire_delay = 0.18 SECONDS
+ spread = 1
+ spread_unwielded = 8
+ wield_slowdown = LIGHT_RIFLE_SLOWDOWN
+
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 42,
+ "y" = 17,
+ ),
+ ATTACHMENT_SLOT_SCOPE = list(
+ "x" = 21,
+ "y" = 24,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 30,
+ "y" = 15,
+ )
+ )
+
+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()
+ . = ..()
+ if (magazine)
+ . += "hydra_mag_[magazine.base_icon_state]"
+ var/capacity_number = 0
+ switch(get_ammo() / magazine.max_ammo)
+ if(0.2 to 0.39)
+ capacity_number = 20
+ if(0.4 to 0.59)
+ capacity_number = 40
+ if(0.6 to 0.79)
+ capacity_number = 60
+ if(0.8 to 0.99)
+ capacity_number = 80
+ if(1.0 to 2.0) //to catch the chambered round
+ capacity_number = 100
+ if (capacity_number)
+ . += "hydra_mag_[magazine.base_icon_state]_[capacity_number]"
+
+
+/obj/item/gun/ballistic/automatic/assault/hydra/lmg
+ name = "SAW-80 \"Hydra\""
+ desc = "Scarborough Arms' premier modular assault rifle platform. This example is configured as a support weapon, with heavier components for sustained firing and a large muzzle brake. Chambered in 5.56mm CLIP."
+
+ icon_state = "hydra_lmg"
+ item_state = "hydra_lmg"
+
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
+ default_firemode = FIREMODE_FULLAUTO
+
+ burst_delay = 0.08 SECONDS
+ fire_delay = 0.08 SECONDS
+ spread = 6
+ spread_unwielded = 20
+ 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 = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 48,
+ "y" = 19,
+ ),
+ ATTACHMENT_SLOT_SCOPE = list(
+ "x" = 21,
+ "y" = 24,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 30,
+ "y" = 15,
+ )
+ )
+
+/obj/item/gun/ballistic/automatic/assault/hydra/lmg/extended
+ default_ammo_type = /obj/item/ammo_box/magazine/m556_42_hydra/extended
+
+
+/obj/item/gun/ballistic/automatic/assault/hydra/lmg/casket_mag
+ default_ammo_type = /obj/item/ammo_box/magazine/m556_42_hydra/casket
+
+/obj/item/gun/ballistic/automatic/assault/hydra/dmr
+ name = "SBR-80 \"Hydra\""
+ desc = "Scarborough Arms' premier modular assault rifle platform. This example is configured as a marksman rifle, with an extended barrel and medium-zoom scope. Its lightweight cartridge is compensated for with a 2-round burst action. Chambered in 5.56mm CLIP."
+
+ icon_state = "hydra_dmr"
+ item_state = "hydra_dmr"
+
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST)
+ default_firemode = FIREMODE_SEMIAUTO
+
+ spread = 0
+ spread_unwielded = 12
+ wield_slowdown = DMR_SLOWDOWN //dmrrrr
+ wield_delay = 0.85 SECONDS //above
+ zoomable = TRUE
+ default_ammo_type = /obj/item/ammo_box/magazine/m556_42_hydra/small
+
+NO_MAG_GUN_HELPER(automatic/assault/hydra/dmr)
+
+/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."
+
+ icon_state = "hydra_gl"
+ item_state = "hydra_gl"
+
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO, FIREMODE_OTHER)
+
+ var/obj/item/gun/ballistic/revolver/grenadelauncher/secondary
+
+ slot_available = list( //no rail slot
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ ATTACHMENT_SLOT_SCOPE = 1,
+ )
+
+/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/Initialize()
+ . = ..()
+ secondary = new /obj/item/gun/ballistic/revolver/grenadelauncher(src)
+ RegisterSignal(secondary, COMSIG_ATOM_UPDATE_ICON, PROC_REF(secondary_update_icon))
+ update_appearance()
+
+/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/process_other(atom/target, mob/living/user, message = TRUE, flag, params = null, zone_override = "", bonus_spread = 0)
+ return secondary.pre_fire(target, user, message, params, zone_override, bonus_spread)
+
+/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/can_shoot()
+ var/current_firemode = gun_firemodes[firemode_index]
+ if(current_firemode != FIREMODE_OTHER)
+ return ..()
+ return secondary.can_shoot()
+
+/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/afterattack(atom/target, mob/living/user, flag, params)
+ var/current_firemode = gun_firemodes[firemode_index]
+ if(current_firemode != FIREMODE_OTHER)
+ return ..()
+ return secondary.afterattack(target, user, flag, params)
+
+/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/attackby(obj/item/attack_obj, mob/user, params)
+ if(istype(attack_obj, secondary.magazine.ammo_type))
+ secondary.unique_action()
+ return secondary.attackby(attack_obj, user, params)
+ return ..()
+
+
+/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/can_shoot()
+ var/current_firemode = gun_firemodes[firemode_index]
+ if(current_firemode != FIREMODE_OTHER)
+ return ..()
+ return secondary.can_shoot()
+
+/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_REF(do_wield), user)
+
+/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/do_wield(mob/user)
+ . = ..()
+ secondary.wielded_fully = wielded_fully
+
+/// triggered on unwield of two handed item
+/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/on_unwield(obj/item/source, mob/user)
+ . = ..()
+ secondary.wielded_fully = FALSE
+ secondary.wielded = FALSE
+
+
+/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/proc/secondary_update_icon()
+ update_appearance()
+ SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD)
+
+
+/obj/item/ammo_box/magazine/m556_42_hydra
+ name = "Hydra assault rifle magazine (5.56x42mm CLIP)"
+ desc = "A simple, 30-round magazine for the Hydra platform of 5.56x42mm CLIP assault rifles. These rounds do moderate damage with good armor penetration."
+ icon_state = "hydra_mag-30"
+ base_icon_state = "hydra_mag"
+ ammo_type = /obj/item/ammo_casing/a556_42
+ caliber = "5.56x42mm"
+ max_ammo = 30
+
+/obj/item/ammo_box/magazine/m556_42_hydra/update_icon_state()
+ . = ..()
+ if(multiple_sprites == AMMO_BOX_FULL_EMPTY)
+ return
+ icon_state = "[base_icon_state]-[ammo_count() == 1 ? 1 : round(ammo_count(),5)]"
+
+/obj/item/ammo_box/magazine/m556_42_hydra/empty
+ start_empty = TRUE
+
+/obj/item/ammo_box/magazine/m556_42_hydra/small
+ name = "Short Hydra assault rifle magazine (5.56x42mm CLIP)"
+ desc = "A short, 20-round magazine for the Hydra platform of 5.56x42mm CLIP assault rifles; intended for the DMR variant. These rounds do moderate damage with good armor penetration."
+ icon_state = "hydra_small_mag-20"
+ base_icon_state = "hydra_small_mag"
+ max_ammo = 20
+
+/obj/item/ammo_box/magazine/m556_42_hydra/small/empty
+ start_empty = TRUE
+
+/obj/item/ammo_box/magazine/m556_42_hydra/extended
+ name = "extended Hydra assault rifle magazine (5.56x42mm CLIP)"
+ desc = "A bulkier, 60-round magazine for the Hydra platform of 5.56x42mm CLIP assault rifles. These rounds do moderate damage with good armor penetration."
+ icon_state = "hydra_extended_mag-1"
+ base_icon_state = "hydra_extended_mag"
+ max_ammo = 60
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/m556_42_hydra/extended/empty
+ start_empty = TRUE
+
+/obj/item/ammo_box/magazine/m556_42_hydra/casket
+ name = "casket Hydra assault rifle magazine (5.56x42mm CLIP)"
+ desc = "A very long and bulky 100-round magazine for the Hydra platform of 5.56x42mm CLIP assault rifles. These rounds do moderate damage with good armor penetration."
+ icon_state = "hydra_casket_mag-1"
+ base_icon_state = "hydra_casket_mag"
+ max_ammo = 100
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+ w_class = WEIGHT_CLASS_NORMAL
+
+//########### MISC ###########//
+// Bulldog shotgun //
+
+/obj/item/gun/ballistic/shotgun/automatic/bulldog
+ name = "SG-60r \"Bulldog\""
+ desc = "A bullpup combat shotgun usually seen with a characteristic drum magazine. Wildly popular among Syndicate strike teams during the ICW, although it proved less useful against military-grade equipment. Still popular among former Syndicate factions, especially the Ramzi Clique pirates. Chambered in 12g."
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+ icon_state = "bulldog"
+ item_state = "bulldog"
+
+ weapon_weight = WEAPON_MEDIUM
+ 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
+// empty_indicator = TRUE
+ empty_alarm = TRUE
+ unique_mag_sprites_for_variants = TRUE
+ show_ammo_capacity_on_magazine_sprite = TRUE
+ internal_magazine = FALSE
+ casing_ejector = TRUE
+ tac_reloads = TRUE
+ pickup_sound = 'sound/items/handling/rifle_pickup.ogg'
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+ load_sound = 'sound/weapons/gun/rifle/ar_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/rifle/ar_reload.ogg'
+ eject_sound = 'sound/weapons/gun/rifle/ar_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/rifle/ar_unload.ogg'
+
+ rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg'
+
+ spread = 4
+ spread_unwielded = 16
+ recoil = 1
+ recoil_unwielded = 4
+ wield_slowdown = HEAVY_SHOTGUN_SLOWDOWN
+ wield_delay = 0.65 SECONDS
+
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 44,
+ "y" = 19,
+ ),
+ ATTACHMENT_SLOT_SCOPE = list(
+ "x" = 25,
+ "y" = 24,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 30,
+ "y" = 18,
+ )
+ )
+
+/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)"
+ desc = "A single-stack, 8-round box magazine for the Bulldog shotgun and it's derivatives."
+ icon_state = "bulldog_mag-1"
+ base_icon_state = "bulldog_mag"
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+ caliber = "12ga"
+ 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."
+ icon_state = "bulldog_drum-1"
+ base_icon_state = "bulldog_drum"
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+ caliber = "12ga"
+ max_ammo = 12
+ 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
+
+/obj/item/ammo_box/magazine/m12g_bulldog/drum/slug
+ name = "shotgun drum magazine (12g slugs)"
+ ammo_type = /obj/item/ammo_casing/shotgun
+
+/obj/item/ammo_box/magazine/m12g_bulldog/drum/dragon
+ name = "shotgun drum magazine (12g dragon's breath)"
+ ammo_type = /obj/item/ammo_casing/shotgun/dragonsbreath
+
+/obj/item/ammo_box/magazine/m12g_bulldog/drum/bioterror
+ name = "shotgun drum magazine (12g bioterror)"
+ ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
+
+/obj/item/ammo_box/magazine/m12g_bulldog/drum/meteor
+ name = "shotgun drum magazine (12g meteor slugs)"
+ ammo_type = /obj/item/ammo_casing/shotgun/meteorslug
+
+/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."
+
+ icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
+
+ icon_state = "mako"
+ item_state = "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
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
+ default_firemode = FIREMODE_SEMIAUTO
+ burst_size = 1
+ fire_delay = 0.4 SECONDS
+ casing_ejector = FALSE
+ weapon_weight = WEAPON_HEAVY
+ bolt_type = BOLT_TYPE_NO_BOLT
+ internal_magazine = TRUE
+ cartridge_wording = "rocket"
+ empty_indicator = TRUE
+ tac_reloads = FALSE
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+
+/obj/item/ammo_box/magazine/internal/mako
+ name = "mako internal magazine"
+ ammo_type = /obj/item/ammo_casing/caseless/rocket/a70mm
+ caliber = "70mm"
+ max_ammo = 4
+
+/obj/item/ammo_casing/caseless/rocket/a70mm
+ name = "\improper M-KO-9HE"
+ desc = "A 70mm High Explosive rocket. Fire at mech and pray."
+ icon_state = "srm-8"
+ caliber = "70mm"
+ projectile_type = /obj/projectile/bullet/a84mm_he
+ auto_rotate = FALSE
+
+/obj/item/ammo_casing/caseless/rocket/a70mm/hedp
+ name = "\improper M-KO-9HEDP"
+ 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 00000000000..9cce455663c
--- /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 00000000000..ac0cad28c21
--- /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 = 1
+ recoil_unwielded = 8
+ 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 8b6626bc5e9..3d1c407a7e5 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
- big_gun = TRUE
- 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 1e81117d170..53c183b22af 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/misc/syringe_gun.dm b/code/modules/projectiles/guns/misc/syringe_gun.dm
index 84d00b22637..809c15682cd 100644
--- a/code/modules/projectiles/guns/misc/syringe_gun.dm
+++ b/code/modules/projectiles/guns/misc/syringe_gun.dm
@@ -80,7 +80,6 @@
w_class = WEIGHT_CLASS_SMALL
force = 2 //Also very weak because it's smaller
suppressed = TRUE //Softer fire sound
- can_unsuppress = FALSE //Permanently silenced
/obj/item/gun/syringe/dna
name = "modified syringe gun"
diff --git a/code/modules/projectiles/guns/powered.dm b/code/modules/projectiles/guns/powered.dm
index ac7418748d9..44419c09956 100644
--- a/code/modules/projectiles/guns/powered.dm
+++ b/code/modules/projectiles/guns/powered.dm
@@ -1,28 +1,21 @@
/obj/item/gun/ballistic/automatic/powered
- mag_type = /obj/item/ammo_box/magazine/gauss
- can_suppress = FALSE
-
- var/obj/item/stock_parts/cell/cell
- var/cell_type = /obj/item/stock_parts/cell/gun
- var/charge_sections = 3
- var/empty_battery_sound = FALSE // play empty alarm if no battery
-
- var/shaded_charge = FALSE //if this gun uses a stateful charge bar for more detail
- var/automatic_charge_overlays = TRUE //Do we handle overlays with base update_appearance()?
-
- var/internal_cell = FALSE ///if the gun's cell cannot be replaced
- var/small_gun = FALSE ///if the gun is small and can only fit the small gun cell
- var/big_gun = FALSE ///if the gun is big and can fit the comically large gun cell
- var/unscrewing_time = 2 SECONDS ///Time it takes to unscrew the cell
- var/sound_volume = 40 //Volume of loading/unloading cell sounds
-
+ 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)
@@ -54,31 +47,25 @@
//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(small_gun && !istype(C, /obj/item/stock_parts/cell/gun/mini))
- to_chat(user, "[C] doesn't seem to fit into [src]...")
- return FALSE
- if(!big_gun && istype(C, /obj/item/stock_parts/cell/gun/large))
- to_chat(user, "[C] doesn't seem to fit into [src]...")
- return FALSE
if(user.transferItemToLoc(C, src))
cell = C
- to_chat(user, "You load [C] into [src].")
- playsound(src, load_sound, sound_volume, load_sound_vary)
+ to_chat(user, "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, "You cannot seem to get [src] out of your hands!")
+ to_chat(user, "You cannot seem to get \the [src] out of your hands!")
return FALSE
/obj/item/gun/ballistic/automatic/powered/proc/eject_cell(mob/user, obj/item/stock_parts/cell/gun/tac_load = null)
- playsound(src, load_sound, sound_volume, load_sound_vary)
+ playsound(src, load_sound, load_sound_volume, load_sound_vary)
cell.forceMove(drop_location())
var/obj/item/stock_parts/cell/gun/old_cell = cell
cell = null
@@ -88,7 +75,7 @@
update_appearance()
/obj/item/gun/ballistic/automatic/powered/screwdriver_act(mob/living/user, obj/item/I)
- if(cell && !internal_cell && !bayonet && (!gun_light || !can_flashlight))
+ if(cell && !internal_cell)
to_chat(user, "You begin unscrewing and pulling out the cell...")
if(I.use_tool(src, user, unscrewing_time, volume=100))
to_chat(user, "You remove the power cell.")
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 0b9bcb8da4f..968c3f85ebb 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -24,6 +24,8 @@
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/def_zone = "" //Aiming at
var/atom/movable/firer = null//Who shot it
+ // if the projectile was the result of a misfire. For logging.
+ var/misfire = FALSE
var/atom/fired_from = null // the atom that the projectile was fired from (gun, turret)
var/suppressed = FALSE //Attack message
var/yo = null
@@ -71,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
@@ -139,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
@@ -156,8 +162,13 @@
var/impact_effect_type //what type of impact effect to show when hitting something
var/log_override = FALSE //is this type spammed enough to not log? (KAs)
+ // if the projectile has the matching flags when hitting a wall, it deals it's override damage instead
+ var/wall_damage_flags = PROJECTILE_BONUS_DAMAGE_NONE
+ var/wall_damage_override = 0
+
///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
@@ -170,6 +181,7 @@
/obj/projectile/Initialize()
. = ..()
decayedRange = range
+ speed = speed + speed_mod
AddElement(/datum/element/connect_loc, projectile_connections)
/obj/projectile/proc/Range()
@@ -280,7 +292,9 @@
for(var/datum/reagent/R in reagents.reagent_list)
reagent_note += "[R.name] ([num2text(R.volume)])"
- if(ismob(firer))
+ if(misfire)
+ L.log_message("has been hit by a misfired [src] from \a [fired_from] last touched by [fired_from.fingerprintslast]", LOG_ATTACK, color = "orange")
+ else if(ismob(firer))
log_combat(firer, L, "shot", src, reagent_note)
else
L.log_message("has been shot by [firer] with [src]", LOG_ATTACK, color="orange")
@@ -490,7 +504,7 @@
if(direct_target)
return TRUE
// If target not able to use items, move and stand - or if they're just dead, pass over.
- if(L.stat == DEAD || (!hit_stunned_targets && HAS_TRAIT(L, TRAIT_IMMOBILIZED) && HAS_TRAIT(L, TRAIT_FLOORED) && HAS_TRAIT(L, TRAIT_HANDS_BLOCKED)))
+ if(L.stat || (!hit_stunned_targets && HAS_TRAIT(L, TRAIT_IMMOBILIZED) && HAS_TRAIT(L, TRAIT_FLOORED) && HAS_TRAIT(L, TRAIT_HANDS_BLOCKED)))
return FALSE
return TRUE
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 3aada5ddcb4..f28c51c8420 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -37,6 +37,15 @@
muzzle_type = /obj/effect/projectile/muzzle/laser
impact_type = /obj/effect/projectile/impact/laser
+/obj/projectile/beam/laser/sharplite
+ speed = 0.4
+
+/obj/projectile/beam/laser/light
+ damage = 15
+
+/obj/projectile/beam/laser/light/sharplite
+ speed = 0.4
+
/obj/projectile/beam/laser/eoehoma
damage = 25
armour_penetration = -10
@@ -54,6 +63,12 @@
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
+
/obj/projectile/beam/laser/on_hit(atom/target, blocked = FALSE)
. = ..()
if(iscarbon(target))
@@ -68,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
@@ -84,10 +103,17 @@
damage = 0
nodamage = TRUE
+/obj/projectile/beam/laser/slug
+ name = "laser slug"
+ icon_state = "heavylaser"
+ damage = 20
+ armour_penetration = 40
+
/obj/projectile/beam/scatter
name = "laser pellet"
icon_state = "scatterlaser"
damage = 5
+ range = 7
/obj/projectile/beam/xray
name = "\improper X-ray beam"
@@ -119,9 +145,15 @@
muzzle_type = /obj/effect/projectile/muzzle/disabler
impact_type = /obj/effect/projectile/impact/disabler
+/obj/projectile/beam/disabler/sharplite
+ speed = 0.4
+
/obj/projectile/beam/disabler/weak
damage = 15
+/obj/projectile/beam/disabler/weak/sharplite
+ speed = 0.4
+
/obj/projectile/beam/disabler/weak/negative_ap
armour_penetration = -30
range = 9
@@ -133,6 +165,8 @@
name = "pulse"
icon_state = "u_laser"
damage = 40
+ wall_damage_flags = PROJECTILE_BONUS_DAMAGE_MINERALS | PROJECTILE_BONUS_DAMAGE_WALLS | PROJECTILE_BONUS_DAMAGE_WALLS
+ wall_damage_override = 200
impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
light_color = LIGHT_COLOR_BLUE
tracer_type = /obj/effect/projectile/tracer/pulse
@@ -146,6 +180,11 @@
return
targets_turf.IgniteTurf(rand(8,22), "blue")
+/obj/projectile/beam/pulse/sharplite_turret
+ wall_damage_flags = null
+ wall_damage_override = 0
+ speed = 0.4
+
/obj/projectile/beam/pulse/shotgun
damage = 40
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 43106f97dee..277aa5e0404 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 79a9b2feb07..5e246236fc7 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 = 45
+ 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 a04fc2995c2..a9dd13d9baa 100644
--- a/code/modules/projectiles/projectile/bullets/pistol.dm
+++ b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -1,23 +1,63 @@
+//.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 = 40
+ damage = 35
armour_penetration = -50
+ speed_mod = BULLET_SPEED_HP_MOD
/obj/projectile/bullet/incendiary/c9mm
name = "9mm incendiary bullet"
@@ -30,27 +70,32 @@
damage = 5
armour_penetration = -40
stamina = 30
+ speed_mod = BULLET_SPEED_RUBBER_MOD
-// 10mm (Stechkin & 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 = 45
+ damage = 40
armour_penetration = -50
+ speed_mod = BULLET_SPEED_HP_MOD
/obj/projectile/bullet/incendiary/c10mm
name = "10mm incendiary bullet"
@@ -63,36 +108,49 @@
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 = 45
+ 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 0c62fe5b3d4..47036d5dbda 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 = 60
- 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,25 +41,13 @@
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 hot shot bullet"
+ name = ".38 hearth bullet"
ricochets_max = 0
/obj/projectile/bullet/c38/hotshot/on_hit(atom/target, blocked = FALSE)
@@ -80,7 +58,7 @@
M.IgniteMob()
/obj/projectile/bullet/c38/iceblox //see /obj/projectile/temp for the original code
- name = ".38 iceblox bullet"
+ name = ".38 chilled bullet"
var/temperature = 100
ricochets_max = 0
@@ -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
@@ -110,20 +89,23 @@
/obj/projectile/bullet/a357/hp
name = ".357 hollow point bullet"
- damage = 50
- armour_penetration = -50
- ricochet_chance = 0 //mushroom on impact, no bounces
+ damage = 45
+ 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 = 60 //it's 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"
- damage = 45
+ 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 f7b963cff94..bf196f860cf 100644
--- a/code/modules/projectiles/projectile/bullets/rifle.dm
+++ b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -5,77 +5,125 @@
damage = 25
armour_penetration = 20
-// 8x50mmR (Illestren Rifle)
+// 5.56x42mm CLIP (CM82, Hydra variants)
-/obj/projectile/bullet/a8_50r
- name = "8x50mmR bullet"
- speed = 0.3
- damage = 35
- armour_penetration = 40
+/obj/projectile/bullet/a556_42
+ name = "5.56x42mm CLIP bullet"
+ damage = 25
+ armour_penetration = 20
+ speed = BULLET_SPEED_RIFLE
-/obj/projectile/bullet/a8_50rhp
- name = "8x50mmR bullet"
- speed = 0.3
- damage = 55
+/obj/projectile/bullet/a556_42/hp
+ name = "5.56x42mm CLIP hollow point bullet"
+ damage = 35
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"
+/obj/projectile/bullet/a556_42/ap
+ name = "5.56x42mm CLIP bullet"
damage = 20
- stamina = 80
+ armour_penetration = 40
+ speed_mod = BULLET_SPEED_AP_MOD
-//5.45x39mm (SVG-76u)
+/obj/projectile/bullet/a556_42/rubber
+ name = "5.56x42mm CLIP bullet"
+ damage = 5
+ stamina = 25
+ armour_penetration = 0
+ speed_mod = BULLET_SPEED_RUBBER_MOD
-/obj/projectile/bullet/a545_39
- name = "5.45x39mm bullet"
- damage = 25
- armour_penetration = 20
+// 8x50mmR (Illestren Rifle)
-//.300 BLK (Polymer Survivor Rifle)
+/obj/projectile/bullet/a8_50r
+ name = "8x50mmR bullet"
+ damage = 35
+ armour_penetration = 40
+ speed = BULLET_SPEED_RIFLE
-/obj/projectile/bullet/aac_300blk
- name = ".300 Blackout bullet"
- damage = 30
- armour_penetration = 20
+/obj/projectile/bullet/a8_50r/hp
+ name = "8x50mmR hollow point bullet"
+ damage = 49
+ armour_penetration = 0
+ speed_mod = BULLET_SPEED_HP_MOD
+
+/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 bullet"
+ damage = 15
+ stamina = 40
+ armour_penetration = 0
+ speed_mod = BULLET_SPEED_RUBBER_MOD
//.308 WIN (M514 & GAL DMRs)
/obj/projectile/bullet/a308
- name = ".308"
+ name = ".308 bullet"
speed = 0.3
damage = 30
armour_penetration = 40
+ speed = BULLET_SPEED_RIFLE
+
+/obj/projectile/bullet/a308/hp
+ name = ".308 hollow point bullet"
+ damage = 40
+ armour_penetration = 10
+ speed_mod = BULLET_SPEED_HP_MOD
-// 8x58mm caseless (SG-669)
+/obj/projectile/bullet/a308/ap
+ name = ".308 armor piercing bullet"
+ damage = 25
+ armour_penetration = 60
+ speed_mod = BULLET_SPEED_AP_MOD
-/obj/projectile/bullet/a858
- name = "8x58mm caseless bullet"
+/obj/projectile/bullet/a308/rubber //"rubber"
+ name = ".308 rubber bullet"
speed = 0.3
- damage = 35
+ damage = 25
+ stamina = 50
armour_penetration = 40
-
+ speed_mod = BULLET_SPEED_RUBBER_MOD
// .299 Eoehoma Caseless (E-40)
/obj/projectile/bullet/c299
- name = ".229 Eoehoma caseless bullet"
+ name = ".299 Eoehoma caseless bullet"
damage = 20
armour_penetration = 10
+ speed = BULLET_SPEED_RIFLE
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index ba9c8c88d7f..41a12f7eaf3 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"
@@ -114,3 +114,9 @@
damage = 30
armour_penetration = -25
tile_dropoff = 3
+
+/obj/projectile/bullet/pellet/blank
+ name = "blank"
+ damage = 30
+ range = 2
+ armour_penetration = -70
diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm
index fb5e2a53ce6..a7d6a2ab68e 100644
--- a/code/modules/projectiles/projectile/bullets/smg.dm
+++ b/code/modules/projectiles/projectile/bullets/smg.dm
@@ -1,19 +1,61 @@
+// 5.7x39mm (Asp and Sidewinder)
+
+/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)
/obj/projectile/bullet/c47x33mm
@@ -30,19 +72,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 1f725b8113f..268d4a9aaf2 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 d3c1b3a72b1..00000000000
--- 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 11f948ddb41..e7b689cce2d 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/plasma.dm b/code/modules/projectiles/projectile/special/plasma.dm
index b398731cfd6..68071bd2c55 100644
--- a/code/modules/projectiles/projectile/special/plasma.dm
+++ b/code/modules/projectiles/projectile/special/plasma.dm
@@ -1,36 +1,25 @@
/obj/projectile/plasma
name = "plasma blast"
icon_state = "plasmacutter"
- damage_type = BRUTE
- damage = 5
+ damage_type = BURN
+ damage = 15
range = 4
- dismemberment = 20
+ dismemberment = 10
+ /// chance that the plasmablast ruins the ore
+ var/slag_chance = 33
impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
- var/mine_range = 3 //mines this many additional tiles of rock
tracer_type = /obj/effect/projectile/tracer/plasma_cutter
muzzle_type = /obj/effect/projectile/muzzle/plasma_cutter
impact_type = /obj/effect/projectile/impact/plasma_cutter
-/obj/projectile/plasma/on_hit(atom/target)
- . = ..()
- if(ismineralturf(target))
- var/turf/closed/mineral/M = target
- M.gets_drilled(firer, FALSE)
- if(mine_range)
- mine_range--
- range++
- if(range > 0)
- return BULLET_ACT_FORCE_PIERCE
-
/obj/projectile/plasma/adv
damage = 7
range = 5
- mine_range = 5
+ slag_chance = 20
/obj/projectile/plasma/adv/mech
damage = 10
range = 9
- mine_range = 3
/obj/projectile/plasma/turret
//Between normal and advanced for damage, made a beam so not the turret does not destroy glass
diff --git a/code/modules/projectiles/projectile/special/rocket.dm b/code/modules/projectiles/projectile/special/rocket.dm
index 0680c62279f..536cfdf0be3 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
@@ -38,10 +38,7 @@
/obj/projectile/bullet/a84mm_he/on_hit(atom/target, blocked=0)
..()
- if(!isliving(target)) //if the target isn't alive, so is a wall or something
- explosion(target, 0, 1, 2, 4)
- else
- explosion(target, 0, 0, 2, 4)
+ explosion(target, 0, 1, 2, 4)
return BULLET_ACT_HIT
/obj/projectile/bullet/a84mm_br
diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm
index 53a4bb62b9e..65b7ad1d4dd 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/chem_splash.dm b/code/modules/reagents/chem_splash.dm
index a7340dfa327..f13c1174af7 100644
--- a/code/modules/reagents/chem_splash.dm
+++ b/code/modules/reagents/chem_splash.dm
@@ -41,20 +41,17 @@
var/list/turflist = list()
for(var/turf/T in (orange(i, epicenter) - orange(i-1, epicenter)))
turflist |= T
- for(var/turf/T in turflist)
+ for(var/turf/T as anything in turflist)
if(!(get_dir(T,epicenter) in GLOB.cardinals) && (abs(T.x - epicenter.x) == abs(T.y - epicenter.y)))
turflist.Remove(T)
turflist.Add(T) // we move the purely diagonal turfs to the end of the list.
- for(var/turf/T in turflist)
- if(accessible[T])
+ for(var/turf/turf as anything in turflist)
+ if(accessible[turf])
continue
- for(var/thing in T.GetAtmosAdjacentTurfs(alldir = TRUE))
- var/turf/NT = thing
- if(!(NT in accessible))
+ for(var/turf/new_turf as anything in turf.get_atmos_cardinal_adjacent_turfs())
+ if(!accessible[new_turf])
continue
- if(!(get_dir(T,NT) in GLOB.cardinals))
- continue
- accessible[T] = 1
+ accessible[turf] = TRUE
break
var/list/reactable = accessible
for(var/turf/T in accessible)
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 86f4e05226e..a442ee2a11c 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -162,7 +162,7 @@
handle_reactions()
return amount
-/// Get the name of the reagent there is the most of in this holder
+/// DEPRICATED use get_master_regent. Get the name of the reagent there is the most of in this holder
/datum/reagents/proc/get_master_reagent_name()
var/list/cached_reagents = reagent_list
var/name
@@ -175,7 +175,7 @@
return name
-/// Get the id of the reagent there is the most of in this holder
+/// DEPRICATED use get_master_regent. Get the id of the reagent there is the most of in this holder
/datum/reagents/proc/get_master_reagent_id()
var/list/cached_reagents = reagent_list
var/max_type
@@ -512,18 +512,13 @@
matching_container = 1
else
- if(cached_my_atom.type == C.required_container)
+ if(cached_my_atom.type in typesof(C.required_container))
matching_container = 1
if (isliving(cached_my_atom) && !C.mob_react) //Makes it so certain chemical reactions don't occur in mobs
return
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
@@ -611,6 +597,7 @@
//Clear from relevant lists
addiction_list -= R
reagent_list -= R
+ SEND_SIGNAL(src, COMSIG_REAGENTS_DEL_REAGENT, R)
qdel(R)
update_total()
if(my_atom)
@@ -638,6 +625,8 @@
del_reagent(R.type)
if(my_atom)
my_atom.on_reagent_change(CLEAR_REAGENTS)
+
+ SEND_SIGNAL(src, COMSIG_REAGENTS_CLEAR_REAGENTS)
return 0
/**
@@ -747,6 +736,8 @@
if(my_atom)
my_atom.on_reagent_change(ADD_REAGENT)
R.on_merge(data, amount)
+
+ SEND_SIGNAL(src, COMSIG_REAGENTS_ADD_REAGENT, cached_reagents, amount, reagtemp, data, no_react)
if(!no_react)
handle_reactions()
return TRUE
@@ -765,6 +756,8 @@
update_total()
if(my_atom)
my_atom.on_reagent_change(ADD_REAGENT)
+
+ SEND_SIGNAL(src, COMSIG_REAGENTS_NEW_REAGENT, reagent, amount, reagtemp, data, no_react)
if(!no_react)
handle_reactions()
return TRUE
@@ -797,6 +790,7 @@
//and zero, to prevent removing more than the holder has stored
amount = clamp(amount, 0, R.volume)
R.volume -= amount
+ SEND_SIGNAL(src, COMSIG_REAGENTS_REM_REAGENT, A, amount)
update_total()
if(!safety)//So it does not handle reactions when it need not to
handle_reactions()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index c9791666b54..8e693576634 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -86,10 +86,6 @@
if(machine_stat & BROKEN)
. += "waitlight"
-/obj/machinery/chem_master/blob_act(obj/structure/blob/B)
- if (prob(50))
- qdel(src)
-
/obj/machinery/chem_master/attackby(obj/item/I, mob/user, params)
if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", I))
return
@@ -341,18 +337,18 @@
reagents.trans_to(P, vol_each, transfered_by = usr)
return TRUE
if(item_type == "condimentPack")
- var/obj/item/reagent_containers/food/condiment/pack/P
+ var/obj/item/reagent_containers/condiment/pack/P
for(var/i = 0; i < amount; i++)
- P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
+ P = new/obj/item/reagent_containers/condiment/pack(drop_location())
P.originalname = name
P.name = trim("[name] pack")
P.desc = "A small condiment pack. The label says it contains [name]."
reagents.trans_to(P, vol_each, transfered_by = usr)
return TRUE
if(item_type == "condimentBottle")
- var/obj/item/reagent_containers/food/condiment/P
+ var/obj/item/reagent_containers/condiment/P
for(var/i = 0; i < amount; i++)
- P = new/obj/item/reagent_containers/food/condiment(drop_location())
+ P = new/obj/item/reagent_containers/condiment(drop_location())
P.originalname = name
P.name = trim("[name] bottle")
reagents.trans_to(P, vol_each, transfered_by = usr)
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents/base_drinks.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents/base_drinks.dm
new file mode 100644
index 00000000000..cd2d0bc4764
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents/base_drinks.dm
@@ -0,0 +1,289 @@
+/datum/reagent/consumable/ethanol/beer
+ name = "Beer"
+ description = "An alcoholic beverage, brewed originally to keep a safe source of drinking water. A timeless classic."
+ color = "#664300" // rgb: 102, 67, 0
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ boozepwr = 25
+ taste_description = "bad water"
+ glass_name = "glass of beer"
+ glass_desc = "A pint of beer."
+
+/datum/reagent/consumable/ethanol/beer/light
+ name = "Light Beer"
+ description = "An alcoholic beverage, brewed originally to keep a safe source of drinking water. This variety has reduced calorie and alcohol content."
+ boozepwr = 5 //Space Europeans hate it
+ taste_description = "dish water"
+ glass_name = "glass of light beer"
+ glass_desc = "A pint of watery light beer."
+
+/datum/reagent/consumable/ethanol/kahlua
+ name = "Kahlua"
+ description = "A widely known coffee-flavoured liqueur. Still labeled under an old name from Earth, despite the loss of history."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 45
+ taste_description = "a bitter combination"
+ glass_icon_state = "kahluaglass"
+ glass_name = "glass of coffee liquor"
+ glass_desc = "Bitter from the coffee and alcohol alike!"
+ shot_glass_icon_state = "shotglasscream"
+
+/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/M)
+ M.dizziness = max(0,M.dizziness-5)
+ M.drowsyness = max(0,M.drowsyness-3)
+ M.AdjustSleeping(-40)
+ if(!HAS_TRAIT(M, TRAIT_ALCOHOL_TOLERANCE))
+ M.Jitter(5)
+ ..()
+ . = 1
+
+/datum/reagent/consumable/ethanol/whiskey
+ name = "Whiskey"
+ description = "A well-aged whiskey."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 75
+ taste_description = "molasses"
+ glass_icon_state = "whiskeyglass"
+ glass_name = "glass of whiskey"
+ glass_desc = "Often described as having a silky mouthfeel and a smokey aftertaste. The brown-amber color catches the light very well."
+ shot_glass_icon_state = "shotglassbrown"
+
+/datum/reagent/consumable/ethanol/vodka
+ name = "Vodka"
+ description = "A clear, hard liquor. Doubles as a flammable fuel source, if you really need it."
+ color = "#0064C8" // rgb: 0, 100, 200
+ boozepwr = 65
+ taste_description = "grain alcohol"
+ glass_icon_state = "ginvodkaglass"
+ glass_name = "glass of vodka"
+ glass_desc = "It's almost difficult to tell the glass is full of vodka until you tip it around. The smell makes your nose wrinkle... but it might just be worth it."
+ shot_glass_icon_state = "shotglassclear"
+
+/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/carbon/M)
+ M.radiation = max(M.radiation-2,0)
+ return ..()
+
+/datum/reagent/consumable/ethanol/gin
+ name = "Gin"
+ description = "A very sharp alcohol, with a flavor that's distinctly fresh."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 45
+ taste_description = "an alcoholic pine tree"
+ glass_icon_state = "ginvodkaglass"
+ glass_name = "glass of gin"
+ glass_desc = "A glass of gin, made with a specific type of berry that leaves it smelling like the tree it came from. It's enough to wet your eyes."
+
+/datum/reagent/consumable/ethanol/rum
+ name = "Rum"
+ description = "The liquor of choice for sailors and spacers alike."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 60
+ taste_description = "spiked butterscotch"
+ glass_icon_state = "rumglass"
+ glass_name = "glass of rum"
+ glass_desc = "There's no need to worry about being seen as a pirate with one of these. If you add enough ice and let it melt, it'll turn into grog."
+ shot_glass_icon_state = "shotglassbrown"
+
+/datum/reagent/consumable/ethanol/tequila
+ name = "Tequila"
+ description = "A strongly flavoured spirit."
+ color = "#FFFF91" // rgb: 255, 255, 145
+ boozepwr = 70
+ taste_description = "paint stripper"
+ glass_icon_state = "tequilaglass"
+ glass_name = "glass of tequila"
+ glass_desc = "Despite the strong, woody taste, there's just enough sweetness to keep you coming for more."
+ shot_glass_icon_state = "shotglassgold"
+
+/datum/reagent/consumable/ethanol/vermouth
+ name = "Vermouth"
+ description = "A fine wine to go with a meal."
+ color = "#91FF91" // rgb: 145, 255, 145
+ boozepwr = 45
+ taste_description = "dry alcohol"
+ glass_icon_state = "vermouthglass"
+ glass_name = "glass of vermouth"
+ glass_desc = "Vermouth was used as a medicine in the past, and the flavor makes sure to remind you of that."
+ shot_glass_icon_state = "shotglassclear"
+
+/datum/reagent/consumable/ethanol/wine
+ name = "Wine"
+ description = "An alcoholic beverage made from fermented grapes of all kinds."
+ color = "#7E4043" // rgb: 126, 64, 67
+ boozepwr = 35
+ taste_description = "bitter sweetness"
+ glass_icon_state = "wineglass"
+ glass_name = "glass of wine"
+ glass_desc = "Deeply red wine in a glass. You're not enough of a sommelier to really describe how it smells."
+ shot_glass_icon_state = "shotglassred"
+
+/datum/reagent/consumable/ethanol/lizardwine
+ name = "Blueflame Pyrecask"
+ description = "A popular Zohil beverage, made by infusing specially-gathered cacti and grapes in ethanol."
+ color = "#7E4043" // rgb: 126, 64, 67
+ boozepwr = 45
+ quality = DRINK_FANTASTIC
+ taste_description = "warm sweetness"
+
+/datum/reagent/consumable/ethanol/grappa
+ name = "Grappa"
+ description = "A fine brandy mixed with spirits."
+ color = "#F8EBF1"
+ boozepwr = 60
+ taste_description = "classy bitter sweetness"
+ glass_icon_state = "grappa"
+ glass_name = "glass of grappa"
+ glass_desc = "Despite being made from the recycled remains of wine grapes, it's not bad at all."
+
+/datum/reagent/consumable/ethanol/amaretto
+ name = "Amaretto"
+ description = "A gentle drink that carries a sweet aroma."
+ color = "#E17600"
+ boozepwr = 25
+ taste_description = "fruity and nutty sweetness"
+ glass_icon_state = "amarettoglass"
+ glass_name = "glass of amaretto"
+ glass_desc = "A sweet and syrupy looking alcohol. You're lucky it wasn't lost to history."
+
+/datum/reagent/consumable/ethanol/cognac
+ name = "Cognac"
+ description = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing."
+ color = "#AB3C05" // rgb: 171, 60, 5
+ boozepwr = 75
+ taste_description = "sharp and relaxing"
+ glass_icon_state = "cognacglass"
+ glass_name = "glass of cognac"
+ glass_desc = "You wonder how many exhausted Solarian bureaucrats are drinking this the same way you are, right now."
+ shot_glass_icon_state = "shotglassbrown"
+
+/datum/reagent/consumable/ethanol/absinthe
+ name = "Absinthe"
+ description = "A powerful alcoholic drink. Rumored to cause hallucinations if taken irresponsibly."
+ color = rgb(10, 206, 0)
+ boozepwr = 80 //Very strong even by default
+ taste_description = "death and licorice"
+ glass_icon_state = "absinthe"
+ glass_name = "glass of absinthe"
+ glass_desc = "The smell is enough to bring you to the verge of tears. The hint of liquorice threatens to bring you over the edge."
+ shot_glass_icon_state = "shotglassgreen"
+
+/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/M)
+ if(prob(10) && !HAS_TRAIT(M, TRAIT_ALCOHOL_TOLERANCE))
+ M.hallucination += 4 //Reference to the urban myth
+ ..()
+
+/datum/reagent/consumable/ethanol/hooch
+ name = "Hooch"
+ description = "Low quality, low grade, and low expectations."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 100
+ taste_description = "pure resignation"
+ glass_icon_state = "glass_brown2"
+ glass_name = "Hooch"
+ glass_desc = "You can't help but feel like you'd rather drink anything else right now, just from looking at it."
+
+/datum/reagent/consumable/ethanol/hooch/on_mob_life(mob/living/carbon/M)
+ if(M.mind && M.mind.assigned_role == "Assistant")
+ M.heal_bodypart_damage(1,1)
+ . = 1
+ return ..() || .
+
+/datum/reagent/consumable/ethanol/ale
+ name = "Ale"
+ description = "A dark alcoholic beverage made with malted barley and yeast."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 65
+ taste_description = "hearty alcoholic grains"
+ glass_icon_state = "aleglass"
+ glass_name = "glass of ale"
+ glass_desc = "A pint of ale. A classic for the working class."
+
+/datum/reagent/consumable/ethanol/hcider
+ name = "Hard Cider"
+ description = "The alcoholic sibling to apple cider."
+ color = "#CD6839"
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ boozepwr = 25
+ taste_description = "the season that falls between summer and winter"
+ glass_icon_state = "whiskeyglass"
+ glass_name = "hard cider"
+ glass_desc = "Sharper tasting, alcoholic apple cider."
+ shot_glass_icon_state = "shotglassbrown"
+
+/datum/reagent/consumable/ethanol/triple_sec
+ name = "Triple Sec"
+ description = "A sweet and vibrant orange liqueur."
+ color = "#ffcc66"
+ boozepwr = 30
+ taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of distant shores"
+ glass_icon_state = "glass_orange"
+ glass_name = "Triple Sec"
+ glass_desc = "A glass of straight triple sec. Citrusy and warm."
+
+/datum/reagent/consumable/ethanol/creme_de_menthe
+ name = "Creme de Menthe"
+ description = "A minty liqueur excellent for refreshing, cool drinks."
+ color = "#00cc00"
+ boozepwr = 20
+ taste_description = "a minty, cool, and invigorating splash of cold streamwater"
+ glass_icon_state = "glass_green"
+ glass_name = "Creme de Menthe"
+ glass_desc = "Bright green and minty - enough to tell you what it's going to taste like."
+
+/datum/reagent/consumable/ethanol/creme_de_cacao
+ name = "Creme de Cacao"
+ description = "A chocolatey liqueur excellent for adding dessert notes to beverages."
+ color = "#996633"
+ boozepwr = 20
+ taste_description = "a slick and aromatic hint of chocolates swirling in a bite of alcohol"
+ glass_icon_state = "glass_brown"
+ glass_name = "Creme de Cacao"
+ glass_desc = "Creme de Cacao - chocolate-wine, essentially. Not milk chocolate, so expect some bite."
+
+/datum/reagent/consumable/ethanol/creme_de_coconut
+ name = "Creme de Coconut"
+ description = "A coconut liqueur for smooth, creamy, tropical drinks."
+ color = "#F7F0D0"
+ boozepwr = 20
+ taste_description = "a sweet milky flavor with notes of toasted sugar"
+ glass_icon_state = "glass_white"
+ glass_name = "Creme de Coconut"
+ glass_desc = "A white glass of coconut liqueur."
+
+/datum/reagent/consumable/ethanol/sake
+ name = "Sake"
+ description = "A sweet rice wine."
+ color = "#DDDDDD"
+ boozepwr = 70
+ taste_description = "sweet rice wine"
+ glass_icon_state = "sakecup"
+ glass_name = "cup of sake"
+ glass_desc = "A cup of sake. Capable of being served hot, cold, or at room temperature, and served in a traditionally-sized little cup."
+
+/datum/reagent/consumable/ethanol/fernet
+ name = "Fernet"
+ description = "An incredibly bitter herbal liqueur used as a digestif."
+ color = "#2d4b3b" // rgb: 27, 46, 36
+ boozepwr = 80
+ taste_description = "utter bitterness"
+ glass_name = "glass of fernet"
+ glass_desc = "A glass of pure Fernet. Intensely bitter and reserved to being a digestive more than something to be enjoyed." //Hi Kevum
+
+/datum/reagent/consumable/ethanol/applejack
+ name = "Applejack"
+ description = "The officially sponsored drink by the National Association for Anti-Gravity Automobile Dragracing (NAAGAD)."
+ color = "#ff6633"
+ boozepwr = 20
+ taste_description = "resisting gravity through brandy"
+ glass_icon_state = "applejack_glass"
+ glass_name = "Applejack"
+ glass_desc = "You lament you can't watch any Agrav Races while out here."
+
+/datum/reagent/consumable/ethanol/champagne //How the hell did we not have champagne already!?
+ name = "Champagne"
+ description = "A sparkling wine known for its ability to strike fast and hard."
+ color = "#ffffc1"
+ boozepwr = 40
+ taste_description = "auspicious occasions and bad decisions"
+ glass_icon_state = "champagne_glass"
+ glass_name = "Champagne"
+ glass_desc = "A sparkling wine, traditionally served in a flute that clearly displays the slowly rising bubbles."
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents/ethanol.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents/ethanol.dm
new file mode 100644
index 00000000000..36f29e6aacd
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents/ethanol.dm
@@ -0,0 +1,94 @@
+//////////////
+// ALCOHOLS //
+//////////////
+
+
+///Greater numbers mean that less alcohol has greater intoxication potential
+#define ALCOHOL_THRESHOLD_MODIFIER 1
+///The rate at which alcohol affects you
+#define ALCOHOL_RATE 0.005
+///The exponent applied to boozepwr to make higher volume alcohol at least a little bit damaging to the liver
+#define ALCOHOL_EXPONENT 1.6
+
+
+/datum/reagent/consumable/ethanol
+ name = "Ethanol"
+ description = "A well-known alcohol with a variety of applications."
+ color = "#404030" // rgb: 64, 64, 48
+ nutriment_factor = 0
+ taste_description = "alcohol"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ var/boozepwr = 65 //Higher numbers equal higher hardness, higher hardness equals more intense alcohol poisoning
+ accelerant_quality = 5
+
+/datum/reagent/consumable/ethanol/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
+ . = ..()
+ if(chems.has_reagent(src, 1))
+ mytray.adjustHealth(-round(chems.get_reagent_amount(type) * 0.05))
+ mytray.adjustPests(-round(boozepwr * 0.05))
+
+
+// -CHART OUT OF DATE- -ERIKA //
+
+/*
+Boozepwr Chart
+Note that all higher effects of alcohol poisoning will inherit effects for smaller amounts (i.e. light poisoning inherts from slight poisoning)
+In addition, severe effects won't always trigger unless the drink is poisonously strong
+All effects don't start immediately, but rather get worse over time; the rate is affected by the imbiber's alcohol tolerance
+
+0: Non-alcoholic
+1-10: Barely classifiable as alcohol - occassional slurring
+11-20: Slight alcohol content - slurring
+21-30: Below average - imbiber begins to look slightly drunk
+31-40: Just below average - no unique effects
+41-50: Average - mild disorientation, imbiber begins to look drunk
+51-60: Just above average - disorientation, vomiting, imbiber begins to look heavily drunk
+61-70: Above average - small chance of blurry vision, imbiber begins to look smashed
+71-80: High alcohol content - blurry vision, imbiber completely shitfaced
+81-90: Extremely high alcohol content - heavy toxin damage, passing out
+91-100: Dangerously toxic - swift death
+*/
+
+/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/C)
+ if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER || boozepwr < 0)
+ var/booze_power = boozepwr
+ if(HAS_TRAIT(C, TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
+ booze_power *= 0.7
+ if(HAS_TRAIT(C, TRAIT_LIGHT_DRINKER))
+ booze_power *= 2
+ C.drunkenness = max((C.drunkenness + (sqrt(volume) * booze_power * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
+ if(boozepwr > 0)
+ var/obj/item/organ/liver/L = C.getorganslot(ORGAN_SLOT_LIVER)
+ if (istype(L))
+ L.applyOrganDamage(((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * L.alcohol_tolerance, 0))/150))
+ return ..()
+
+/datum/reagent/consumable/ethanol/expose_obj(obj/O, reac_volume)
+ if(istype(O, /obj/item/paper))
+ var/obj/item/paper/paperaffected = O
+ paperaffected.clear_paper()
+ to_chat(usr, "[paperaffected]'s ink washes away.")
+ if(istype(O, /obj/item/book))
+ if(reac_volume >= 5)
+ var/obj/item/book/affectedbook = O
+ affectedbook.dat = null
+ O.visible_message("[O]'s writing is washed away by [name]!")
+ else
+ O.visible_message("[O]'s ink is smeared by [name], but doesn't wash away!")
+ return
+
+/datum/reagent/consumable/ethanol/expose_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with ethanol isn't quite as good as fuel.
+ if(!isliving(M))
+ return
+
+ if(method in list(TOUCH, SMOKE, VAPOR, PATCH))
+ M.adjust_fire_stacks(reac_volume / 15)
+
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ var/power_multiplier = boozepwr / 65 // Weak alcohol has less sterilizing power
+
+ for(var/s in C.surgeries)
+ var/datum/surgery/S = s
+ S.speed_modifier = max(0.1*power_multiplier, S.speed_modifier)
+ return ..()
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents/fruit_wine.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents/fruit_wine.dm
new file mode 100644
index 00000000000..1359b8df613
--- /dev/null
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents/fruit_wine.dm
@@ -0,0 +1,106 @@
+/datum/reagent/consumable/ethanol/fruit_wine
+ name = "Fruit Wine"
+ description = "A wine made from grown plants."
+ color = "#FFFFFF"
+ boozepwr = 35
+ quality = DRINK_GOOD
+ taste_description = "bad coding"
+ can_synth = FALSE
+ var/list/names = list("null fruit" = 1) //Names of the fruits used. Associative list where name is key, value is the percentage of that fruit.
+ var/list/tastes = list("bad coding" = 1) //List of tastes. See above.
+
+/datum/reagent/consumable/ethanol/fruit_wine/on_new(list/data)
+ names = data["names"]
+ tastes = data["tastes"]
+ boozepwr = data["boozepwr"]
+ color = data["color"]
+ generate_data_info(data)
+
+/datum/reagent/consumable/ethanol/fruit_wine/on_merge(list/data, amount)
+ var/diff = (amount/volume)
+ if(diff < 1)
+ color = BlendRGB(color, data["color"], diff/2) //The percentage difference over two, so that they take average if equal.
+ else
+ color = BlendRGB(color, data["color"], (1/diff)/2) //Adjust so it's always blending properly.
+ var/oldvolume = volume-amount
+
+ var/list/cachednames = data["names"]
+ for(var/name in names | cachednames)
+ names[name] = ((names[name] * oldvolume) + (cachednames[name] * amount)) / volume
+
+ var/list/cachedtastes = data["tastes"]
+ for(var/taste in tastes | cachedtastes)
+ tastes[taste] = ((tastes[taste] * oldvolume) + (cachedtastes[taste] * amount)) / volume
+
+ boozepwr *= oldvolume
+ var/newzepwr = data["boozepwr"] * amount
+ boozepwr += newzepwr
+ boozepwr /= volume //Blending boozepwr to volume.
+ generate_data_info(data)
+
+/datum/reagent/consumable/ethanol/fruit_wine/proc/generate_data_info(list/data)
+ // BYOND's compiler fails to catch non-consts in a ranged switch case, and it causes incorrect behavior. So this needs to explicitly be a constant.
+ var/const/minimum_percent = 0.15 //Percentages measured between 0 and 1.
+ var/list/primary_tastes = list()
+ var/list/secondary_tastes = list()
+ glass_name = "glass of [name]"
+ glass_desc = description
+ for(var/taste in tastes)
+ var/taste_percent = tastes[taste]
+ if(taste_percent < minimum_percent)
+ continue
+ if(taste_percent > (minimum_percent * 2))
+ primary_tastes += taste
+ continue
+ secondary_tastes += taste
+
+ var/minimum_name_percent = 0.35
+ name = ""
+ var/list/names_in_order = sortTim(names, /proc/cmp_numeric_dsc, TRUE)
+ var/named = FALSE
+ for(var/fruit_name in names)
+ if(names[fruit_name] >= minimum_name_percent)
+ name += "[fruit_name] "
+ named = TRUE
+ if(named)
+ name += "wine"
+ else
+ name = "mixed [names_in_order[1]] wine"
+
+ var/alcohol_description
+ switch(boozepwr)
+ if(120 to INFINITY)
+ alcohol_description = "suicidally strong"
+ if(90 to 120)
+ alcohol_description = "intense"
+ if(70 to 90)
+ alcohol_description = "strong"
+ if(40 to 70)
+ alcohol_description = "rich"
+ if(20 to 40)
+ alcohol_description = "mild"
+ if(0 to 20)
+ alcohol_description = "sweet"
+ else
+ alcohol_description = "watery" //How the hell did you get negative boozepwr?
+
+ var/list/fruits = list()
+ if(names_in_order.len <= 3)
+ fruits = names_in_order
+ else
+ for(var/i in 1 to 3)
+ fruits += names_in_order[i]
+ fruits += "other plants"
+ var/fruit_list = english_list(fruits)
+ description = "A [alcohol_description] wine brewed from [fruit_list]."
+
+ var/flavor = ""
+ if(!primary_tastes.len)
+ primary_tastes = list("[alcohol_description] alcohol")
+ flavor += english_list(primary_tastes)
+ if(secondary_tastes.len)
+ flavor += ", with a hint of "
+ flavor += english_list(secondary_tastes)
+ taste_description = flavor
+ if(holder.my_atom)
+ holder.my_atom.on_reagent_change()
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents/mixed_drinks.dm
similarity index 76%
rename from code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
rename to code/modules/reagents/chemistry/reagents/alcohol_reagents/mixed_drinks.dm
index 10519c75c43..b2de221caf4 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents/mixed_drinks.dm
@@ -1,107 +1,4 @@
-#define ALCOHOL_THRESHOLD_MODIFIER 1 //Greater numbers mean that less alcohol has greater intoxication potential
-#define ALCOHOL_RATE 0.005 //The rate at which alcohol affects you
-#define ALCOHOL_EXPONENT 1.6 //The exponent applied to boozepwr to make higher volume alcohol at least a little bit damaging to the liver
-
-////////////// I don't know who made this header before I refactored alcohols but I'm going to fucking strangle them because it was so ugly, holy Christ
-// ALCOHOLS //
-//////////////
-
-/datum/reagent/consumable/ethanol
- name = "Ethanol"
- description = "A well-known alcohol with a variety of applications."
- color = "#404030" // rgb: 64, 64, 48
- nutriment_factor = 0
- taste_description = "alcohol"
- metabolization_rate = 0.5 * REAGENTS_METABOLISM
- var/boozepwr = 65 //Higher numbers equal higher hardness, higher hardness equals more intense alcohol poisoning
- accelerant_quality = 5
-
-/datum/reagent/consumable/ethanol/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
- . = ..()
- if(chems.has_reagent(src, 1))
- mytray.adjustHealth(-round(chems.get_reagent_amount(type) * 0.05))
- mytray.adjustPests(-round(boozepwr * 0.05))
-
-/*
-Boozepwr Chart
-Note that all higher effects of alcohol poisoning will inherit effects for smaller amounts (i.e. light poisoning inherts from slight poisoning)
-In addition, severe effects won't always trigger unless the drink is poisonously strong
-All effects don't start immediately, but rather get worse over time; the rate is affected by the imbiber's alcohol tolerance
-
-0: Non-alcoholic
-1-10: Barely classifiable as alcohol - occassional slurring
-11-20: Slight alcohol content - slurring
-21-30: Below average - imbiber begins to look slightly drunk
-31-40: Just below average - no unique effects
-41-50: Average - mild disorientation, imbiber begins to look drunk
-51-60: Just above average - disorientation, vomiting, imbiber begins to look heavily drunk
-61-70: Above average - small chance of blurry vision, imbiber begins to look smashed
-71-80: High alcohol content - blurry vision, imbiber completely shitfaced
-81-90: Extremely high alcohol content - heavy toxin damage, passing out
-91-100: Dangerously toxic - swift death
-*/
-
-/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/C)
- if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER || boozepwr < 0)
- var/booze_power = boozepwr
- if(HAS_TRAIT(C, TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
- booze_power *= 0.7
- if(HAS_TRAIT(C, TRAIT_LIGHT_DRINKER))
- booze_power *= 2
- C.drunkenness = max((C.drunkenness + (sqrt(volume) * booze_power * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
- if(boozepwr > 0)
- var/obj/item/organ/liver/L = C.getorganslot(ORGAN_SLOT_LIVER)
- if (istype(L))
- L.applyOrganDamage(((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * L.alcohol_tolerance, 0))/150))
- return ..()
-
-/datum/reagent/consumable/ethanol/expose_obj(obj/O, reac_volume)
- if(istype(O, /obj/item/paper))
- var/obj/item/paper/paperaffected = O
- paperaffected.clear_paper()
- to_chat(usr, "[paperaffected]'s ink washes away.")
- if(istype(O, /obj/item/book))
- if(reac_volume >= 5)
- var/obj/item/book/affectedbook = O
- affectedbook.dat = null
- O.visible_message("[O]'s writing is washed away by [name]!")
- else
- O.visible_message("[O]'s ink is smeared by [name], but doesn't wash away!")
- return
-
-/datum/reagent/consumable/ethanol/expose_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with ethanol isn't quite as good as fuel.
- if(!isliving(M))
- return
-
- if(method in list(TOUCH, SMOKE, VAPOR, PATCH))
- M.adjust_fire_stacks(reac_volume / 15)
-
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- var/power_multiplier = boozepwr / 65 // Weak alcohol has less sterilizing power
-
- for(var/s in C.surgeries)
- var/datum/surgery/S = s
- S.speed_modifier = max(0.1*power_multiplier, S.speed_modifier)
- return ..()
-
-/datum/reagent/consumable/ethanol/beer
- name = "Beer"
- description = "An alcoholic beverage, brewed originally to keep a safe source of drinking water. A timeless classic."
- color = "#664300" // rgb: 102, 67, 0
- nutriment_factor = 1 * REAGENTS_METABOLISM
- boozepwr = 25
- taste_description = "bad water"
- glass_name = "glass of beer"
- glass_desc = "A pint of beer."
-
-/datum/reagent/consumable/ethanol/beer/light
- name = "Light Beer"
- description = "An alcoholic beverage, brewed originally to keep a safe source of drinking water. This variety has reduced calorie and alcohol content."
- boozepwr = 5 //Space Europeans hate it
- taste_description = "dish water"
- glass_name = "glass of light beer"
- glass_desc = "A pint of watery light beer."
+/* Mixed drinks */
/datum/reagent/consumable/ethanol/beer/green
name = "Green Beer"
@@ -120,72 +17,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/beer/green/on_mob_end_metabolize(mob/living/M)
M.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, color)
-/datum/reagent/consumable/ethanol/kahlua
- name = "Kahlua"
- description = "A widely known coffee-flavoured liqueur. Still labeled under an old name from Earth, despite the loss of history."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 45
- glass_icon_state = "kahluaglass"
- glass_name = "glass of coffee liquor"
- glass_desc = "Bitter from the coffee and alcohol alike!"
- shot_glass_icon_state = "shotglasscream"
-
-/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/M)
- M.dizziness = max(0,M.dizziness-5)
- M.drowsyness = max(0,M.drowsyness-3)
- M.AdjustSleeping(-40)
- if(!HAS_TRAIT(M, TRAIT_ALCOHOL_TOLERANCE))
- M.Jitter(5)
- ..()
- . = 1
-
-/datum/reagent/consumable/ethanol/whiskey
- name = "Whiskey"
- description = "A well-aged whiskey."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 75
- taste_description = "molasses"
- glass_icon_state = "whiskeyglass"
- glass_name = "glass of whiskey"
- glass_desc = "Often described as having a silky mouthfeel and a smokey aftertaste. The brown-amber color catches the light very well."
- shot_glass_icon_state = "shotglassbrown"
-
-/datum/reagent/consumable/ethanol/whiskey/kong
- name = "Kong"
- description = "Makes You Go Ape!"
- color = "#332100" // rgb: 51, 33, 0
- addiction_threshold = 15
- taste_description = "the grip of a giant ape"
- glass_name = "glass of Kong"
- glass_desc = "Makes You Go Ape!"
-
-/datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage1(mob/living/M)
- if(prob(5))
- to_chat(M, "You've made so many mistakes.")
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "depression_minimal", /datum/mood_event/depression_minimal)
- ..()
-
-/datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage2(mob/living/M)
- if(prob(5))
- to_chat(M, "No matter what you do, people will always get hurt.")
- SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "depression_minimal", /datum/mood_event/depression_minimal)
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "depression_mild", /datum/mood_event/depression_mild)
- ..()
-
-/datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage3(mob/living/M)
- if(prob(5))
- to_chat(M, "You've lost so many people.")
- SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "depression_mild", /datum/mood_event/depression_mild)
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "depression_moderate", /datum/mood_event/depression_moderate)
- ..()
-
-/datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage4(mob/living/M)
- if(prob(5))
- to_chat(M, "Just lie down and die.")
- SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "depression_moderate", /datum/mood_event/depression_moderate)
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "depression_severe", /datum/mood_event/depression_severe)
- ..()
-
/datum/reagent/consumable/ethanol/whiskey/candycorn
name = "candy corn liquor"
description = "Like they drank in 2D speakeasies."
@@ -217,7 +48,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 ..()
@@ -263,21 +94,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
to_chat(M, "You're pretty sure you just felt your heart stop for a second there...")
M.playsound_local(M, 'sound/effects/singlebeat.ogg', 100, 0)
-/datum/reagent/consumable/ethanol/vodka
- name = "Vodka"
- description = "A clear, hard liquor. Doubles as a flammable fuel source, if you really need it."
- color = "#0064C8" // rgb: 0, 100, 200
- boozepwr = 65
- taste_description = "grain alcohol"
- glass_icon_state = "ginvodkaglass"
- glass_name = "glass of vodka"
- glass_desc = "It's almost difficult to tell the glass is full of vodka until you tip it around. The smell makes your nose wrinkle... but it might just be worth it."
- shot_glass_icon_state = "shotglassclear"
-
-/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/carbon/M)
- M.radiation = max(M.radiation-2,0)
- return ..()
-
/datum/reagent/consumable/ethanol/bilk
name = "Bilk"
description = "This appears to be beer mixed with milk. Creative...?"
@@ -310,141 +126,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
M.set_drugginess(50)
return ..()
-/datum/reagent/consumable/ethanol/gin
- name = "Gin"
- description = "A very sharp alcohol, with a flavor that's distinctly fresh."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 45
- taste_description = "an alcoholic pine tree"
- glass_icon_state = "ginvodkaglass"
- glass_name = "glass of gin"
- glass_desc = "A glass of gin, made with a specific type of berry that leaves it smelling like the tree it came from. It's enough to wet your eyes."
-
-/datum/reagent/consumable/ethanol/rum
- name = "Rum"
- description = "The liquor of choice for sailors and spacers alike."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 60
- taste_description = "spiked butterscotch"
- glass_icon_state = "rumglass"
- glass_name = "glass of rum"
- glass_desc = "There's no need to worry about being seen as a pirate with one of these. If you add enough ice and let it melt, it'll turn into grog."
- shot_glass_icon_state = "shotglassbrown"
-
-/datum/reagent/consumable/ethanol/tequila
- name = "Tequila"
- description = "A strongly flavoured spirit."
- color = "#FFFF91" // rgb: 255, 255, 145
- boozepwr = 70
- taste_description = "paint stripper"
- glass_icon_state = "tequilaglass"
- glass_name = "glass of tequila"
- glass_desc = "Despite the strong, woody taste, there's just enough sweetness to keep you coming for more."
- shot_glass_icon_state = "shotglassgold"
-
-/datum/reagent/consumable/ethanol/vermouth
- name = "Vermouth"
- description = "A fine wine to go with a meal."
- color = "#91FF91" // rgb: 145, 255, 145
- boozepwr = 45
- taste_description = "dry alcohol"
- glass_icon_state = "vermouthglass"
- glass_name = "glass of vermouth"
- glass_desc = "Vermouth was used as a medicine in the past, and the flavor makes sure to remind you of that."
- shot_glass_icon_state = "shotglassclear"
-
-/datum/reagent/consumable/ethanol/wine
- name = "Wine"
- description = "An alcoholic beverage made from fermented grapes of all kinds."
- color = "#7E4043" // rgb: 126, 64, 67
- boozepwr = 35
- taste_description = "bitter sweetness"
- glass_icon_state = "wineglass"
- glass_name = "glass of wine"
- glass_desc = "Deeply red wine in a glass. You're not enough of a sommelier to really describe how it smells."
- shot_glass_icon_state = "shotglassred"
-
-/datum/reagent/consumable/ethanol/lizardwine
- name = "Blueflame Pyrecask"
- description = "A popular Zohil beverage, made by infusing specially-gathered cacti and grapes in ethanol."
- color = "#7E4043" // rgb: 126, 64, 67
- boozepwr = 45
- quality = DRINK_FANTASTIC
- taste_description = "warm sweetness"
-
-/datum/reagent/consumable/ethanol/grappa
- name = "Grappa"
- description = "A fine brandy mixed with spirits."
- color = "#F8EBF1"
- boozepwr = 60
- taste_description = "classy bitter sweetness"
- glass_icon_state = "grappa"
- glass_name = "glass of grappa"
- glass_desc = "Despite being made from the recycled remains of wine grapes, it's not bad at all."
-
-/datum/reagent/consumable/ethanol/amaretto
- name = "Amaretto"
- description = "A gentle drink that carries a sweet aroma."
- color = "#E17600"
- boozepwr = 25
- taste_description = "fruity and nutty sweetness"
- glass_icon_state = "amarettoglass"
- glass_name = "glass of amaretto"
- glass_desc = "A sweet and syrupy looking alcohol. You're lucky it wasn't lost to history."
-
-/datum/reagent/consumable/ethanol/cognac
- name = "Cognac"
- description = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing."
- color = "#AB3C05" // rgb: 171, 60, 5
- boozepwr = 75
- taste_description = "sharp and relaxing"
- glass_icon_state = "cognacglass"
- glass_name = "glass of cognac"
- glass_desc = "You wonder how many exhausted Solarian bureaucrats are drinking this the same way you are, right now."
- shot_glass_icon_state = "shotglassbrown"
-
-/datum/reagent/consumable/ethanol/absinthe
- name = "Absinthe"
- description = "A powerful alcoholic drink. Rumored to cause hallucinations if taken irresponsibly."
- color = rgb(10, 206, 0)
- boozepwr = 80 //Very strong even by default
- taste_description = "death and licorice"
- glass_icon_state = "absinthe"
- glass_name = "glass of absinthe"
- glass_desc = "The smell is enough to bring you to the verge of tears. The hint of liquorice threatens to bring you over the edge."
- shot_glass_icon_state = "shotglassgreen"
-
-/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/M)
- if(prob(10) && !HAS_TRAIT(M, TRAIT_ALCOHOL_TOLERANCE))
- M.hallucination += 4 //Reference to the urban myth
- ..()
-
-/datum/reagent/consumable/ethanol/hooch
- name = "Hooch"
- description = "Low quality, low grade, and low expectations."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 100
- taste_description = "pure resignation"
- glass_icon_state = "glass_brown2"
- glass_name = "Hooch"
- glass_desc = "You can't help but feel like you'd rather drink anything else right now, just from looking at it."
-
-/datum/reagent/consumable/ethanol/hooch/on_mob_life(mob/living/carbon/M)
- if(M.mind && M.mind.assigned_role == "Assistant")
- M.heal_bodypart_damage(1,1)
- . = 1
- return ..() || .
-
-/datum/reagent/consumable/ethanol/ale
- name = "Ale"
- description = "A dark alcoholic beverage made with malted barley and yeast."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 65
- taste_description = "hearty alcoholic grains"
- glass_icon_state = "aleglass"
- glass_name = "glass of ale"
- glass_desc = "A pint of ale. A classic for the working class."
-
/datum/reagent/consumable/ethanol/goldschlager
name = "Goldschlager"
description = "100 proof cinnamon schnapps, made for the Student Unions' unbearable tastes."
@@ -513,7 +194,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "whiskey cola"
glass_desc = "An sweet-and-bitter mixture of cola and whiskey."
-
/datum/reagent/consumable/ethanol/martini
name = "Classic Martini"
description = "Vermouth with gin."
@@ -654,7 +334,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
@@ -845,7 +525,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
@@ -911,7 +591,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Vodka and Tonic"
glass_desc = "The stronger sibling of the Gin and Tonic."
-
/datum/reagent/consumable/ethanol/ginfizz
name = "Gin Fizz"
description = "Refreshingly lemony, deliciously dry."
@@ -923,7 +602,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "gin fizz"
glass_desc = "Refreshingly lemony, deliciously dry."
-
/datum/reagent/consumable/ethanol/bahama_mama
name = "Bahama Mama"
description = "A tropical cocktail with a complex blend of fruity flavors."
@@ -958,7 +636,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
@@ -995,7 +673,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
@@ -1008,7 +686,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Grog"
glass_desc = "Watered-down rum, to really stretch out your alcohol rations. A Belter classic."
-
/datum/reagent/consumable/ethanol/aloe
name = "Aloe"
description = "Zohil Cream and watermelon juice. Mellows out the alcoholic bite for a mild drink."
@@ -1203,18 +880,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "whiskey sour"
glass_desc = "Lemon juice mixed with whiskey and a dash of sugar. Surprisingly satisfying."
-/datum/reagent/consumable/ethanol/hcider
- name = "Hard Cider"
- description = "The alcoholic sibling to apple cider."
- color = "#CD6839"
- nutriment_factor = 1 * REAGENTS_METABOLISM
- boozepwr = 25
- taste_description = "the season that falls between summer and winter"
- glass_icon_state = "whiskeyglass"
- glass_name = "hard cider"
- glass_desc = "Sharper tasting, alcoholic apple cider."
- shot_glass_icon_state = "shotglassbrown"
-
//Another reference. Heals those in critical condition extremely quickly.
/datum/reagent/consumable/ethanol/hearty_punch
name = "Hearty Punch"
@@ -1248,8 +913,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Bacchus' Blessing"
glass_desc = "You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?"
-
-
/datum/reagent/consumable/ethanol/atomicbomb
name = "Atomic Bomb"
description = "Nuclear proliferation never tasted so good."
@@ -1373,26 +1036,18 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(1 to 5)
M.Dizzy(10)
M.set_drugginess(30)
- if(prob(10))
- M.emote(pick("twitch","giggle"))
if(5 to 10)
M.Jitter(20)
M.Dizzy(20)
M.set_drugginess(45)
- if(prob(20))
- M.emote(pick("twitch","giggle"))
if (10 to 200)
M.Jitter(40)
M.Dizzy(40)
M.set_drugginess(60)
- if(prob(30))
- M.emote(pick("twitch","giggle"))
if(200 to INFINITY)
M.Jitter(60)
M.Dizzy(60)
M.set_drugginess(75)
- if(prob(40))
- M.emote(pick("twitch","giggle"))
if(prob(30))
M.adjustToxLoss(2, 0)
. = 1
@@ -1410,45 +1065,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "eggnog"
glass_desc = "For enjoying the Winter Solstice."
-/datum/reagent/consumable/ethanol/triple_sec
- name = "Triple Sec"
- description = "A sweet and vibrant orange liqueur."
- color = "#ffcc66"
- boozepwr = 30
- taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of distant shores"
- glass_icon_state = "glass_orange"
- glass_name = "Triple Sec"
- glass_desc = "A glass of straight triple sec. Citrusy and warm."
-/datum/reagent/consumable/ethanol/creme_de_menthe
- name = "Creme de Menthe"
- description = "A minty liqueur excellent for refreshing, cool drinks."
- color = "#00cc00"
- boozepwr = 20
- taste_description = "a minty, cool, and invigorating splash of cold streamwater"
- glass_icon_state = "glass_green"
- glass_name = "Creme de Menthe"
- glass_desc = "Bright green and minty - enough to tell you what it's going to taste like."
-
-/datum/reagent/consumable/ethanol/creme_de_cacao
- name = "Creme de Cacao"
- description = "A chocolatey liqueur excellent for adding dessert notes to beverages."
- color = "#996633"
- boozepwr = 20
- taste_description = "a slick and aromatic hint of chocolates swirling in a bite of alcohol"
- glass_icon_state = "glass_brown"
- glass_name = "Creme de Cacao"
- glass_desc = "Creme de Cacao - chocolate-wine, essentially. Not milk chocolate, so expect some bite."
-
-/datum/reagent/consumable/ethanol/creme_de_coconut
- name = "Creme de Coconut"
- description = "A coconut liqueur for smooth, creamy, tropical drinks."
- color = "#F7F0D0"
- boozepwr = 20
- taste_description = "a sweet milky flavor with notes of toasted sugar"
- glass_icon_state = "glass_white"
- glass_name = "Creme de Coconut"
- glass_desc = "A white glass of coconut liqueur."
/datum/reagent/consumable/ethanol/quadruple_sec
name = "Quadruple Sec"
@@ -1480,17 +1097,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Quintuple Sec"
glass_desc = "The logical endpoint of the Quadruple Sec. Often had in the hands of senior security staff, though you really should not be drinking this while on-duty."
-/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/M)
- //Securidrink in line with the Screwdriver for engineers or Nothing for mimes but STRONG..
- if(HAS_TRAIT(M.mind, TRAIT_LAW_ENFORCEMENT_METABOLISM))
- M.heal_bodypart_damage(2,2,2)
- M.adjustBruteLoss(-5,0)
- M.adjustOxyLoss(-5,0)
- M.adjustFireLoss(-5,0)
- M.adjustToxLoss(-5,0)
- . = 1
- return ..()
-
/datum/reagent/consumable/ethanol/grasshopper
name = "Grasshopper"
description = "A fresh and sweet dessert shooter."
@@ -1609,16 +1215,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/crevice_spike/on_mob_metabolize(mob/living/L) //damage only applies when drink first enters system and won't again until drink metabolizes out
L.adjustBruteLoss(3 * min(5,volume)) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15
-/datum/reagent/consumable/ethanol/sake
- name = "Sake"
- description = "A sweet rice wine."
- color = "#DDDDDD"
- boozepwr = 70
- taste_description = "sweet rice wine"
- glass_icon_state = "sakecup"
- glass_name = "cup of sake"
- glass_desc = "A cup of sake. Capable of being served hot, cold, or at room temperature, and served in a traditionally-sized little cup."
-
/datum/reagent/consumable/ethanol/peppermint_patty
name = "Peppermint Patty"
description = "This lightly alcoholic drink combines the benefits of menthol and cocoa."
@@ -1632,7 +1228,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
@@ -1746,14 +1342,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Gorlex Gator"
glass_desc = "A chilly drink made in remembrance of Gorlex IV. It's not a wise idea to go ordering this when the PGF are in town, though."
-/datum/reagent/consumable/ethanol/fernet
- name = "Fernet"
- description = "An incredibly bitter herbal liqueur used as a digestif."
- color = "#2d4b3b" // rgb: 27, 46, 36
- boozepwr = 80
- taste_description = "utter bitterness"
- glass_name = "glass of fernet"
- glass_desc = "A glass of pure Fernet. Intensely bitter and reserved to being a digestive more than something to be enjoyed." //Hi Kevum
/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
@@ -1816,7 +1404,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)
@@ -1844,125 +1432,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
. = 1
return ..()
-/datum/reagent/consumable/ethanol/fruit_wine
- name = "Fruit Wine"
- description = "A wine made from grown plants."
- color = "#FFFFFF"
- boozepwr = 35
- quality = DRINK_GOOD
- taste_description = "bad coding"
- can_synth = FALSE
- var/list/names = list("null fruit" = 1) //Names of the fruits used. Associative list where name is key, value is the percentage of that fruit.
- var/list/tastes = list("bad coding" = 1) //List of tastes. See above.
-
-/datum/reagent/consumable/ethanol/fruit_wine/on_new(list/data)
- names = data["names"]
- tastes = data["tastes"]
- boozepwr = data["boozepwr"]
- color = data["color"]
- generate_data_info(data)
-
-/datum/reagent/consumable/ethanol/fruit_wine/on_merge(list/data, amount)
- var/diff = (amount/volume)
- if(diff < 1)
- color = BlendRGB(color, data["color"], diff/2) //The percentage difference over two, so that they take average if equal.
- else
- color = BlendRGB(color, data["color"], (1/diff)/2) //Adjust so it's always blending properly.
- var/oldvolume = volume-amount
-
- var/list/cachednames = data["names"]
- for(var/name in names | cachednames)
- names[name] = ((names[name] * oldvolume) + (cachednames[name] * amount)) / volume
-
- var/list/cachedtastes = data["tastes"]
- for(var/taste in tastes | cachedtastes)
- tastes[taste] = ((tastes[taste] * oldvolume) + (cachedtastes[taste] * amount)) / volume
-
- boozepwr *= oldvolume
- var/newzepwr = data["boozepwr"] * amount
- boozepwr += newzepwr
- boozepwr /= volume //Blending boozepwr to volume.
- generate_data_info(data)
-
-/datum/reagent/consumable/ethanol/fruit_wine/proc/generate_data_info(list/data)
- // BYOND's compiler fails to catch non-consts in a ranged switch case, and it causes incorrect behavior. So this needs to explicitly be a constant.
- var/const/minimum_percent = 0.15 //Percentages measured between 0 and 1.
- var/list/primary_tastes = list()
- var/list/secondary_tastes = list()
- glass_name = "glass of [name]"
- glass_desc = description
- for(var/taste in tastes)
- var/taste_percent = tastes[taste]
- if(taste_percent < minimum_percent)
- continue
- if(taste_percent > (minimum_percent * 2))
- primary_tastes += taste
- continue
- secondary_tastes += taste
-
- var/minimum_name_percent = 0.35
- name = ""
- var/list/names_in_order = sortTim(names, /proc/cmp_numeric_dsc, TRUE)
- var/named = FALSE
- for(var/fruit_name in names)
- if(names[fruit_name] >= minimum_name_percent)
- name += "[fruit_name] "
- named = TRUE
- if(named)
- name += "wine"
- else
- name = "mixed [names_in_order[1]] wine"
-
- var/alcohol_description
- switch(boozepwr)
- if(120 to INFINITY)
- alcohol_description = "suicidally strong"
- if(90 to 120)
- alcohol_description = "rather strong"
- if(70 to 90)
- alcohol_description = "strong"
- if(40 to 70)
- alcohol_description = "rich"
- if(20 to 40)
- alcohol_description = "mild"
- if(0 to 20)
- alcohol_description = "sweet"
- else
- alcohol_description = "watery" //How the hell did you get negative boozepwr?
-
- var/list/fruits = list()
- if(names_in_order.len <= 3)
- fruits = names_in_order
- else
- for(var/i in 1 to 3)
- fruits += names_in_order[i]
- fruits += "other plants"
- var/fruit_list = english_list(fruits)
- description = "A [alcohol_description] wine brewed from [fruit_list]."
-
- var/flavor = ""
- if(!primary_tastes.len)
- primary_tastes = list("[alcohol_description] alcohol")
- flavor += english_list(primary_tastes)
- if(secondary_tastes.len)
- flavor += ", with a hint of "
- flavor += english_list(secondary_tastes)
- taste_description = flavor
- if(holder.my_atom)
- holder.my_atom.on_reagent_change()
-
-
-/datum/reagent/consumable/ethanol/champagne //How the hell did we not have champagne already!?
- name = "Champagne"
- description = "A sparkling wine known for its ability to strike fast and hard."
- color = "#ffffc1"
- boozepwr = 40
- taste_description = "auspicious occasions and bad decisions"
- glass_icon_state = "champagne_glass"
- glass_name = "Champagne"
- glass_desc = "A sparkling wine, traditionally served in a flute that clearly displays the slowly rising bubbles."
-
-
/datum/reagent/consumable/ethanol/wizz_fizz
name = "Wizz Fizz"
description = "A magical potion, fizzy and wild! However the taste, you will find, is quite mild."
@@ -1993,16 +1462,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Stunball"
glass_desc = "Made in protest of the Mothball mixed drink being recognized by the Interstellar Bartenders Association, who refute the idea of a singular point of origin. The taste is as spiteful as its history."
-/datum/reagent/consumable/ethanol/applejack
- name = "Applejack"
- description = "The officially sponsored drink by the National Association for Anti-Gravity Automobile Dragracing (NAAGAD)."
- color = "#ff6633"
- boozepwr = 20
- taste_description = "resisting gravity through brandy"
- glass_icon_state = "applejack_glass"
- glass_name = "Applejack"
- glass_desc = "You lament you can't watch any Agrav Races while out here."
-
/datum/reagent/consumable/ethanol/jack_rose
name = "Jackalope"
description = "A light cocktail named after a famous anti-gravity racer."
@@ -2042,24 +1501,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Old Timer"
glass_desc = "You might not be the target audience of this drink if you're still out in the Frontier, though."
-/datum/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/M)
- if(prob(20))
- if(ishuman(M))
- var/mob/living/carbon/human/N = M
- N.age++
- if(N.age > N.dna.species.species_age_max * 0.6)
- N.facial_hair_color = "ccc"
- N.hair_color = "ccc"
- N.update_hair()
- if(N.age > N.dna.species.species_age_max * 0.8)
- N.become_nearsighted(type)
-
- if(N.age > N.dna.species.species_age_max * 1.2) //Best not let people get older than this or i might incur G-ds wrath
- M.visible_message("[M] becomes older than any man should be.. and crumbles into dust!")
- M.dust(0,1,0)
-
- return ..()
-
/datum/reagent/consumable/ethanol/rubberneck
name = "Rubberneck"
description = "A quality rubberneck should not contain any gross natural ingredients."
@@ -2128,7 +1569,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 f781313bf58..e84cc952c5b 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 bf13904972b..281b15d2e6b 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
@@ -316,17 +316,21 @@
description = "Coffee and ice, refreshing and cool."
color = "#112a3b" // rgb: 16, 40, 56
nutriment_factor = 0
+ overdose_threshold = 80
taste_description = "bitter coldness"
glass_icon_state = "icedcoffeeglass"
glass_name = "iced coffee"
glass_desc = "Iced black coffee. It's still going to be pretty bitter on it's own, though!"
+/datum/reagent/consumable/icecoffee/overdose_process(mob/living/M)
+ M.Jitter(5)
+ ..()
+
/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/M)
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.Jitter(5)
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
. = 1
@@ -335,18 +339,22 @@
description = "Coffee with pulsing ice shards"
color = "#132043" // rgb: 16, 40, 56
nutriment_factor = 0
+ overdose_threshold = 80
quality = DRINK_FANTASTIC
taste_description = "bitter coldness and a hint of smoke"
glass_icon_state = "hoticecoffee"
glass_name = "hot ice coffee"
glass_desc = "The wonders of fusion mixed into a cup of coffee, resulting in an extremely hot-cold drink."
+/datum/reagent/consumable/hot_ice_coffee/overdose_process(mob/living/M)
+ M.Jitter(5)
+ ..()
+
/datum/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/M)
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.Jitter(5)
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
M.adjustToxLoss(1*REM, 0)
..()
. = TRUE
@@ -367,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
@@ -382,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
@@ -408,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
@@ -423,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
@@ -439,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
@@ -453,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
@@ -468,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
@@ -501,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())
..()
@@ -522,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)
..()
@@ -537,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"
@@ -551,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
@@ -567,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
@@ -586,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)
@@ -609,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
@@ -617,17 +625,21 @@
description = "A hot beverage for those who can't handle the lactose."
color = "#664300" // rgb: 102, 67, 0
quality = DRINK_NICE
+ overdose_threshold = 80
taste_description = "creamy coffee"
glass_icon_state = "soy_latte"
glass_name = "soy latte"
glass_desc = "A nice and refreshing beverage. It goes well with a book, if you have the time to read."
+/datum/reagent/consumable/soy_latte/overdose_process(mob/living/M)
+ M.Jitter(5)
+ ..()
+
/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/M)
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.Jitter(5)
+ 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)
..()
@@ -638,17 +650,21 @@
description = "A nice, strong and tasty beverage while you are reading."
color = "#664300" // rgb: 102, 67, 0
quality = DRINK_NICE
+ overdose_threshold = 80
taste_description = "bitter cream"
glass_icon_state = "cafe_latte"
glass_name = "cafe latte"
glass_desc = "A nice, strong and refreshing beverage. It goes well with a book, if you have the time to read."
+/datum/reagent/consumable/cafe_latte/overdose_process(mob/living/M)
+ M.Jitter(5)
+ ..()
+
/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/M)
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.Jitter(5)
+ 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)
..()
@@ -772,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
@@ -801,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)
@@ -868,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/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index b776a285b34..a62dfc53b63 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -21,8 +21,6 @@
if(!HAS_TRAIT(M, TRAIT_IMMOBILIZED))
if(prob(10))
step(M, pick(GLOB.cardinals))
- if(prob(7))
- M.emote(pick("twitch","drool","moan","giggle"))
..()
/datum/reagent/drug/space_drugs/overdose_start(mob/living/M)
@@ -166,7 +164,7 @@
/datum/reagent/drug/methamphetamine
name = "Methamphetamine"
- description = "Reduces stun times by about 300%, speeds the user up, and allows the user to quickly recover stamina while dealing a small amount of Brain damage. If overdosed the subject will move randomly, laugh randomly, drop items and suffer from Toxin and Brain damage. If addicted the subject will constantly jitter and drool, before becoming dizzy and losing motor control and eventually suffer heavy toxin damage."
+ description = "Reduces stun times by about 300%, speeds the user up, and allows the user to quickly recover stamina while dealing a small amount of Brain damage. If overdosed the subject will move randomly, drop items and suffer from Toxin and Brain damage. If addicted the subject will become dizzy, lose motor control and eventually suffer heavy toxin damage."
reagent_state = LIQUID
color = "#FAFAFA"
overdose_threshold = 20
@@ -194,8 +192,6 @@
M.adjustStaminaLoss(-2, 0)
M.Jitter(2)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1,4))
- if(prob(5))
- M.emote(pick("twitch", "shiver"))
..()
. = 1
@@ -203,8 +199,6 @@
if(!HAS_TRAIT(M, TRAIT_IMMOBILIZED) && !ismovable(M.loc))
for(var/i in 1 to 4)
step(M, pick(GLOB.cardinals))
- if(prob(20))
- M.emote("laugh")
if(prob(33))
M.visible_message("[M]'s hands flip out and flail everywhere!")
M.drop_all_held_items()
@@ -215,15 +209,11 @@
/datum/reagent/drug/methamphetamine/addiction_act_stage1(mob/living/M)
M.Jitter(5)
- if(prob(20))
- M.emote(pick("twitch","drool","moan"))
..()
/datum/reagent/drug/methamphetamine/addiction_act_stage2(mob/living/M)
M.Jitter(10)
M.Dizzy(10)
- if(prob(30))
- M.emote(pick("twitch","drool","moan"))
..()
/datum/reagent/drug/methamphetamine/addiction_act_stage3(mob/living/M)
@@ -232,8 +222,6 @@
step(M, pick(GLOB.cardinals))
M.Jitter(15)
M.Dizzy(15)
- if(prob(40))
- M.emote(pick("twitch","drool","moan"))
..()
/datum/reagent/drug/methamphetamine/addiction_act_stage4(mob/living/carbon/human/M)
@@ -243,8 +231,6 @@
M.Jitter(20)
M.Dizzy(20)
M.adjustToxLoss(5, 0)
- if(prob(50))
- M.emote(pick("twitch","drool","moan"))
..()
. = 1
@@ -293,8 +279,6 @@
if(!HAS_TRAIT(M, TRAIT_IMMOBILIZED) && !ismovable(M.loc))
for(var/i in 1 to 8)
step(M, pick(GLOB.cardinals))
- if(prob(20))
- M.emote(pick("twitch","drool","moan"))
if(prob(33))
M.drop_all_held_items()
..()
@@ -306,8 +290,6 @@
step(M, pick(GLOB.cardinals))
M.Jitter(5)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10)
- if(prob(20))
- M.emote(pick("twitch","drool","moan"))
..()
/datum/reagent/drug/bath_salts/addiction_act_stage2(mob/living/M)
@@ -318,8 +300,6 @@
M.Jitter(10)
M.Dizzy(10)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10)
- if(prob(30))
- M.emote(pick("twitch","drool","moan"))
..()
/datum/reagent/drug/bath_salts/addiction_act_stage3(mob/living/M)
@@ -330,8 +310,6 @@
M.Jitter(15)
M.Dizzy(15)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10)
- if(prob(40))
- M.emote(pick("twitch","drool","moan"))
..()
/datum/reagent/drug/bath_salts/addiction_act_stage4(mob/living/carbon/human/M)
@@ -343,8 +321,6 @@
M.Dizzy(50)
M.adjustToxLoss(5, 0)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10)
- if(prob(50))
- M.emote(pick("twitch","drool","moan"))
..()
. = 1
@@ -398,13 +374,10 @@
var/reaction = rand(1,3)
switch(reaction)
if(1)
- M.emote("laugh")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "happiness_drug", /datum/mood_event/happiness_drug_good_od)
if(2)
- M.emote("sway")
M.Dizzy(25)
if(3)
- M.emote("frown")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "happiness_drug", /datum/mood_event/happiness_drug_bad_od)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5)
..()
@@ -414,32 +387,24 @@
var/datum/component/mood/mood = M.GetComponent(/datum/component/mood)
mood.setSanity(min(mood.sanity, SANITY_DISTURBED))
M.Jitter(5)
- if(prob(20))
- M.emote(pick("twitch","laugh","frown"))
..()
/datum/reagent/drug/happiness/addiction_act_stage2(mob/living/M)
var/datum/component/mood/mood = M.GetComponent(/datum/component/mood)
mood.setSanity(min(mood.sanity, SANITY_UNSTABLE))
M.Jitter(10)
- if(prob(30))
- M.emote(pick("twitch","laugh","frown"))
..()
/datum/reagent/drug/happiness/addiction_act_stage3(mob/living/M)
var/datum/component/mood/mood = M.GetComponent(/datum/component/mood)
mood.setSanity(min(mood.sanity, SANITY_CRAZY))
M.Jitter(15)
- if(prob(40))
- M.emote(pick("twitch","laugh","frown"))
..()
/datum/reagent/drug/happiness/addiction_act_stage4(mob/living/carbon/human/M)
var/datum/component/mood/mood = M.GetComponent(/datum/component/mood)
mood.setSanity(SANITY_INSANE)
M.Jitter(20)
- if(prob(50))
- M.emote(pick("twitch","laugh","frown"))
..()
. = 1
@@ -477,8 +442,6 @@
M.Jitter(5)
if(prob(5))
M.drop_all_held_items()
- if(prob(15))
- M.emote(pick("twitch","drool"))
if(prob(20))
M.losebreath++
M.adjustStaminaLoss(4, 0)
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 09812ef20cf..8b06736dbce 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -113,13 +113,13 @@
/datum/reagent/consumable/cooking_oil/expose_obj(obj/O, reac_volume)
if(holder && holder.chem_temp >= fry_temperature)
- if(isitem(O) && !istype(O, /obj/item/reagent_containers/food/snacks/deepfryholder))
+ if(isitem(O) && !istype(O, /obj/item/food/deepfryholder))
O.loc.visible_message("[O] rapidly fries as it's splashed with hot oil! Somehow.")
- var/obj/item/reagent_containers/food/snacks/deepfryholder/F = new(O.drop_location(), O)
+ var/obj/item/food/deepfryholder/F = new(O.drop_location(), O)
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)
@@ -209,30 +209,6 @@
taste_description = "hot peppers"
taste_mult = 1.5
-/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/carbon/M)
- var/heating = 0
- switch(current_cycle)
- if(1 to 15)
- heating = 5 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(holder.has_reagent(/datum/reagent/cryostylane))
- holder.remove_reagent(/datum/reagent/cryostylane, 5)
- if(isslime(M))
- heating = rand(5,20)
- if(15 to 25)
- heating = 10 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(isslime(M))
- heating = rand(10,20)
- if(25 to 35)
- heating = 15 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(isslime(M))
- heating = rand(15,20)
- if(35 to INFINITY)
- heating = 20 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(isslime(M))
- heating = rand(20,25)
- M.adjust_bodytemperature(heating)
- ..()
-
/datum/reagent/consumable/frostoil
name = "Frost Oil"
description = "A special oil that noticeably chills the body. Extracted from chilly peppers and slimes."
@@ -247,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)
@@ -295,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
@@ -363,20 +339,14 @@
if(1 to 5)
M.Dizzy(5)
M.set_drugginess(30)
- if(prob(10))
- M.emote(pick("twitch","giggle"))
if(5 to 10)
M.Jitter(10)
M.Dizzy(10)
M.set_drugginess(35)
- if(prob(20))
- M.emote(pick("twitch","giggle"))
if (10 to INFINITY)
M.Jitter(20)
M.Dizzy(20)
M.set_drugginess(40)
- if(prob(30))
- M.emote(pick("twitch","giggle"))
..()
/datum/reagent/consumable/garlic //NOTE: having garlic in your blood stops vampires from biting you.
@@ -458,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
@@ -469,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
@@ -770,22 +740,6 @@
taste_description = "caramel"
reagent_state = SOLID
-/datum/reagent/consumable/char
- name = "Char"
- description = "Essence of the grill. Has strange properties when overdosed."
- reagent_state = LIQUID
- nutriment_factor = 5 * REAGENTS_METABOLISM
- color = "#C8C8C8"
- taste_mult = 6
- taste_description = "smoke"
- overdose_threshold = 15
-
-/datum/reagent/consumable/char/overdose_process(mob/living/M)
- if(prob(25))
- M.say(pick_list_replacements(BOOMER_FILE, "boomer"), forced = /datum/reagent/consumable/char)
- ..()
- return
-
/datum/reagent/consumable/bbqsauce
name = "BBQ Sauce"
description = "Sweet, smoky, savory, and gets everywhere. Perfect for grilling."
@@ -822,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 6084311b350..1ae9386b41f 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,10 +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!")
- M.emote("scream")
- 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)
@@ -311,10 +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!")
- M.emote("scream")
- 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."))
..()
@@ -377,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)
@@ -403,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
..()
@@ -567,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
@@ -752,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)
..()
@@ -1310,8 +1324,6 @@
M.adjustStaminaLoss(-3 * REM, 0)
M.jitteriness = min(max(0, M.jitteriness + 3), 30)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM, 150)
- if(prob(10))
- M.say(pick("Yeah, well, you know, that's just, like, uh, your opinion, man.", "Am I glad he's frozen in there and that we're out here, and that he's the sheriff and that we're frozen out here, and that we're in there, and I just remembered, we're out here. What I wanna know is: Where's the caveman?", "It ain't me, it ain't me...", "Make love, not war!", "Stop, hey, what's that sound? Everybody look what's going down...", "Do you believe in magic in a young girl's heart?"), forced = /datum/reagent/medicine/earthsblood)
M.druggy = min(max(0, M.druggy + 10), 15) //See above
..()
. = 1
@@ -1455,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)
@@ -1541,7 +1555,6 @@
M.losebreath++
if(prob(20))
to_chat(M, "You have a sudden fit!")
- M.emote("moan")
M.Paralyze(20) // you should be in a bad spot at this point unless epipen has been used
if(81)
to_chat(M, "You feel too exhausted to continue!") // at this point you will eventually die unless you get charcoal
@@ -1751,10 +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!")
- M.emote("scream")
- 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)
@@ -1786,10 +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!")
- M.emote("scream")
- 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)
@@ -1840,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
@@ -1848,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()
@@ -1857,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)
..()
@@ -1939,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)
@@ -1959,11 +1976,14 @@
/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)
- M.ForceContractDisease(new /datum/disease/transformation/legionvirus(), FALSE, TRUE)
+ var/mob/living/carbon/C = M
+ if(!istype(C.getorganslot(ORGAN_SLOT_REGENERATIVE_CORE), /obj/item/organ/legion_skull))
+ var/obj/item/organ/legion_skull/spare_ribs = new()
+ spare_ribs.Insert(M)
..()
/datum/reagent/medicine/soulus/on_mob_end_metabolize(mob/living/M)
@@ -2073,7 +2093,6 @@
bp.receive_damage(0, 0, 200)
else //SUCH A LUST FOR REVENGE!!!
to_chat(M, "A phantom limb hurts!")
- M.say("Why are we still here, just to suffer?", forced = /datum/reagent/medicine/lavaland_extract)
return ..()
/datum/reagent/medicine/skeletons_boon
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 9b6243358ac..b246a81f364 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
@@ -410,7 +361,6 @@
description = "A substance applied to the skin to darken the skin."
color = "#FFC080" // rgb: 255, 196, 128 Bright orange
metabolization_rate = 10 * REAGENTS_METABOLISM // very fast, so it can be applied rapidly. But this changes on an overdose
- overdose_threshold = 11 //Slightly more than one un-nozzled spraybottle.
taste_description = "sour oranges"
/datum/reagent/spraytan/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
@@ -470,41 +420,11 @@
N.dna.features["mcolor"] = newcolor
N.regenerate_icons()
-
-
if(method == INGEST)
if(show_message)
to_chat(M, "That tasted horrible.")
..()
-
-/datum/reagent/spraytan/overdose_process(mob/living/M)
- metabolization_rate = 1 * REAGENTS_METABOLISM
-
- if(ishuman(M))
- var/mob/living/carbon/human/N = M
- if(!HAS_TRAIT(N, TRAIT_BALD))
- N.hairstyle = "Spiky"
- N.facial_hairstyle = "Shaved"
- N.facial_hair_color = "000"
- N.hair_color = "000"
- if(!(HAIR in N.dna.species.species_traits)) //No hair? No problem!
- N.dna.species.species_traits += HAIR
- if(N.dna.species.use_skintones)
- N.skin_tone = "orange"
- else if(MUTCOLORS in N.dna.species.species_traits) //Aliens with custom colors simply get turned orange
- N.dna.features["mcolor"] = "f80"
- N.regenerate_icons()
- if(prob(7))
- if(N.w_uniform)
- M.visible_message(pick("[M]'s collar pops up without warning.", "[M] flexes [M.p_their()] arms."))
- else
- M.visible_message("[M] flexes [M.p_their()] arms.")
- if(prob(10))
- M.say(pick("Shit was SO cash.", "You are everything bad in the world.", "What sports do you play, other than 'jack off to naked drawn Japanese people?'", "Don???t be a stranger. Just hit me with your best shot.", "My name is John and I hate every single one of you."), forced = /datum/reagent/spraytan)
- ..()
- return
-
/datum/reagent/mulligan
name = "Mulligan Toxin"
description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change."
@@ -547,12 +467,6 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
taste_description = "bitterness"
-/datum/reagent/serotrotium/on_mob_life(mob/living/carbon/M)
- if(ishuman(M))
- if(prob(7))
- M.emote(pick("twitch","drool","moan","gasp"))
- ..()
-
/datum/reagent/oxygen
name = "Oxygen"
description = "A colorless, odorless gas. Grows on trees but is still pretty valuable."
@@ -560,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."
@@ -597,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
@@ -628,8 +581,6 @@
/datum/reagent/mercury/on_mob_life(mob/living/carbon/M)
if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && !isspaceturf(M.loc))
step(M, pick(GLOB.cardinals))
- if(prob(5))
- M.emote(pick("twitch","drool","moan"))
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1)
..()
@@ -637,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
@@ -657,11 +608,14 @@
name = "Chlorine"
description = "A pale yellow gas that's well known as an oxidizer. While it forms many harmless molecules in its elemental form it is far from harmless."
reagent_state = GAS
+ metabolization_rate = REAGENTS_METABOLISM * 0.5
color = "#FFFB89" //pale yellow? let's make it light gray
- taste_description = "chlorine"
+ taste_description = "caustic"
/datum/reagent/chlorine/on_mob_life(mob/living/carbon/M)
- M.take_bodypart_damage(1*REM, 0, 0, 0)
+ M.take_bodypart_damage(0, 1*REM, 0, 0)
+ if(prob(25))
+ M.adjustOrganLoss(ORGAN_SLOT_LUNGS,2*REM)
. = 1
..()
@@ -680,6 +634,45 @@
mytray.adjustWater(-round(chems.get_reagent_amount(type) * 0.5))
mytray.adjustWeeds(-rand(1,3))
+/datum/reagent/chlorine/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_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("[GAS_CHLORINE]=[reac_volume/2];TEMP=[temp]")
+ return
+
+/datum/reagent/hydrogen_chloride
+ name = "Hydrogen Chloride"
+ description = "A colorless gas that turns into hydrochloric acid in the presence of water."
+ reagent_state = GAS
+ metabolization_rate = REAGENTS_METABOLISM * 0.5
+ color = "#f4ffe0"
+ taste_description = "acid"
+
+/datum/reagent/hydrogen_chloride/on_mob_life(mob/living/carbon/exposed_mob)
+ exposed_mob.take_bodypart_damage(0, 2*REM, 0, 0)
+ exposed_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS,1*REM)
+ exposed_mob.adjustOrganLoss(ORGAN_SLOT_STOMACH,1*REM)
+ . = 1
+ ..()
+
+/datum/reagent/hydrogen_chloride/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_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("[GAS_HYDROGEN_CHLORIDE]=[reac_volume/2];TEMP=[temp]")
+ return
+
/datum/reagent/fluorine
name = "Fluorine"
description = "A comically-reactive chemical element. The universe does not want this stuff to exist in this form in the slightest."
@@ -751,8 +744,6 @@
/datum/reagent/lithium/on_mob_life(mob/living/carbon/M)
if(!HAS_TRAIT(M, TRAIT_IMMOBILIZED) && !isspaceturf(M.loc))
step(M, pick(GLOB.cardinals))
- if(prob(5))
- M.emote(pick("twitch","drool","moan"))
..()
/datum/reagent/lithium/dip_object(obj/item/I, mob/user, obj/item/reagent_containers/H)
@@ -1025,8 +1016,6 @@
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2*REM)
if(prob(50))
M.drowsyness = max(M.drowsyness, 3)
- if(prob(10))
- M.emote("drool")
..()
/datum/reagent/nanomachines
@@ -1135,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.
@@ -1165,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)
@@ -1186,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.
@@ -1538,20 +1601,6 @@
name = "Royal Carpet?"
description = "For those that break the game and need to make an issue report."
-/datum/reagent/carpet/royal/on_mob_life(mob/living/carbon/M)
- . = ..()
- if(!M.mind?.assigned_role)
- return
- switch(M.mind.assigned_role)
- if("Chief Medical Officer", "Captain", "Chief Engineer", "Research Director", "Head of Personnel")
- if(prob(10))
- to_chat(M, "You feel like royalty.")
- if(prob(5))
- M.say(pick("Peasants..","This carpet is worth more than your contracts!","I could fire you at any time..."), forced = "royal carpet")
- if("Quartermaster")
- if(prob(15))
- to_chat(M, "You feel like an impostor...")
-
/datum/reagent/carpet/royal/black
name = "Royal Black Carpet"
description = "For those that feel the need to show off their timewasting skills."
@@ -1581,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)
@@ -1807,12 +1856,6 @@
if(istype(T))
T.MakeDry(ALL, TRUE, reac_volume * 5 SECONDS) //50 deciseconds per unit
-/datum/reagent/drying_agent/expose_obj(obj/O, reac_volume)
- if(O.type == /obj/item/clothing/shoes/galoshes)
- var/t_loc = get_turf(O)
- qdel(O)
- new /obj/item/clothing/shoes/galoshes/dry(t_loc)
-
// Virology virus food chems.
/datum/reagent/toxin/mutagen/mutagenvirusfood
@@ -1865,11 +1908,6 @@
color = "#00ff80"
taste_description = "strange honey"
-/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/carbon/M)
- if(prob(2))
- M.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."), forced = "royal bee jelly")
- ..()
-
//Misc reagents
/datum/reagent/romerol
@@ -1905,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()
@@ -2378,6 +2405,14 @@
else
addtimer(CALLBACK(L, TYPE_PROC_REF(/mob/living, gib)), 5 SECONDS)
+/datum/reagent/concrete_mix
+ name = "Concrete Mix"
+ description = "Pre-made concrete mix, ideal for lazy engineers."
+ color = "#c4c0bc"
+ taste_description = "chalky concrete"
+ harmful = TRUE
+ reagent_state = SOLID
+
/datum/reagent/cement
name = "Cement"
description = "A sophisticated binding agent used to produce concrete."
@@ -2538,3 +2573,64 @@
description = "Bacteria native to the Saint-Roumain Militia home planet."
color = "#5a4f42"
taste_description = "sour"
+
+//anti rad foam
+/datum/reagent/anti_radiation_foam
+ name = "Anti-Radiation Foam"
+ description = "A tried and tested foam, used for decontaminating nuclear disasters."
+ reagent_state = LIQUID
+ color = "#A6FAFF55"
+ taste_description = "bitter, foamy awfulness."
+
+/datum/reagent/anti_radiation_foam/expose_turf(turf/open/T, reac_volume)
+ if (!istype(T))
+ return
+
+ if(reac_volume >= 1)
+ var/obj/effect/particle_effect/foam/antirad/F = (locate(/obj/effect/particle_effect/foam/antirad) in T)
+ if(!F)
+ F = new(T)
+ else if(istype(F))
+ F.lifetime = initial(F.lifetime) //the foam is what does the cleaning here
+
+/datum/reagent/anti_radiation_foam/expose_obj(obj/O, reac_volume)
+ O.wash(CLEAN_RAD)
+
+/datum/reagent/anti_radiation_foam/expose_mob(mob/living/M, method=TOUCH, reac_volume)
+ if(method in list(TOUCH, VAPOR))
+ M.radiation = M.radiation - rand(max(M.radiation * 0.95, M.radiation)) //get the hose
+ M.ExtinguishMob()
+ ..()
+
+
+/datum/reagent/anti_radiation_foam/on_mob_life(mob/living/carbon/M)
+ M.adjustToxLoss(0.5, 200)
+ 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 313fb7475e0..792831c37fd 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 49801719117..e1553a6dffc 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
@@ -974,18 +974,13 @@
taste_description = "bone hurting"
overdose_threshold = 50
-/datum/reagent/toxin/bonehurtingjuice/on_mob_add(mob/living/carbon/M)
- M.say("oof ouch my bones", forced = /datum/reagent/toxin/bonehurtingjuice)
-
/datum/reagent/toxin/bonehurtingjuice/on_mob_life(mob/living/carbon/M)
M.adjustStaminaLoss(7.5, 0)
if(prob(20))
- switch(rand(1, 3))
+ switch(rand(1, 2))
if(1)
- M.say(pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = /datum/reagent/toxin/bonehurtingjuice)
- if(2)
M.manual_emote(pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt."))
- if(3)
+ if(2)
to_chat(M, "Your bones hurt!")
return ..()
@@ -1000,7 +995,6 @@
bp.receive_damage(0, 0, 200)
else //SUCH A LUST FOR REVENGE!!!
to_chat(M, "A phantom limb hurts!")
- M.say("Why are we still here, just to suffer?", forced = /datum/reagent/toxin/bonehurtingjuice)
return ..()
/datum/reagent/toxin/bungotoxin
diff --git a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm
index be5e2ce35f9..380c049adcb 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,27 +26,28 @@
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)
M.set_drugginess(3 * reac_volume)
- M.emote(pick("twitch","giggle"))
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 ..()
@@ -65,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)
@@ -102,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)
@@ -127,83 +124,8 @@
T.IgniteTurf(reac_volume)
new /obj/effect/hotspot(T, reac_volume * 1, FIRE_MINIMUM_TEMPERATURE_TO_EXIST + reac_volume * 10)
var/turf/otherT
- for(var/direction in GLOB.cardinals)
+ for(var/direction in GLOB.alldirs)
otherT = get_step(T, direction)
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 851a9e38a26..d5e74a6766b 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 e7494191d1d..c4eaf50e45d 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,14 +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
- required_reagents = list(/datum/reagent/toxin/slimejelly = 30, /datum/reagent/consumable/frostoil = 5, /datum/reagent/toxin/plasma = 5)
- 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)
@@ -620,6 +600,10 @@
required_temp = 400
mix_message = "The mixture boils off a grey vapor..."//The water boils off, leaving the cement
+/datum/chemical_reaction/quick_concrete
+ results = list(/datum/reagent/concrete = 5)
+ required_reagents = list(/datum/reagent/concrete_mix = 5, /datum/reagent/water = 5)
+
/datum/chemical_reaction/hexement
results = list(/datum/reagent/cement/hexement = 1)
required_reagents = list(/datum/reagent/cement = 6, /datum/reagent/phenol = 1)
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index f6f46d3c397..96c2a85c280 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 d3bf1e21129..00000000000
--- 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/reagent_containers/food/snacks/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 df7949c9c65..80d636202f4 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/concrete_bags.dm b/code/modules/reagents/reagent_containers/concrete_bags.dm
new file mode 100644
index 00000000000..eaceb1c8563
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/concrete_bags.dm
@@ -0,0 +1,58 @@
+/* In a better world, the logic for transfering reagents out of containers wouldn't be in /glass */
+
+/obj/item/reagent_containers/glass/concrete_bag
+ name = "\improper concrete mix bag"
+ desc = "A bag of concrete mixture from the F.O.O.D corportation. Just add water!"
+ w_class = WEIGHT_CLASS_HUGE //25+ kg
+ throw_range = 1
+
+ amount_per_transfer_from_this = 25
+ possible_transfer_amounts = list(25,50,75,100)
+ list_reagents = list(/datum/reagent/concrete_mix = 200)
+ reagent_flags = OPENCONTAINER
+ volume = 200
+
+ icon = 'icons/obj/chemical/concrete.dmi'
+ icon_state = "concrete_bag"
+ item_state = "concrete_bag"
+ lefthand_file = 'icons/mob/inhands/misc/concrete_bag_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/concrete_bag_righthand.dmi'
+ fill_icon_thresholds = null
+
+ var/opened = FALSE
+ var/opened_icon_state = "concrete_bag_open"
+
+ drop_sound = 'sound/items/handling/cloth_drop.ogg'
+ pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
+
+/obj/item/reagent_containers/glass/concrete_bag/examine(mob/user)
+ . = ..()
+ if(!opened)
+ . += span_notice("[src] is unopened")
+ else
+ . += span_notice("[src] has been opened")
+
+/obj/item/reagent_containers/glass/concrete_bag/AltClick(mob/user)
+ if(!can_interact(user))
+ return
+ if(!opened)
+ if(do_after(user, 3 SECONDS))
+ visible_message(span_notice("[user] tears the top of [src] off!"), span_notice("You tear the top off [src]!"))
+ playsound(src, 'sound/items/poster_ripped.ogg', 50, 1)
+ new /obj/effect/decal/cleanable/generic(get_turf(src))
+ icon_state = opened_icon_state
+ spillable = TRUE
+ opened = TRUE
+ return
+ return
+ return
+
+/obj/item/reagent_containers/glass/concrete_bag/attack_self(mob/user)
+ if(!opened)
+ return
+ ..()
+
+/obj/item/reagent_containers/glass/concrete_bag/attack(mob/user)
+ if(!opened)
+ return
+ ..()
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 62661594c06..999b576ea08 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -87,7 +87,7 @@
else if(reagents.total_volume && is_drainable())
switch(user.a_intent)
- if(INTENT_HELP)
+ if(INTENT_DISARM)
attempt_pour(target, user)
if(INTENT_HARM)
user.visible_message("[user] splashes the contents of [src] onto [target]!", \
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 11cbd03c978..8415c98e41e 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
@@ -395,7 +386,7 @@
to_chat(user, "You remove [vial] from [src].")
vial = null
update_appearance()
- playsound(loc, 'sound/weapons/empty.ogg', 50, 1)
+ playsound(loc, SOUND_EMPTY_MAG, 50, 1)
else
to_chat(user, "This hypo isn't loaded!")
return
diff --git a/code/modules/reagents/reagent_containers/jug.dm b/code/modules/reagents/reagent_containers/jug.dm
index 80ebcbb4d5b..10baf946a08 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,26 +105,70 @@
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)
+
+/obj/item/reagent_containers/glass/chem_jug/hexacrete
+ name = "chemical jug (hexacrete)"
+ list_reagents = list(/datum/reagent/concrete/hexacrete = 150)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 9cac6c3a52a..ba3cd6a540f 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_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 05f68682083..1fe7a307353 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -180,7 +180,7 @@
/obj/item/reagent_containers/spray/pepper
name = "pepperspray"
desc = "Manufactured by UhangInc, used to blind and down an opponent quickly."
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
icon_state = "pepperspray"
item_state = "pepperspray"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
@@ -260,8 +260,8 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "chemsprayer"
item_state = "chemsprayer"
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ lefthand_file = GUN_LEFTHAND_ICON
+ righthand_file = GUN_RIGHTHAND_ICON
throwforce = 0
w_class = WEIGHT_CLASS_NORMAL
stream_mode = 1
@@ -298,8 +298,8 @@
desc = "A utility used to spray large amounts of cleaning reagents in a given area. It regenerates space cleaner by itself but it's unable to be fueled by normal means."
icon_state = "chemsprayer_janitor"
item_state = "chemsprayer_janitor"
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ lefthand_file = GUN_LEFTHAND_ICON
+ righthand_file = GUN_RIGHTHAND_ICON
reagent_flags = NONE
list_reagents = list(/datum/reagent/space_cleaner = 1000)
volume = 1000
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 84a8292f726..dd8c6c24442 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -58,6 +58,12 @@
reagent_id = /datum/reagent/firefighting_foam
tank_volume = 500
+/obj/structure/reagent_dispensers/foamtank/antirad
+ name = "anti-radiation foam tank"
+ desc = "A tank full of decontamination foam"
+ reagent_id = /datum/reagent/anti_radiation_foam
+ tank_volume = 1000
+
/obj/structure/reagent_dispensers/fueltank
name = "fuel tank"
desc = "A tank full of industrial welding fuel. Do not consume."
@@ -68,9 +74,6 @@
explosion(get_turf(src), 0, 1, 5, flame_range = 5)
qdel(src)
-/obj/structure/reagent_dispensers/fueltank/blob_act(obj/structure/blob/B)
- boom()
-
/obj/structure/reagent_dispensers/fueltank/ex_act()
boom()
@@ -161,12 +164,6 @@
icon_state = "beer"
reagent_id = /datum/reagent/consumable/ethanol/beer
-/obj/structure/reagent_dispensers/beerkeg/blob_act(obj/structure/blob/B)
- explosion(src.loc,0,3,5,7,10)
- if(!QDELETED(src))
- qdel(src)
-
-
/obj/structure/reagent_dispensers/virusfood
name = "virus food dispenser"
desc = "A dispenser of low-potency virus mutagenic."
@@ -191,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 b8b08486f20..9b6a0629fa3 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 e33da846d4d..9531f796047 100644
--- a/code/modules/requests/requests_manager.dm
+++ b/code/modules/requests/requests_manager.dm
@@ -23,7 +23,7 @@ GLOBAL_DATUM_INIT(requests, /datum/request_manager, new)
/// List where requests can be accessed by ID
var/list/requests_by_id = list()
-/datum/request_manager/Destroy(force, ...)
+/datum/request_manager/Destroy(force)
QDEL_LIST(requests)
return ..()
@@ -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/bepis.dm b/code/modules/research/bepis.dm
deleted file mode 100644
index bb56a69adf2..00000000000
--- a/code/modules/research/bepis.dm
+++ /dev/null
@@ -1,275 +0,0 @@
-//This system is designed to act as an in-between for cargo and science, and the first major money sink in the game outside of just buying things from cargo (As of 10/9/19, anyway).
-
-//economics defined values, subject to change should anything be too high or low in practice.
-
-#define MACHINE_OPERATION 100000
-#define MACHINE_OVERLOAD 500000
-#define MAJOR_THRESHOLD 5500
-#define MINOR_THRESHOLD 3500
-#define STANDARD_DEVIATION 1000
-
-/obj/machinery/rnd/bepis
- name = "\improper B.E.P.I.S. Chamber"
- desc = "A high fidelity testing device which unlocks the secrets of the known universe using the two most powerful substances available to man: excessive amounts of electricity and capital."
- icon = 'icons/obj/machines/bepis.dmi'
- icon_state = "chamber"
- base_icon_state = "chamber"
- density = TRUE
- layer = ABOVE_MOB_LAYER
- use_power = IDLE_POWER_USE
- active_power_usage = ACTIVE_DRAW_HIGH
- circuit = /obj/item/circuitboard/machine/bepis
-
- var/banking_amount = 100
- var/banked_cash = 0 //stored player cash
- var/datum/bank_account/account //payer's account.
- var/account_name //name of the payer's account.
- var/error_cause = null
- //Vars related to probability and chance of success for testing
- var/major_threshold = MAJOR_THRESHOLD
- var/minor_threshold = MINOR_THRESHOLD
- var/std = STANDARD_DEVIATION //That's Standard Deviation, what did you think it was?
- //Stock part variables
- var/power_saver = 1
- var/inaccuracy_percentage = 1.5
- var/positive_cash_offset = 0
- var/negative_cash_offset = 0
- var/minor_rewards = list(
- //To add a new minor reward, add it here.
- /obj/item/stack/circuit_stack/full,
- /obj/item/pen/survival,
- /obj/item/toy/sprayoncan,
- )
- var/static/list/item_list = list()
-
-/obj/machinery/rnd/bepis/attackby(obj/item/O, mob/user, params)
- if(default_deconstruction_screwdriver(user, "chamber_open", "chamber", O))
- update_icon_state()
- return
- if(default_deconstruction_crowbar(O))
- return
- if(!is_operational)
- to_chat(user, "[src] can't accept money when it's not functioning.")
- return
- if(istype(O, /obj/item/holochip) || istype(O, /obj/item/spacecash/bundle))
- var/deposit_value = O.get_item_credit_value()
- banked_cash += deposit_value
- qdel(O)
- say("Deposited [deposit_value] credits into storage.")
- update_icon_state()
- return
- if(istype(O, /obj/item/card/bank))
- var/obj/item/card/bank/bank_card = O
- if(bank_card.registered_account)
- account = bank_card.registered_account
- account_name = bank_card.registered_name
- say("New account detected. Console Updated.")
- else
- say("No account detected on card. Aborting.")
- return
- return ..()
-
-/obj/machinery/rnd/bepis/RefreshParts()
- var/C = 0
- var/M = 0
- var/L = 0
- var/S = 0
- for(var/obj/item/stock_parts/capacitor/Cap in component_parts)
- C += ((Cap.rating - 1) * 0.1)
- power_saver = 1 - C
- for(var/obj/item/stock_parts/manipulator/Manip in component_parts)
- M += ((Manip.rating - 1) * 250)
- positive_cash_offset = M
- for(var/obj/item/stock_parts/micro_laser/Laser in component_parts)
- L += ((Laser.rating - 1) * 250)
- negative_cash_offset = L
- for(var/obj/item/stock_parts/scanning_module/Scan in component_parts)
- S += ((Scan.rating - 1) * 0.25)
- inaccuracy_percentage = (1.5 - S)
-
-/obj/machinery/rnd/bepis/proc/depositcash()
- var/deposit_value = 0
- deposit_value = banking_amount
- if(deposit_value == 0)
- update_icon_state()
- say("Attempting to deposit 0 credits. Aborting.")
- return
- deposit_value = clamp(round(deposit_value, 1), 1, 15000)
- if(!account)
- say("Cannot find user account. Please swipe a valid ID.")
- return
- if(!account.has_money(deposit_value))
- say("You do not possess enough credits.")
- return
- account.adjust_money(-deposit_value, "bepis") //The money vanishes, not paid to any accounts.
- SSblackbox.record_feedback("amount", "BEPIS_credits_spent", deposit_value)
- log_econ("[deposit_value] credits were inserted into [src] by [account.account_holder]")
- banked_cash += deposit_value
- use_power(1000 * power_saver)
- say("Cash deposit successful. There is [banked_cash] in the chamber.")
- update_icon_state()
- return
-
-/obj/machinery/rnd/bepis/proc/withdrawcash()
- var/withdraw_value = 0
- withdraw_value = banking_amount
- if(withdraw_value > banked_cash)
- say("Cannot withdraw more than stored funds. Aborting.")
- else
- banked_cash -= withdraw_value
- new /obj/item/spacecash/bundle(src.loc, withdraw_value)
- say("Withdrawing [withdraw_value] credits from the chamber.")
- update_icon_state()
- return
-
-/obj/machinery/rnd/bepis/proc/calcsuccess()
- var/turf/dropturf = null
- var/gauss_major = 0
- var/gauss_minor = 0
- var/gauss_real = 0
- var/list/turfs = block(locate(x-1,y-1,z),locate(x+1,y+1,z)) //NO MORE DISCS IN WINDOWS
- while(length(turfs))
- var/turf/T = pick_n_take(turfs)
- if(T.is_blocked_turf(TRUE))
- continue
- else
- dropturf = T
- break
- if (!dropturf)
- dropturf = drop_location()
- gauss_major = (gaussian(major_threshold, std) - negative_cash_offset) //This is the randomized profit value that this experiment has to surpass to unlock a tech.
- gauss_minor = (gaussian(minor_threshold, std) - negative_cash_offset) //And this is the threshold to instead get a minor prize.
- gauss_real = (gaussian(banked_cash, std*inaccuracy_percentage) + positive_cash_offset) //this is the randomized profit value that your experiment expects to give.
- say("Real: [gauss_real]. Minor: [gauss_minor]. Major: [gauss_major].")
- flick("chamber_flash",src)
- update_icon_state()
- banked_cash = 0
- if((gauss_real >= gauss_major) && (SSresearch.techweb_nodes_experimental.len > 0)) //Major Success.
- say("Experiment concluded with major success. New technology node discovered on technology disc.")
- new /obj/item/disk/tech_disk/major(dropturf,1)
- if(SSresearch.techweb_nodes_experimental.len == 0)
- say("Expended all available experimental technology nodes. Resorting to minor rewards.")
- return
- if(gauss_real >= gauss_minor) //Minor Success.
- var/reward = pick(minor_rewards)
- new reward(dropturf)
- say("Experiment concluded with partial success. Dispensing compiled research efforts.")
- return
- if(gauss_real <= -1) //Critical Failure
- say("ERROR: CRITICAL MACHIME MALFUNCTI- ON. CURRENCY IS NOT CRASH. CANNOT COMPUTE COMMAND: 'make bucks'") //not a typo, for once.
- new /mob/living/simple_animal/deer(dropturf, 1)
- use_power(MACHINE_OVERLOAD * power_saver) //To prevent gambling at low cost and also prevent spamming for infinite deer.
- return
- //Minor Failure
- error_cause = pick("attempted to sell grey products to American dominated market.","attempted to sell gray products to British dominated market.","placed wild assumption that PDAs would go out of style.","simulated product #76 damaged brand reputation mortally.","simulated business model resembled 'pyramid scheme' by 98.7%.","product accidently granted override access to all vessel doors.")
- say("Experiment concluded with zero product viability. Cause of error: [error_cause]")
- return
-
-/obj/machinery/rnd/bepis/update_icon_state()
- if(panel_open == TRUE)
- icon_state = "[base_icon_state]_open"
- return ..()
- if((use_power == ACTIVE_POWER_USE) && (banked_cash > 0) && (is_operational))
- icon_state = "[base_icon_state]_active_loaded"
- return ..()
- if (((use_power == IDLE_POWER_USE) && (banked_cash > 0)) || (banked_cash > 0) && (!is_operational))
- icon_state = "[base_icon_state]_loaded"
- return ..()
- if(use_power == ACTIVE_POWER_USE && is_operational)
- icon_state = "[base_icon_state]_active"
- return ..()
- if(((use_power == IDLE_POWER_USE) && (banked_cash == 0)) || (!is_operational))
- icon_state = base_icon_state
- return ..()
- return ..()
-
-/obj/machinery/rnd/bepis/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "Bepis", name)
- ui.open()
- RefreshParts()
-
-/obj/machinery/rnd/bepis/ui_data(mob/user)
- var/list/data = list()
- var/powered = FALSE
- var/zvalue = (banked_cash - (major_threshold - positive_cash_offset - negative_cash_offset))/(std)
- var/std_success = 0
- var/prob_success = 0
- //Admittedly this is messy, but not nearly as messy as the alternative, which is jury-rigging an entire Z-table into the code, or making an adaptive z-table.
- var/z = abs(zvalue)
- if(z > 0 && z <= 0.5)
- std_success = 19.1
- else if(z > 0.5 && z <= 1.0)
- std_success = 34.1
- else if(z > 1.0 && z <= 1.5)
- std_success = 43.3
- else if(z > 1.5 && z <= 2.0)
- std_success = 47.7
- else if(z > 2.0 && z <= 2.5)
- std_success = 49.4
- else
- std_success = 50
- if(zvalue > 0)
- prob_success = 50 + std_success
- else if(zvalue == 0)
- prob_success = 50
- else
- prob_success = 50 - std_success
-
- if(use_power == ACTIVE_POWER_USE)
- powered = TRUE
- data["account_owner"] = account_name
- data["amount"] = banking_amount
- data["stored_cash"] = banked_cash
- data["mean_value"] = (major_threshold - positive_cash_offset - negative_cash_offset)
- data["error_name"] = error_cause
- data["power_saver"] = power_saver
- data["accuracy_percentage"] = inaccuracy_percentage * 100
- data["positive_cash_offset"] = positive_cash_offset
- data["negative_cash_offset"] = negative_cash_offset
- data["manual_power"] = powered ? FALSE : TRUE
- data["silicon_check"] = issilicon(user)
- data["success_estimate"] = prob_success
- return data
-
-/obj/machinery/rnd/bepis/ui_act(action,params)
- . = ..()
- if(.)
- return
- switch(action)
- if("deposit_cash")
- if(use_power == IDLE_POWER_USE)
- return
- depositcash()
- if("withdraw_cash")
- if(use_power == IDLE_POWER_USE)
- return
- withdrawcash()
- if("begin_experiment")
- if(use_power == IDLE_POWER_USE)
- return
- if(banked_cash == 0)
- say("Please deposit funds to begin testing.")
- return
- calcsuccess()
- use_power(MACHINE_OPERATION * power_saver) //This thing should eat your APC battery if you're not careful.
- set_idle_power() //Machine shuts off after use to prevent spam and look better visually.
- update_icon_state()
- if("amount")
- var/input = text2num(params["amount"])
- if(input)
- banking_amount = input
- if("toggle_power")
- if(use_power == ACTIVE_POWER_USE)
- set_idle_power()
- else
- set_active_power()
- update_icon_state()
- if("account_reset")
- if(use_power == IDLE_POWER_USE)
- return
- account_name = ""
- account = null
- say("Account settings reset.")
- . = TRUE
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 5e45c756c88..6d6b7c0f1ab 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -97,18 +97,25 @@ other types of metals and chemistry for reagents).
color = "#8b70ff"
illustration = "design"
custom_materials = list(/datum/material/iron =300, /datum/material/glass =100)
+ var/disk_name = "Design Disk"
+ var/design_name
var/list/blueprints = list()
- var/list/starting_blueprints = list()
+ var/starting_blueprints = list()
var/max_blueprints = 1
/obj/item/disk/design_disk/Initialize()
. = ..()
pixel_x = base_pixel_x + rand(-5, 5)
pixel_y = base_pixel_y + rand(-5, 5)
- blueprints = new/list(max_blueprints)
+ if(design_name)
+ name = jointext(list(disk_name, design_name), " - ")
+ if(length(starting_blueprints))
+ for(var/design in starting_blueprints)
+ blueprints += new design()
/obj/item/disk/design_disk/adv
name = "Advanced Component Design Disk"
+ disk_name = "Advanced Design Disk"
color = "#bed876"
desc = "A disk for storing device design data for construction in lathes. This one has a little bit of extra storage space."
custom_materials = list(/datum/material/iron =300, /datum/material/glass = 100, /datum/material/silver = 50)
@@ -116,6 +123,7 @@ other types of metals and chemistry for reagents).
/obj/item/disk/design_disk/super
name = "Super Component Design Disk"
+ disk_name = "Super Design Disk"
color = "#c25454"
desc = "A disk for storing device design data for construction in lathes. This one has more extra storage space."
custom_materials = list(/datum/material/iron =300, /datum/material/glass = 100, /datum/material/silver = 50, /datum/material/gold = 50)
@@ -123,6 +131,7 @@ other types of metals and chemistry for reagents).
/obj/item/disk/design_disk/elite
name = "Elite Component Design Disk"
+ disk_name = "Elite Design Disk"
color = "#333333"
desc = "A disk for storing device design data for construction in lathes. This one has absurd amounts of extra storage space."
custom_materials = list(/datum/material/iron =300, /datum/material/glass = 100, /datum/material/silver = 100, /datum/material/gold = 100, /datum/material/bluespace = 50)
@@ -130,39 +139,71 @@ other types of metals and chemistry for reagents).
//Disks with content
/obj/item/disk/design_disk/ammo_c10mm
- name = "Design Disk - 10mm Ammo"
+ design_name = "10mm Ammo"
desc = "A design disk containing the pattern for a refill box of standard 10mm ammo, used in Stechkin pistols."
-
-/obj/item/disk/design_disk/ammo_c10mm/Initialize()
- . = ..()
- blueprints[1] = new /datum/design/c10mm()
-
+ starting_blueprints = (/datum/design/c10mm)
/obj/item/disk/design_disk/disposable_gun
- name = "design disk - disposable gun"
+ design_name = "Disposable gun"
desc = "A design disk containing designs for a cheap and disposable gun."
illustration = "gun"
max_blueprints = 2
-
-/obj/item/disk/design_disk/disposable_gun/Initialize()
- . = ..()
- blueprints[1] = new /datum/design/disposable_gun()
+ starting_blueprints = list(/datum/design/disposable_gun)
/obj/item/disk/design_disk/clip_mechs
- name = "design disk - CLIP mecha modifications"
- desc = "A design disk containing specifications for CLIP-custom mecha conversions."
+ design_name = "CLIP exosuit modifications"
+ desc = "A design disk containing specifications for CLIP-custom exosuit conversions."
color = "#57b8f0"
max_blueprints = 2
-
-/obj/item/disk/design_disk/clip_mechs/Initialize()
- . = ..()
- blueprints[1] = new /datum/design/clip_ripley_upgrade()
- blueprints[2] = new /datum/design/clip_durand_upgrade()
+ starting_blueprints = list(/datum/design/clip_ripley_upgrade, /datum/design/clip_durand_upgrade)
/obj/item/disk/design_disk/ammo_c9mm
- name = "Design Disk - 9mm Ammo"
+ design_name = "9mm Ammo"
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)
+
+
+/obj/item/disk/design_disk/ammo_1911
+ design_name = "1911 Magazine"
+ desc = "A design disk containing the pattern for the classic 1911's seven round .45ACP magazine."
+ illustration = "ammo"
+ starting_blueprints = list(/datum/design/colt_1911_magazine)
+
+//KA modkit design discs
+/obj/item/disk/design_disk/modkit_disc
+ design_name = "KA Mod"
+ desc = "A design disc containing the design for a unique kinetic accelerator modkit. It's compatible with a research console."
+ illustration = "accel"
+ color = "#6F6F6F"
+ starting_blueprints = list(/datum/design/unique_modkit)
+
+/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe
+ design_name = "Offensive Mining Explosion Mod"
+ starting_blueprints = list(/datum/design/unique_modkit/offensive_turf_aoe)
+
+/obj/item/disk/design_disk/modkit_disc/rapid_repeater
+ design_name = "Rapid Repeater Mod"
+ starting_blueprints = list(/datum/design/unique_modkit/rapid_repeater)
+
+/obj/item/disk/design_disk/modkit_disc/resonator_blast
+ design_name = "Resonator Blast Mod"
+ starting_blueprints = list(/datum/design/unique_modkit/resonator_blast)
+
+/obj/item/disk/design_disk/modkit_disc/bounty
+ design_name = "Death Syphon Mod"
+ starting_blueprints = list(/datum/design/unique_modkit/bounty)
diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm
index 8401d618aa0..7ba92c76ba2 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 517c8691c92..5ac2370dc69 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -286,7 +286,7 @@
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 750)
build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty
- category = list("hacked","Misc","Equipment")
+ category = list("initial", "Misc","Equipment")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
/datum/design/plasmaman_tank_belt
@@ -295,7 +295,7 @@
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 800)
build_path = /obj/item/tank/internals/plasmaman/belt/empty
- category = list("hacked","Misc","Equipment")
+ category = list("initial", "Misc","Equipment")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
/datum/design/generic_gas_tank
@@ -356,7 +356,7 @@
id = "kitchen_knife"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 12000)
- build_path = /obj/item/kitchen/knife
+ build_path = /obj/item/melee/knife/kitchen
category = list("initial","Dinnerware")
/datum/design/plastic_knife
@@ -364,7 +364,7 @@
id = "plastic_knife"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/plastic = 100)
- build_path = /obj/item/kitchen/knife/plastic
+ build_path = /obj/item/melee/knife/plastic
category = list("initial", "Tool Designs","Dinnerware")
/datum/design/fork
@@ -516,14 +516,6 @@
category = list("initial","Misc", "Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-/datum/design/foilhat
- name = "Tinfoil Hat"
- id = "tinfoil_hat"
- build_type = AUTOLATHE
- materials = list(/datum/material/iron = 5500)
- build_path = /obj/item/clothing/head/foilhat
- category = list("hacked", "Misc")
-
/datum/design/scalpel
name = "Scalpel"
id = "scalpel"
@@ -769,34 +761,16 @@
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")
-//hacked autolathe recipes
-//WS - emagged recipies
-/datum/design/flamethrower
- name = "Flamethrower"
- id = "flamethrower"
- build_type = AUTOLATHE
- materials = list(/datum/material/iron = 500)
- build_path = /obj/item/flamethrower/full
- category = list("hacked", "Security")
-
-/datum/design/electropack
- name = "Electropack"
- id = "electropack"
- build_type = AUTOLATHE
- materials = list(/datum/material/iron = 10000, /datum/material/glass = 2500)
- build_path = /obj/item/electropack
- category = list("hacked", "Tools")
-
/datum/design/handcuffs
name = "Handcuffs"
id = "handcuffs"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 500)
build_path = /obj/item/restraints/handcuffs
- category = list("hacked", "Security")
+ category = list("initial", "Security")
/datum/design/receiver
name = "Modular Receiver"
@@ -804,14 +778,14 @@
build_type = AUTOLATHE
materials = list(/datum/material/iron = 15000)
build_path = /obj/item/weaponcrafting/receiver
- category = list("hacked", "Security")
+ category = list("initial", "Security")
/datum/design/c38_surplus
name = "Ammo Box (.38 surplus)"
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
@@ -822,36 +796,36 @@
build_path = /obj/item/ammo_casing/shotgun/beanbag
category = list("initial", "Security", "Ammo")
+/datum/design/blank_shell
+ name = "Shotgun Blank"
+ id = "blank_shell"
+ build_type = AUTOLATHE | PROTOLATHE
+ materials = list(/datum/material/iron = 2000)
+ build_path = /obj/item/ammo_casing/shotgun/blank
+ category = list("Security", "Ammo")
+
/datum/design/riot_dart
name = "Foam Riot Dart"
id = "riot_dart"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 1000) //Discount for making individually - no box = less metal!
build_path = /obj/item/ammo_casing/caseless/foam_dart/riot
- category = list("hacked", "Security")
+ category = list("initial", "Security")
/datum/design/riot_darts
name = "Foam Riot Dart Box"
id = "riot_darts"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 50000) //Comes with 40 darts
- build_path = /obj/item/ammo_box/foambox/riot
- category = list("hacked", "Security")
-
-/datum/design/a357
- name = ".357 Casing"
- id = "a357"
- build_type = AUTOLATHE
- materials = list(/datum/material/iron = 4000)
- build_path = /obj/item/ammo_casing/a357
- category = list("emagged", "Security")
+ build_path = /obj/item/storage/box/ammo/foam_darts/riot
+ category = list("initial", "Security")
/datum/design/c10mm_surplus
name = "Ammo Box (10mm surplus)"
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
@@ -859,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
@@ -867,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
@@ -875,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
@@ -899,8 +865,8 @@
id = "cleaver"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 18000)
- build_path = /obj/item/kitchen/knife/butcher
- category = list("hacked", "Dinnerware")
+ build_path = /obj/item/melee/knife/butcher
+ category = list("initial", "Dinnerware")
/datum/design/spraycan
name = "Spraycan"
@@ -985,14 +951,6 @@
build_path = /obj/item/modular_computer/tablet
category = list("initial","Misc")
-/datum/design/slime_scanner
- name = "Slime Scanner"
- id = "slime_scanner"
- build_type = AUTOLATHE
- materials = list(/datum/material/iron = 300, /datum/material/glass = 200)
- build_path = /obj/item/slime_scanner
- category = list("initial", "Misc")
-
/datum/design/pet_carrier
name = "Pet Carrier"
id = "pet_carrier"
@@ -1084,7 +1042,7 @@
build_type = AUTOLATHE
materials = list(/datum/material/iron = 100, /datum/material/glass = 50)
build_path = /obj/item/toy/gun
- category = list("hacked", "Misc")
+ category = list("initial", "Misc")
/datum/design/capbox
name = "Box of Cap Gun Shots"
@@ -1092,7 +1050,7 @@
build_type = AUTOLATHE
materials = list(/datum/material/iron = 20, /datum/material/glass = 5)
build_path = /obj/item/toy/ammo/gun
- category = list("hacked", "Misc")
+ category = list("initial", "Misc")
/datum/design/toy_balloon
name = "Plastic Balloon"
@@ -1100,7 +1058,7 @@
build_type = AUTOLATHE
materials = list(/datum/material/plastic = 1200)
build_path = /obj/item/toy/balloon
- category = list("hacked", "Misc")
+ category = list("initial", "Misc")
/datum/design/toy_meteor
name = "Plastic Toy Meteor"
@@ -1108,15 +1066,7 @@
build_type = AUTOLATHE
materials = list(/datum/material/plastic = 1000)
build_path = /obj/item/toy/minimeteor
- category = list("hacked", "Misc")
-
-/datum/design/toy_armblade
- name = "Plastic Armblade"
- id = "toy_armblade"
- build_type = AUTOLATHE
- materials = list(/datum/material/plastic = 2000)
- build_path = /obj/item/toy/foamblade
- category = list("hacked", "Misc")
+ category = list("initial", "Misc")
/datum/design/plastic_tree
name = "Plastic Potted Plant"
@@ -1181,7 +1131,7 @@
build_type = AUTOLATHE
materials = list(/datum/material/iron = 20000)
build_path = /obj/item/ammo_box/magazine/zip_ammo_9mm
- category = list("hacked", "Security")
+ category = list("initial", "Security")
/datum/design/pipedispenser
name = "Pipe Dispenser (Machine Board)"
@@ -1191,6 +1141,46 @@
build_path = /obj/item/circuitboard/machine/pipedispenser
category = list("initial", "Machinery")
+/datum/design/illestren_a850rclip
+ name = "8x50 Stripper Clip"
+ id = "IllestrenStripClip"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 10000)
+ build_path = /obj/item/ammo_box/magazine/illestren_a850r/empty
+ category = list("initial", "Security", "Ammo")
+
+/datum/design/a300clip
+ name = ".300 Scout Stripper Clip"
+ id = "ScoutStripClip"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 10000)
+ build_path = /obj/item/ammo_box/a300/empty
+ category = list("initial", "Security", "Ammo")
+
+/datum/design/a762_40clip
+ name = "7.62 Stripper Clip"
+ id = "PolymerStripClip"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 10000)
+ build_path = /obj/item/ammo_box/a762_stripper/empty
+ category = list("initial", "Security", "Ammo")
+
+/datum/design/vickland_a308clip
+ name = ".308 Stripper Clip"
+ id = "VicklandStripClip"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 10000)
+ build_path = /obj/item/ammo_box/vickland_a308/empty
+ category = list("initial", "Security", "Ammo")
+
+/datum/design/a858clip
+ name = "8x58 Stripper Clip"
+ id = "SSGStripClip"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 10000)
+ build_path = /obj/item/ammo_box/a858/empty
+ category = list("initial", "Security", "Ammo")
+
/datum/design/control
name = "Blast Door Controller"
id = "blast"
@@ -1247,3 +1237,12 @@
materials = list(/datum/material/plastic = 30)
build_path = /obj/item/folder/biscuit/unsealed/confidental
category = list("initial", "Tools", "Misc")
+
+/datum/design/marker_beacon
+ name = "Marker Beacon"
+ id = "marker_beacon"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 50, /datum/material/glass = 20)
+ build_path = /obj/item/stack/marker_beacon
+ category = list("initial","Misc")
+
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index c33b2c4558d..2cc0134cf8f 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 9b167598d02..6cd4b69f406 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."
@@ -183,21 +175,13 @@
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO
/datum/design/board/mechapower
- name = "Computer Design (Mech Bay Power Control Console)"
- desc = "Allows for the construction of circuit boards used to build a mech bay power control console."
+ name = "Computer Design (Exosuit) Bay Power Control Console)"
+ desc = "Allows for the construction of circuit boards used to build an exosuit bay power control console."
id = "mechapower"
build_path = /obj/item/circuitboard/computer/mech_bay_power_console
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 5f79bbbf12e..b910f6f008e 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
@@ -238,14 +239,6 @@
category = list("Research Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-/datum/design/board/bepis
- name = "Machine Design (B.E.P.I.S. Board)"
- desc = "The circuit board for a B.E.P.I.S."
- id = "bepis"
- build_path = /obj/item/circuitboard/machine/bepis
- category = list("Research Machinery")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO
-
/datum/design/board/rdserver
name = "Machine Design (R&D Server Board)"
desc = "The circuit board for an R&D Server."
@@ -340,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."
@@ -604,13 +588,6 @@
category = list ("Medical Machinery")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-/datum/design/board/sheetifier
- name = "Sheetifier"
- desc = "This machine turns weird things into sheets."
- id = "sheetifier"
- build_path = /obj/item/circuitboard/machine/sheetifier
- category = list ("Misc. Machinery")
-
/datum/design/board/shieldwallgen
name = "Machine Design (Shield Wall Generator)"
desc = "A shield generator commonly used in xenobiology research."
diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm
index 61fb07e7750..965a164e35d 100644
--- a/code/modules/research/designs/mecha_designs.dm
+++ b/code/modules/research/designs/mecha_designs.dm
@@ -133,8 +133,8 @@
////////////////////////////////////////
/datum/design/mech_scattershot
- name = "Exosuit Weapon (LBX AC 10 \"Scattershot\")"
- desc = "Allows for the construction of LBX AC 10."
+ name = "Exosuit Weapon (LBX-10 \"Scattershot\")"
+ desc = "Allows for the construction of LBX-10."
id = "mech_scattershot"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
@@ -143,8 +143,8 @@
category = list("Exosuit Equipment")
/datum/design/mech_scattershot_ammo
- name = "LBX AC 10 Scattershot Ammunition"
- desc = "Ammunition for the LBX AC 10 exosuit weapon."
+ name = "LBX-10 Scattershot Ammunition"
+ desc = "Ammunition for the LBX-10 exosuit weapon."
id = "mech_scattershot_ammo"
build_type = PROTOLATHE | MECHFAB
build_path = /obj/item/mecha_ammo/scattershot
@@ -153,7 +153,7 @@
category = list("Exosuit Ammunition", "Ammo")
/datum/design/mech_carbine
- name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)"
+ name = "Exosuit Weapon (FNX-99 \"Phoenix\" Carbine)"
desc = "Allows for the construction of FNX-99 \"Hades\" Carbine."
id = "mech_carbine"
build_type = MECHFAB
@@ -164,7 +164,7 @@
/datum/design/mech_carbine_ammo
name = "FNX-99 Carbine Ammunition"
- desc = "Ammunition for the FNX-99 \"Hades\" Carbine."
+ desc = "Ammunition for the FNX-99 \"Phoenix\" Carbine."
id = "mech_carbine_ammo"
build_type = PROTOLATHE | MECHFAB
build_path = /obj/item/mecha_ammo/incendiary
@@ -403,7 +403,7 @@
category = list("Exosuit Equipment")
/datum/design/mech_lmg
- name = "Exosuit Weapon (\"Ultra AC 2\" LMG)"
+ name = "Exosuit Weapon (\"UMG-2\" LMG)"
desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst."
id = "mech_lmg"
build_type = MECHFAB
@@ -413,8 +413,8 @@
category = list("Exosuit Equipment")
/datum/design/mech_lmg_ammo
- name = "Ultra AC 2 Ammunition"
- desc = "Ammunition for the Ultra AC 2 LMG"
+ name = "UMG-2 Ammunition"
+ desc = "Ammunition for the UMG-2 LMG"
id = "mech_lmg_ammo"
build_type = PROTOLATHE | MECHFAB
build_path = /obj/item/mecha_ammo/lmg
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 46dddeb0c58..cc45dd17987 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/mining_designs.dm b/code/modules/research/designs/mining_designs.dm
index 2cddc5043c3..aa221c2b21a 100644
--- a/code/modules/research/designs/mining_designs.dm
+++ b/code/modules/research/designs/mining_designs.dm
@@ -8,7 +8,7 @@
id = "cargoexpress"//the coder reading this
build_type = IMPRINTER
materials = list(/datum/material/glass = 1000)
- build_path = /obj/item/circuitboard/computer/cargo/express
+ build_path = /obj/item/circuitboard/computer/cargo
category = list("Mining Designs")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 816cd4f9fdb..98a088756d8 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -229,7 +229,7 @@
id = "roastingstick"
build_type = PROTOLATHE
materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/bluespace = 250)
- build_path = /obj/item/melee/roastingstick
+ build_path = /obj/item/roastingstick
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm
index ba52f69c550..6c7097b351a 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 86a8b542712..b57dca9d785 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 3353dcfb328..f1b9a8c573c 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -18,7 +18,7 @@
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS
/datum/design/c38_hotshot
- name = "Speed Loader (.38 Hot Shot)"
+ name = "Speed Loader (.38 Hearth)"
desc = "Designed to quickly reload revolvers. Hot Shot bullets contain an incendiary payload."
id = "c38_hotshot"
build_type = PROTOLATHE
@@ -28,7 +28,7 @@
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS
/datum/design/c38_iceblox
- name = "Speed Loader (.38 Iceblox)"
+ name = "Speed Loader (.38 Chilled)"
desc = "Designed to quickly reload revolvers. Iceblox bullets contain a cryogenic payload."
id = "c38_iceblox"
build_type = PROTOLATHE
@@ -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."
@@ -258,13 +248,13 @@
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-/datum/design/stechkinammo
- name = "Stechkin magazine (10mm)"
- desc = "A single stack Stechkin magazine, designed to chamber 10mm and fit into the Syndicate's Stechkin sidearms."
- id = "stechkinammo"
+/datum/design/ringneckammo
+ name = "Ringneck magazine (10mm)"
+ desc = "A single stack Ringneck magazine, designed to chamber 10mm and fit into Scarborough Arm's Ringneck series of sidearms."
+ id = "ringneckammo"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/magazine/m10mm
+ build_path = /obj/item/ammo_box/magazine/m10mm_ringneck
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -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"
@@ -558,7 +514,7 @@
id = "suppressor"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 2000, /datum/material/silver = 500)
- build_path = /obj/item/suppressor
+ build_path = /obj/item/attachment/silencer
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -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 ce473ad739c..62cd6f6bf8e 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 8b6acd39ae3..e0ba10ce4af 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -123,29 +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
- if(!slime_already_researched[E.type])
- 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))
- slime_already_researched[E.type] = TRUE
- 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
if(!plant_already_researched[E.type])
@@ -656,10 +633,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 databaseClear Slot"
else
diff --git a/code/modules/research/research_disk.dm b/code/modules/research/research_disk.dm
index 5f4fce5fd45..0354fddd50d 100644
--- a/code/modules/research/research_disk.dm
+++ b/code/modules/research/research_disk.dm
@@ -23,17 +23,6 @@
. = ..()
stored_research = new /datum/techweb/admin
-/obj/item/disk/tech_disk/major
- name = "Reformatted technology disk"
- desc = "A disk containing a new, completed tech from the B.E.P.I.S. Upload the disk to an R&D Console to redeem the tech."
- color = "#FFBAFF"
- illustration = "bepis"
- custom_materials = list(/datum/material/iron=300, /datum/material/glass=100)
-
-/obj/item/disk/tech_disk/major/Initialize()
- . = ..()
- stored_research = new /datum/techweb/bepis
-
/obj/item/research_notes
name = "research notes"
desc = "Valuable scientific data. Use it in a research console to scan it."
diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm
index 339edcfaa9a..4aae75fbeab 100644
--- a/code/modules/research/techweb/_techweb.dm
+++ b/code/modules/research/techweb/_techweb.dm
@@ -53,19 +53,6 @@
organization = ship_name
return ..()
-/datum/techweb/bepis //Should contain only 1 BEPIS tech selected at random.
- id = "EXPERIMENTAL"
- organization = "Nanotrasen R&D"
-
-/datum/techweb/bepis/New()
- . = ..()
- var/bepis_id = pick(SSresearch.techweb_nodes_experimental) //To add a new tech to the BEPIS, add the ID to this pick list.
- var/datum/techweb_node/BN = (SSresearch.techweb_node_by_id(bepis_id))
- hidden_nodes -= BN.id //Has to be removed from hidden nodes
- research_node(BN, TRUE, FALSE)
- update_node_status(BN)
- SSresearch.techweb_nodes_experimental -= bepis_id
-
/datum/techweb/Destroy()
researched_nodes = null
researched_designs = null
diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm
index 73d732e28a1..ff2b93791a7 100644
--- a/code/modules/research/techweb/_techweb_node.dm
+++ b/code/modules/research/techweb/_techweb_node.dm
@@ -7,7 +7,6 @@
var/display_name = "Errored Node"
var/description = "Why are you seeing this?"
var/hidden = FALSE //Whether it starts off hidden.
- var/experimental = FALSE //If the tech can be randomly granted by the BEPIS as a reward. Meant to be fully given in tech disks, not researched.
var/starting_node = FALSE //Whether it's available without any research.
var/list/prereq_ids = list()
var/list/design_ids = list()
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index dbca44b757b..cc7bd32bf23 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -13,13 +13,13 @@
// Cargo Stuff
"c-reader", "desttagger", "salestagger", "handlabel", "packagewrap",
// Research Stuff
- "destructive_analyzer", "experimentor", "rdconsole", "bepis", "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
"sec_rshot", "sec_beanbag_slug", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "buckshot_shell", "beanbag_slug", "rubber_shot",
//Handgun Ammo (Security)
- "commanderammo", "stechkinammo", "candorammo", "m9cammo", "c9mm", "c10mm", "c45", "c556mmHITP", "rubbershot9mm", "rubbershot10mm", "rubbershot45", "rubbershot556mmHITP",
+ "commanderammo", "ringneckammo", "candorammo", "m9cammo", "c9mm", "c10mm", "c45", "c556mmHITP", "rubbershot9mm", "rubbershot10mm", "rubbershot45", "rubbershot556mmHITP",
// Construction Materials
"rglass", "plasteel", "plastitanium", "plasmaglass", "plasmareinforcedglass", "titaniumglass", "plastitaniumglass",
// You People Are Animals
@@ -53,7 +53,7 @@
id = "mech_tools"
starting_node = TRUE
display_name = "Basic Exosuit Equipment"
- description = "Various tools fit for basic mech units"
+ description = "Various tools fit for basic exosuit units"
design_ids = list("mech_drill", "mech_mscanner", "mech_extinguisher", "mech_cable_layer") //WS Edit - Reverted Smartwire
/datum/techweb_node/basic_tools
@@ -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
@@ -193,7 +193,7 @@
display_name = "Advanced Engineering"
description = "Pushing the boundaries of physics, one chainsaw-fist at a time."
prereq_ids = list("engineering", "emp_basic")
- design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "rcd_loaded", "rpd_loaded", "sheetifier")
+ design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "rcd_loaded", "rpd_loaded")
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
@@ -295,7 +295,7 @@
display_name = "Basic Plasma Research"
description = "Research into the mysterious and dangerous substance, plasma."
prereq_ids = list("engineering")
- design_ids = list("mech_generator")
+ design_ids = list("mech_generator", "plasmacutter")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -304,7 +304,7 @@
display_name = "Advanced Plasma Research"
description = "Research on how to fully exploit the power of plasma."
prereq_ids = list("basic_plasma")
- design_ids = list("mech_plasma_cutter")
+ design_ids = list("mech_plasma_cutter","plasmacutter_adv")
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
@@ -550,7 +548,7 @@
display_name = "Mining Technology"
description = "Better than Efficiency V."
prereq_ids = list("engineering", "basic_plasma")
- design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "ore_redemption", "mining_equipment_vendor", "cargoexpress", "plasmacutter", "mecha_kineticgun", "weatherradio")//e a r l y g a m e)
+ design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "ore_redemption", "mining_equipment_vendor", "cargoexpress", "mecha_kineticgun", "weatherradio")//e a r l y g a m e)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -559,7 +557,7 @@
display_name = "Advanced Mining Technology"
description = "Efficiency Level 127" //dumb mc references
prereq_ids = list("basic_mining", "adv_engi", "adv_power", "adv_plasma")
- design_ids = list("drill_diamond", "jackhammer", "hypermod", "plasmacutter_adv")
+ design_ids = list("drill_diamond", "jackhammer", "hypermod")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
// WS Edit Start - Yeet The BSM
@@ -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
@@ -721,7 +719,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
@@ -814,7 +812,7 @@
/datum/techweb_node/adv_mecha_tools
id = "adv_mecha_tools"
display_name = "Advanced Exosuit Equipment"
- description = "Tools for high level mech suits"
+ description = "Tools for high level exosuits"
prereq_ids = list("adv_mecha")
design_ids = list("mech_rcd", "mech_thrusters")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -823,7 +821,7 @@
/datum/techweb_node/med_mech_tools
id = "med_mech_tools"
display_name = "Medical Exosuit Equipment"
- description = "Tools for high level mech suits"
+ description = "Tools for high level exosuits"
prereq_ids = list("adv_biotech")
design_ids = list("mech_sleeper", "mech_syringe_gun", "mech_medi_beam")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -832,7 +830,7 @@
/datum/techweb_node/mech_modules
id = "adv_mecha_modules"
display_name = "Simple Exosuit Modules"
- description = "An advanced piece of mech weaponry"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("adv_mecha", "bluespace_power")
design_ids = list("mech_energy_relay", "mech_ccw_armor", "mech_proj_armor", "mech_generator_nuclear")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -840,8 +838,8 @@
/datum/techweb_node/mech_scattershot
id = "mecha_tools"
- display_name = "Exosuit Weapon (LBX AC 10 \"Scattershot\")"
- description = "An advanced piece of mech weaponry"
+ display_name = "Exosuit Weapon (LBX-10 \"Scattershot\")"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("ballistic_weapons")
design_ids = list("mech_scattershot", "mech_scattershot_ammo")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -849,8 +847,8 @@
/datum/techweb_node/mech_carbine
id = "mech_carbine"
- display_name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)"
- description = "An advanced piece of mech weaponry"
+ display_name = "Exosuit Weapon (FNX-99 \"Phoenix\" Carbine)"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("ballistic_weapons")
design_ids = list("mech_carbine", "mech_carbine_ammo")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -859,7 +857,7 @@
/datum/techweb_node/mech_ion
id = "mmech_ion"
display_name = "Exosuit Weapon (MKIV Ion Heavy Cannon)"
- description = "An advanced piece of mech weaponry"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("electronic_weapons", "emp_adv")
design_ids = list("mech_ion")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -868,7 +866,7 @@
/datum/techweb_node/mech_tesla
id = "mech_tesla"
display_name = "Exosuit Weapon (MKI Tesla Cannon)"
- description = "An advanced piece of mech weaponry"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("electronic_weapons", "adv_power")
design_ids = list("mech_tesla")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -877,7 +875,7 @@
/datum/techweb_node/mech_laser
id = "mech_laser"
display_name = "Exosuit Weapon (CH-PS \"Immolator\" Laser)"
- description = "A basic piece of mech weaponry"
+ description = "A basic piece of exosuit weaponry"
prereq_ids = list("beam_weapons")
design_ids = list("mech_laser")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -886,7 +884,7 @@
/datum/techweb_node/mech_laser_heavy
id = "mech_laser_heavy"
display_name = "Exosuit Weapon (CH-LC \"Solaris\" Laser Cannon)"
- description = "An advanced piece of mech weaponry"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("adv_beam_weapons")
design_ids = list("mech_laser_heavy")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -895,7 +893,7 @@
/datum/techweb_node/mech_disabler
id = "mech_disabler"
display_name = "Exosuit Weapon (CH-DS \"Peacemaker\" Mounted Disabler)"
- description = "A basic piece of mech weaponry"
+ description = "A basic piece of exosuit weaponry"
prereq_ids = list("beam_weapons")
design_ids = list("mech_disabler")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -904,7 +902,7 @@
/datum/techweb_node/mech_grenade_launcher
id = "mech_grenade_launcher"
display_name = "Exosuit Weapon (SGL-6 Grenade Launcher)"
- description = "An advanced piece of mech weaponry"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("explosive_weapons")
design_ids = list("mech_grenade_launcher", "mech_grenade_launcher_ammo")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -913,7 +911,7 @@
/datum/techweb_node/mech_missile_rack
id = "mech_missile_rack"
display_name = "Exosuit Weapon (BRM-6 Missile Rack)"
- description = "An advanced piece of mech weaponry"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("explosive_weapons")
design_ids = list("mech_missile_rack", "mech_missile_rack_ammo")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -922,7 +920,7 @@
/datum/techweb_node/clusterbang_launcher
id = "clusterbang_launcher"
display_name = "Exosuit Module (SOB-3 Clusterbang Launcher)"
- description = "An advanced piece of mech weaponry"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("explosive_weapons")
design_ids = list("clusterbang_launcher", "clusterbang_launcher_ammo")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -931,7 +929,7 @@
/datum/techweb_node/mech_teleporter
id = "mech_teleporter"
display_name = "Exosuit Module (Teleporter Module)"
- description = "An advanced piece of mech Equipment"
+ description = "An advanced piece of exosuit equipment"
prereq_ids = list("micro_bluespace")
design_ids = list("mech_teleporter")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -940,7 +938,7 @@
/datum/techweb_node/mech_wormhole_gen
id = "mech_wormhole_gen"
display_name = "Exosuit Module (Localized Wormhole Generator)"
- description = "An advanced piece of mech weaponry"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("bluespace_travel")
design_ids = list("mech_wormhole_gen")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -948,8 +946,8 @@
/datum/techweb_node/mech_lmg
id = "mech_lmg"
- display_name = "Exosuit Weapon (\"Ultra AC 2\" LMG)"
- description = "An advanced piece of mech weaponry"
+ display_name = "Exosuit Weapon (\"UMG-2\" LMG)"
+ description = "An advanced piece of exosuit weaponry"
prereq_ids = list("ballistic_weapons")
design_ids = list("mech_lmg", "mech_lmg_ammo")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -966,7 +964,7 @@
/////////////////////////Nanites/////////////////////////
-//Disabled pending nanite rework --Apogee-dev
+//Disabled FOREVER
/*
/datum/techweb_node/nanite_base
id = "nanite_base"
@@ -1159,110 +1157,6 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
export_price = 5000
-////////////////////////B.E.P.I.S. Locked Techs////////////////////////
-/datum/techweb_node/light_apps
- id = "light_apps"
- display_name = "Illumination Applications"
- description = "Applications of lighting and vision technology not originally thought to be commercially viable."
- prereq_ids = list("base")
- design_ids = list("bright_helmet", "rld_mini")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/rolling_table
- id = "rolling_table"
- display_name = "Advanced Wheel Applications"
- description = "Adding wheels to things can lead to extremely beneficial outcomes."
- prereq_ids = list("base")
- design_ids = list("rolling_table")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/Mauna_Mug
- id = "mauna_mug"
- display_name = "Mauna Mug"
- description = "A bored scientist was thinking to himself for very long...and then realized his coffee got cold! He made this invention to solve this extreme problem."
- prereq_ids = list("base")
- design_ids = list("mauna_mug")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/spec_eng
- id = "spec_eng"
- display_name = "Specialized Engineering"
- description = "Conventional wisdom has deemed these engineering products 'technically' safe, but far too dangerous to traditionally condone."
- prereq_ids = list("base")
- design_ids = list("lava_rods", "eng_gloves")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/aus_security
- id = "aus_security"
- display_name = "Australicus Security Protocols"
- description = "It is said that security in the Australicus sector is tight, so we took some pointers from their equipment. Thankfully, our sector lacks any signs of these, 'dropbears'."
- prereq_ids = list("base")
- design_ids = list("stun_boomerang")
-
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/interrogation
- id = "interrogation"
- display_name = "Enhanced Interrogation Technology"
- description = "By cross-referencing several declassified documents from past dictatorial regimes, we were able to develop an incredibly effective interrogation device. \
- Ethical concerns about loss of free will do not apply to criminals, according to galactic law."
- prereq_ids = list("base")
- design_ids = list("hypnochair")
-
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3500)
- export_price = 3500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/sticky_advanced
- id = "sticky_advanced"
- display_name = "Advanced Tapenology"
- description = "The absolute pinnacle of engineering!"
- design_ids = list("electric_tape", "super_tape")
-
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/tackle_advanced
- id = "tackle_advanced"
- display_name = "Advanced Grapple Technology"
- description = "Nanotrasen would like to remind its researching staff that it is never acceptable to \"glomp\" your coworkers, and further \"scientific trials\" on the subject \
- will no longer be accepted in its academic journals."
- design_ids = list("tackle_dolphin", "tackle_rocket")
-
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/fishing
- id = "fishing"
- display_name = "Fishing Technology"
- description = "Cutting edge fishing advancements."
- prereq_ids = list("base")
- design_ids = list("fishing_rod_tech")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
- export_price = 2500
- hidden = TRUE
- experimental = TRUE
-
//Helpers for debugging/balancing the techweb in its entirety!
/proc/total_techweb_exports()
var/list/datum/techweb_node/processing = list()
diff --git a/code/modules/research/xenobiology/crossbreeding/__corecross.dm b/code/modules/research/xenobiology/crossbreeding/__corecross.dm
deleted file mode 100644
index e2cfe4b4087..00000000000
--- 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 cab30f0219e..00000000000
--- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm
+++ /dev/null
@@ -1,142 +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/glasses/prism_glasses
- name = "prism glasses"
- desc = "The lenses seem to glow slightly, and reflect light into dazzling colors."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "prismglasses"
- actions_types = list(/datum/action/item_action/change_prism_colour, /datum/action/item_action/place_light_prism)
- var/glasses_color = "#FFFFFF"
-
-/obj/item/clothing/glasses/prism_glasses/item_action_slot_check(slot)
- if(slot == ITEM_SLOT_EYES)
- return TRUE
-
-/obj/structure/light_prism
- name = "light prism"
- desc = "A shining crystal of semi-solid light. Looks fragile."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "lightprism"
- density = FALSE
- anchored = TRUE
- max_integrity = 10
-
-/obj/structure/light_prism/Initialize(mapload, newcolor)
- . = ..()
- color = newcolor
- set_light_color(newcolor)
- set_light(5)
-
-/obj/structure/light_prism/attack_hand(mob/user)
- to_chat(user, "You dispel [src].")
- qdel(src)
-
-/datum/action/item_action/change_prism_colour
- name = "Adjust Prismatic Lens"
- icon_icon = 'icons/obj/slimecrossing.dmi'
- button_icon_state = "prismcolor"
-
-/datum/action/item_action/change_prism_colour/Trigger()
- if(!IsAvailable())
- return
- var/obj/item/clothing/glasses/prism_glasses/glasses = target
- var/new_color = input(owner, "Choose the lens color:", "Color change",glasses.glasses_color) as color|null
- if(!new_color)
- return
- glasses.glasses_color = new_color
-
-/datum/action/item_action/place_light_prism
- name = "Fabricate Light Prism"
- icon_icon = 'icons/obj/slimecrossing.dmi'
- button_icon_state = "lightprism"
-
-/datum/action/item_action/place_light_prism/Trigger()
- if(!IsAvailable())
- return
- var/obj/item/clothing/glasses/prism_glasses/glasses = target
- if(locate(/obj/structure/light_prism) in get_turf(owner))
- to_chat(owner, "There isn't enough ambient energy to fabricate another light prism here.")
- return
- if(istype(glasses))
- if(!glasses.glasses_color)
- to_chat(owner, "The lens is oddly opaque...")
- return
- to_chat(owner, "You channel nearby light into a glowing, ethereal prism.")
- new /obj/structure/light_prism(get_turf(owner), glasses.glasses_color)
-
-/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 2af2ecf6468..00000000000
--- 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 0d155f2f90f..00000000000
--- 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 fc9d9ef06c6..00000000000
--- 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 651eb2fece1..00000000000
--- 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 ac663059d0c..00000000000
--- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm
+++ /dev/null
@@ -1,67 +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")
-
-//Rainbow knife - Burning Rainbow
-/obj/item/kitchen/knife/rainbowknife
- name = "rainbow knife"
- desc = "A strange, transparent knife which constantly shifts color. It hums slightly when moved."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "rainbowknife"
- item_state = "rainbowknife"
- force = 18
- throwforce = 15
- damtype = BRUTE
-
-/obj/item/kitchen/knife/rainbowknife/afterattack(atom/O, mob/user, proximity)
- if(proximity && istype(O, /mob/living))
- damtype = pick(BRUTE, BURN, TOX, OXY)
- switch(damtype)
- if(BRUTE)
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("slashed","sliced","cut")
- if(BURN)
- hitsound = 'sound/weapons/sear.ogg'
- attack_verb = list("burned","singed","heated")
- if(TOX)
- hitsound = 'sound/weapons/pierce.ogg'
- attack_verb = list("poisoned","dosed","toxified")
- if(OXY)
- hitsound = 'sound/effects/space_wind.ogg'
- attack_verb = list("suffocated","winded","vacuumed")
- return ..()
-
-//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 e9fd98232e2..00000000000
--- a/code/modules/research/xenobiology/crossbreeding/burning.dm
+++ /dev/null
@@ -1,315 +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))
- ..()
-
-/obj/item/slimecross/burning/rainbow
- colour = "rainbow"
- effect_desc = "Creates the Rainbow Knife, a kitchen knife that deals random types of damage."
-
-/obj/item/slimecross/burning/rainbow/do_effect(mob/user)
- user.visible_message("[src] flattens into a glowing rainbow blade.")
- new /obj/item/kitchen/knife/rainbowknife(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 25aa7930291..00000000000
--- 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/reagent_containers/food/snacks/store/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 9fe7857c073..00000000000
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ /dev/null
@@ -1,302 +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)
- user.visible_message("[src] crystallizes into a pair of spectacles!")
- new /obj/item/clothing/glasses/prism_glasses(get_turf(user))
- ..()
-
-/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 f2a162af3aa..00000000000
--- 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 da9387883f0..00000000000
--- 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 6b58a7aa0c9..00000000000
--- 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 9cfc4542d52..00000000000
--- 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 4a094744f7f..00000000000
--- 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 75a1201d924..00000000000
--- 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 f51c5a27117..00000000000
--- 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 814083c3bb5..00000000000
--- 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 eee23636f78..00000000000
--- 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 81ac7db98b0..00000000000
--- 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 c907f11c1cf..00000000000
--- 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/icemoonruin_code/tesla_lab.dm b/code/modules/ruins/icemoonruin_code/tesla_lab.dm
new file mode 100644
index 00000000000..00f60441862
--- /dev/null
+++ b/code/modules/ruins/icemoonruin_code/tesla_lab.dm
@@ -0,0 +1,114 @@
+/obj/item/tape/random/preset/tesla_lab/one/Initialize()
+ . = ..()
+ storedinfo = list(
+ "\[00:00\] Recording started.",
+ "\[00:02\] [span_name("scared human woman")] whispers \"My n-name is Alyssa Salata- Ident 4070591. CLIP Minutemen-\"",
+ "\[00:08\] [span_name("scared human woman")] whispers \"T-The base I was assigned to has come under attack from the Frontiersmen.\"",
+ "\[00:12\] [span_name("scared human woman")] whispers \"From- what I heard on the radio before it turned to screaming-.\"",
+ "\[00:15\] [span_name("scared human woman")] whispers \"They landed by pretending to be one of our supply shuttles - and when the bays were open...\"",
+ "\[00:20\] [span_name("scared human woman")] whispers \"It was just a hail of gunfire and flames-\"",
+ "\[00:24\] [span_name("scared human woman")] whispers \"I ran- I'm- sorry but I couldn't fight |that|-\"",
+ "\[00:28\] [span_name("scared human woman")] whispers \"I'm in the - panic hole in the armory now.\"",
+ "\[00:33\] [span_name("scared human woman")] whispers \"I have a CM-23 and some pills that the doc had. But. There's not enough food back here.\"",
+ "\[00:37\] [span_name("scared human woman")] whispers \"...I don't want to die but I think this is it for me...\"",
+ "\[00:43\] [span_name("scared human woman")] whispers \"There was way too many of them and there's - not going to be help coming fast enough.\"",
+ "\[00:50\] [span_name("scared human woman")] gulps something down, a stressed sigh coming from her as she does.",
+ "\[00:55\] [span_name("scared human woman")] whimpers \"I'll- see if they leave- I- I'll make it-.\"",
+ )
+ timestamp = list(
+ 0,
+ 2,
+ 8,
+ 12,
+ 15,
+ 20,
+ 24,
+ 28,
+ 33,
+ 37,
+ 43,
+ 50,
+ 55
+ )
+
+/obj/item/tape/random/preset/tesla_lab/two/Initialize()
+ . = ..()
+ storedinfo = list(
+ "\[00:00\] Recording started.",
+ "\[00:03\] [span_name("scared human woman")] whispers \"My n-name is Alyssa Salata- Ident 4070591. CLIP Minutemen-\"",
+ "\[00:06\] [span_name("scared human woman")] whispers \"Its been - 4 hours since my last log entry-.\"",
+ "\[00:10\] [span_name("scared human woman")] whispers \"The radio has been dead for 3. At least.\"",
+ "\[00:15\] [span_name("scared human woman")] whispers \"The last thing I heard was someone else holing up in - Lab one-\"",
+ "\[00:20\] [span_name("scared human woman")] whispers \"...That's on the other side of the corridor. I don't think I'd- make it-\"",
+ "\[00:23\] [span_name("scared human woman")] whispers \"The voices I keep hearing aren't |right| either. It's. They're. Barely human-\"",
+ "\[00:27\] [span_name("scared human woman")] whispers \"...I know they're outside...\"",
+ "\[00:30\] [span_name("scared human woman")] chokes \"I- miss my mom-.\"",
+ "\[00:33\] [span_name("scared human woman")] chokes out another whisper \"-I want to go home.....\"",
+ )
+
+ timestamp = list(
+ 0,
+ 3,
+ 6,
+ 10,
+ 15,
+ 20,
+ 23,
+ 27,
+ 30,
+ 33
+ )
+
+#define CHLORINATED_ATMOS "o2=22;n2=82;cl2=24;TEMP=293.15"
+
+/turf/open/floor/plasteel/dark/tesla_lab
+ initial_gas_mix = CHLORINATED_ATMOS
+
+/obj/item/desynchronizer/tvstatic
+ name = "\improper static synchronizer"
+ desc = "An experimental device built around the hissing core of an anomaly. It radiates fear. There is a button on the front that says 'ENGAGE', surrounded by scrawled warnings."
+ desync_effect = /obj/effect/temp_visual/phase_out
+ resync_effect = /obj/effect/temp_visual/phase_in
+ max_duration = 150
+ duration = 60
+
+/obj/item/desynchronizer/tvstatic/resync()
+ . = ..()
+ var/braim_bamage = (world.time - last_use) * 0.25
+ playsound(src, 'sound/effects/glassbr1.ogg', 75)
+ for(var/mob/living/carbon/human/looking in range(1, src.loc))
+ if(HAS_TRAIT(looking, TRAIT_MINDSHIELD) || looking.stat == DEAD || looking.research_scanner)
+ continue
+ looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, braim_bamage, 200)
+
+/obj/effect/temp_visual/phase_in
+ name = "anomalous field"
+ icon_state = "phasein"
+ layer = 4
+ duration = 5
+
+/obj/effect/temp_visual/phase_out
+ name = "anomalous field"
+ icon_state = "phaseout"
+ layer = 4
+ duration = 5
+
+/obj/effect/mob_spawn/human/corpse/clip
+ name = "CLIP corpse spawner"
+
+/obj/effect/mob_spawn/human/corpse/clip/researcher
+ name = "CLIP Researcher Spawner"
+ outfit = /datum/outfit/job/clip/scientist
+
+/obj/effect/mob_spawn/human/corpse/clip/vc
+ name = "CLIP VC Spawner"
+ outfit = /datum/outfit/job/clip/minutemen/vehicle_pilot
+
+/obj/effect/mob_spawn/human/corpse/clip/minuteman
+ name = "CLIP Minuteman Spawner"
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed
+
+/obj/effect/mob_spawn/human/corpse/clip/minuteman/forcefem
+ name = "CLIP Minuteman Spawner"
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed
+ mob_gender = FEMALE
diff --git a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm
deleted file mode 100644
index 7a26946f0dd..00000000000
--- a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm
+++ /dev/null
@@ -1,258 +0,0 @@
-//******Decoration objects
-//***Bone statues and giant skeleton parts.
-/obj/structure/statue/bone
- anchored = TRUE
- max_integrity = 120
- material_drop_type = /obj/item/stack/sheet/bone
- impressiveness = 18 // Carved from the bones of a massive creature, it's going to be a specticle to say the least
- layer = ABOVE_ALL_MOB_LAYER
-
-/obj/structure/statue/bone/rib
- name = "collosal rib"
- desc = "It's staggering to think that something this big could have lived, let alone died."
- oreAmount = 4
- icon = 'icons/obj/statuelarge.dmi'
- icon_state = "rib"
-
-/obj/structure/statue/bone/skull
- name = "collosal skull"
- desc = "The gaping maw of a dead, titanic monster."
- oreAmount = 12
- icon = 'icons/obj/statuelarge.dmi'
- icon_state = "skull"
-
-/obj/structure/statue/bone/skull/half
- desc = "The gaping maw of a dead, titanic monster. This one is cracked in half."
- oreAmount = 6
- icon = 'icons/obj/statuelarge.dmi'
- icon_state = "skull-half"
-
-//***Wasteland floor and rock turfs here.
-/turf/open/floor/plating/asteroid/basalt/wasteland //Like a more fun version of living in Arizona.
- name = "cracked earth"
- icon = 'icons/turf/floors.dmi'
- icon_state = "wasteland"
- base_icon_state = "wasteland"
- baseturfs = /turf/open/floor/plating/asteroid/basalt/wasteland
- digResult = /obj/item/stack/ore/glass/basalt
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
- slowdown = 0.5
- floor_variance = 30
- max_icon_states = 6
-
-/turf/closed/mineral/strong/wasteland
- name = "ancient dry rock"
- color = "#B5651D"
- environment_type = "wasteland"
- turf_type = /turf/open/floor/plating/asteroid/basalt/wasteland
- baseturfs = /turf/open/floor/plating/asteroid/basalt/wasteland
- smooth_icon = 'icons/turf/walls/rock_wall.dmi'
- base_icon_state = "rock_wall"
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
-
-/turf/closed/mineral/strong/wasteland/drop_ores()
- if(prob(10))
- new /obj/item/stack/ore/iron(src, 1)
- new /obj/item/stack/ore/glass(src, 1)
- new /obj/effect/decal/remains/human/grave(src, 1)
- else
- new /obj/item/stack/sheet/bone(src, 1)
-
-//***Oil well puddles.
-/obj/structure/sink/oil_well //You're not going to enjoy bathing in this...
- name = "oil well"
- desc = "A bubbling pool of oil.This would probably be valuable, had bluespace technology not destroyed the need for fossil fuels 200 years ago."
- icon = 'icons/obj/watercloset.dmi'
- icon_state = "puddle-oil"
- dispensedreagent = /datum/reagent/fuel/oil
-
-/obj/structure/sink/oil_well/Initialize()
- .=..()
- create_reagents(20)
- reagents.add_reagent(dispensedreagent, 20)
-
-/obj/structure/sink/oil_well/attack_hand(mob/M)
- flick("puddle-oil-splash",src)
- reagents.expose(M, TOUCH, 20) //Covers target in 20u of oil.
- to_chat(M, "You touch the pool of oil, only to get oil all over yourself. It would be wise to wash this off with water.")
-
-/obj/structure/sink/oil_well/attackby(obj/item/O, mob/user, params)
- flick("puddle-oil-splash",src)
- if(O.tool_behaviour == TOOL_SHOVEL && !(flags_1&NODECONSTRUCT_1)) //attempt to deconstruct the puddle with a shovel
- to_chat(user, "You fill in the oil well with soil.")
- O.play_tool_sound(src)
- deconstruct()
- return 1
- if(istype(O, /obj/item/reagent_containers)) //Refilling bottles with oil
- var/obj/item/reagent_containers/RG = O
- if(RG.is_refillable())
- if(!RG.reagents.holder_full())
- RG.reagents.add_reagent(dispensedreagent, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
- to_chat(user, "You fill [RG] from [src].")
- return TRUE
- to_chat(user, "\The [RG] is full.")
- return FALSE
- if(user.a_intent != INTENT_HARM)
- to_chat(user, "You won't have any luck getting \the [O] out if you drop it in the oil.")
- return 1
- else
- return ..()
-
-/obj/structure/sink/oil_well/drop_materials()
- new /obj/effect/decal/cleanable/oil(loc)
-
-//***Grave mounds.
-/obj/structure/closet/crate/grave
- name = "burial mound"
- desc = "A marked patch of soil, adorned with a wooden cross"
- icon_state = "grave"
- dense_when_open = TRUE
- material_drop = /obj/item/stack/ore/glass/basalt
- material_drop_amount = 5
- opened = TRUE
- anchorable = FALSE
- anchored = TRUE
- locked = TRUE
- breakout_time = 900
- cutting_tool = /obj/item/shovel
- var/lead_tomb = FALSE
- var/first_open = FALSE
-
-/obj/structure/closet/crate/grave/attackby(obj/item/W, mob/user, params)
- .=..()
- if(istype(W, /obj/item/screwdriver))
- if(!user.is_literate())
- to_chat(user, "You scratch illegibly on [src]!")
- return
- var/t = stripped_input(user, "What would you like the inscription to be?", name, null, 53)
- if(user.get_active_held_item() != W)
- return
- if(!user.canUseTopic(src, BE_CLOSE))
- return
- if(t)
- desc = "[t]"
- return
-
-/obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S, force = FALSE)
- if(!opened)
- to_chat(user, "The ground here is too hard to dig up with your bare hands. You'll need a shovel.")
- else
- to_chat(user, "The grave has already been dug up.")
-
-/obj/structure/closet/crate/grave/tool_interact(obj/item/S, mob/living/carbon/user)
- if(user.a_intent == INTENT_HELP) //checks to attempt to dig the grave, must be done on help intent only.
- if(!opened)
- if(istype(S,cutting_tool) && S.tool_behaviour == TOOL_SHOVEL)
- to_chat(user, "You start start to dig open \the [src] with \the [S]...")
- if (do_after(user,20, target = src))
- opened = TRUE
- locked = TRUE
- dump_contents()
- update_appearance()
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing)
- if(lead_tomb == TRUE && first_open == TRUE)
- user.gain_trauma(/datum/brain_trauma/magic/stalker)
- to_chat(user, "Oh no, no no no, THEY'RE EVERYWHERE! EVERY ONE OF THEM IS EVERYWHERE!")
- first_open = FALSE
- return 1
- return 1
- else
- to_chat(user, "You can't dig up a grave with \the [S.name].")
- return 1
- else
- to_chat(user, "The grave has already been dug up.")
- return 1
-
- else if((user.a_intent != INTENT_HELP) && opened) //checks to attempt to remove the grave entirely.
- if(istype(S,cutting_tool) && S.tool_behaviour == TOOL_SHOVEL)
- to_chat(user, "You start to remove \the [src] with \the [S].")
- if (do_after(user,15, target = src))
- to_chat(user, "You remove \the [src] completely.")
- SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing)
- deconstruct(TRUE)
- return 1
- return
-
-/obj/structure/closet/crate/grave/bust_open()
- ..()
- opened = TRUE
- update_appearance()
- dump_contents()
- return
-
-/obj/structure/closet/crate/grave/stone
- name = "burial mound"
- desc = "A marked patch of soil, adorned with a sandstone slab"
- icon_state = "grave_lead"
-
-/obj/structure/closet/crate/grave/loot
- name = "burial mound"
- desc = "A marked patch of soil, showing signs of a burial long ago. You wouldn't disturb a grave... right?"
- opened = FALSE
-
-/obj/structure/closet/crate/grave/loot/PopulateContents() //GRAVEROBBING IS NOW A FEATURE
- ..()
- new /obj/effect/decal/remains/human/grave(src)
- switch(rand(1,7))
- if(1)
- new /obj/item/coin/gold(src)
- new /obj/item/storage/wallet(src)
- if(2)
- new /obj/item/clothing/glasses/meson(src)
- if(3)
- new /obj/item/coin/silver(src)
- new /obj/item/shovel/spade(src)
- if(4)
- new /obj/item/storage/book/bible/booze(src)
- if(5)
- new /obj/item/clothing/neck/stethoscope(src)
- new /obj/item/scalpel(src)
- new /obj/item/hemostat(src)
-
- if(6)
- new /obj/item/reagent_containers/glass/beaker(src)
- new /obj/item/clothing/glasses/science(src)
- if(7)
- new /obj/item/clothing/glasses/sunglasses(src)
- new /obj/item/clothing/mask/cigarette/rollie(src)
-
-/obj/structure/closet/crate/grave/loot/lead_researcher
- name = "ominous burial mound"
- desc = "Even in a place filled to the brim with graves, this one shows a level of preperation and planning that fills you with dread."
- icon_state = "grave_lead"
- lead_tomb = TRUE
- first_open = TRUE
-
-/obj/structure/closet/crate/grave/loot/lead_researcher/PopulateContents() //ADVANCED GRAVEROBBING
- ..()
- new /obj/effect/decal/cleanable/blood/gibs/old(src)
-
-/obj/effect/decal/remains/human/grave
- turf_loc_check = FALSE
-
-//***Fluff items for lore/intrigue
-/obj/item/paper/crumpled/muddy/fluff/elephant_graveyard
- name = "posted warning"
- desc = "It seems to be smudged with mud and... oil?"
- default_raw_text = "TO WHOM IT MAY CONCERN
This area is property of the Nanotrasen Mining Division.
Trespassing in this area is illegal, highly dangerous, and subject to several NDAs.
Please turn back now, under intergalactic law section 48-R."
-
-/obj/item/paper/crumpled/muddy/fluff/elephant_graveyard/rnd_notes
- name = "Research Findings: Day 26"
- desc = "Huh, this one page looks like it was torn out of a full book. How odd."
- icon_state = "docs_part"
- default_raw_text = "Researcher name: B--*--* J--*s.
Detailed findings:Today the camp site's cond-tion has wor--ene*. The ashst--ms keep blocking us off from le-ving the sit* for m-re supplies, and it's lo-king like we're out of pl*sma to p-wer the ge-erat*r. Can't rea-*y study c-*bon *ating with no li--ts, ya know? Da-*y's been going -*f again and ag-*n a-*ut h*w the company's left us to *ie here, but I j-s* keep tell-ng him to stop che*-in* out these damn graves. We m-y b* archaeologists, but -e sho*ld have t-e dec-**cy to know these grav-s are *-l NEW.
The rest of the page is just semantics about carbon dating methods."
-
-/obj/item/paper/crumpled/muddy/fluff/elephant_graveyard/mutiny
- name = "hastily scribbled note"
- desc = "Seems like someone was in a hurry."
- default_raw_text = "Alright, we all know that stuck up son a bitch is just doing this to keep us satisifed. Who the hell does he think he is, taking extra rations? We're OUT OF FOOD, CARL. Tomorrow at noon, we're going to try and take the ship by force. He HAS to be lying about the engine cooling down. He HAS TO BE. I'm tellin ya, with this implant I lifted off that last supply ship, I got the smarts to get us offa this shithole. Keep your knife handy carl."
-
-/obj/item/paper/fluff/ruins/elephant_graveyard/hypothesis
- name = "research document"
- desc = "Standard Nanotrasen typeface for important research documents."
- default_raw_text = "Day 9: Tenative Conclusions
While the area appears to be of significant cultural importance to the lizard race, outside of some sparce contact with native wildlife, we're yet to find any exact reasoning for the nature of this phenomenon. It seems that organic life is communally drawn to this planet as though it functions as a final resting place for intelligent life. As per company guidelines, this site shall be given the following classification: 'LZ-0271 - Elephant Graveyard'
Compiled list of Artifact findings (Currently Sent Offsite) Cultist Blade Fragments: x8 Brass Multiplicative Ore Sample: x105 Syndicate Revolutionary Leader Implant (Broken) x1 Extinct Cortical Borer Tissue Sample x1 Space Carp Fossil x3"
-
-/obj/item/paper/fluff/ruins/elephant_graveyard/final_message
- name = "important looking Note"
- desc = "This note is well written, and seems to have been put here so you'd find it."
- default_raw_text = "If you find this... you don't need to know who I am.
You need to leave this place. I dunno what shit they did to me out here, but I don't think I'm going to be making it out of here.
This place... it wears down your psyche. The other researchers out here laughed it off but... They were the first to go.
One by one they started turning on each other. The more they found out, the more they started fighting and arguing... As I speak now, I had to... I wound up having to put most of my men down. I know what I had to do, and I know there's no way left for me to live with myself. If anyone ever finds this, just don't touch the graves.
DO NOT. TOUCH. THE GRAVES. Don't be a dumbass, like we all were."
diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
index b231ea90237..8c2496ce05a 100644
--- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
+++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
@@ -40,7 +40,6 @@
/obj/structure/lavaland/ash_walker/deconstruct(disassembled)
new /obj/item/assembly/signaler/anomaly (get_step(loc, pick(GLOB.alldirs)))
- new /obj/effect/collapse(loc)
return ..()
/obj/structure/lavaland/ash_walker/process()
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index 7b5bd27a8ad..0747fb746dd 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -102,34 +102,3 @@
var/turf/open/chasm/C = T
C.set_target(dest)
C.drop(user)
-
-//can't be bothered to do sloth right now, will make later
-
-/obj/item/kitchen/knife/envy //Envy's knife: Found in the Envy ruin. Attackers take on the appearance of whoever they strike.
- name = "envy's knife"
- desc = "Their success will be yours."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "render"
- item_state = "knife"
- lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
- force = 18
- throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
- hitsound = 'sound/weapons/bladeslice.ogg'
-
-/obj/item/kitchen/knife/envy/afterattack(atom/movable/AM, mob/living/carbon/human/user, proximity)
- . = ..()
- if(!proximity)
- return
- if(!istype(user))
- return
- if(ishuman(AM))
- var/mob/living/carbon/human/H = AM
- if(user.real_name != H.dna.real_name)
- user.real_name = H.dna.real_name
- H.dna.transfer_identity(user, transfer_SE=1)
- user.updateappearance(mutcolor_update=1)
- user.domutcheck()
- user.visible_message("[user]'s appearance shifts into [H]'s!", \
- "[H.p_they(TRUE)] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't.")
diff --git a/code/modules/ruins/rockplanet_ruin_code.dm b/code/modules/ruins/rockplanet_ruin_code.dm
index 57a6d6fd465..5eea45c24c6 100644
--- a/code/modules/ruins/rockplanet_ruin_code.dm
+++ b/code/modules/ruins/rockplanet_ruin_code.dm
@@ -100,7 +100,7 @@
/obj/item/strange_crystal/attackby(obj/item/item, mob/user, params)
. = ..()
- if(!istype(item, /obj/item/kitchen/knife))
+ if(!istype(item, /obj/item/melee/knife))
return
playsound(src, 'sound/effects/glassbr1.ogg', 50, TRUE, -1)
to_chat(user, "You start breaking [src] up into shards...")
@@ -112,3 +112,8 @@
if(give_to_user)
user.put_in_hands(result)
to_chat(user, "You finish breaking [src]")
+
+/obj/item/paper/crumpled/muddy/fluff/distillery
+ name = "distillery instructions"
+ desc = "A crumpled note soaked in alcohol."
+ default_raw_text = "
Moonshine Instructions
Alright, I know some of y'all ain't literate enough for this, but if I'm ever found dead or missing, read this note. Gotta keep the craft alive.
1. Fill the still with around 5 units of enzyme. We keep the whole supply in the green crate in the storeroom. 2. Grind a cob of corn into bits, and add the mash to the still. 3. Pour an equal amount of sugar into the still, and stir. 4. Now, you'll have to scoop the product out and filter it by hand. We used to have a better still that'd filter the product itself, until last year's incident. This has to do for now. 5. Evaluate your product. Good 'shine is clear like water, and burns blue. If it ain't good, dump it.
PS: If you've got some leftover sugar, mix it into bicaridine. Equal parts sugar, carbon, and oxygen makes a potent salve for your wounds."
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 00000000000..afd34e00a6e
--- /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 00000000000..91caf21e1ed
--- /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/spaceruin_code/bigderelict1.dm b/code/modules/ruins/spaceruin_code/bigderelict1.dm
index 99af3b9efa2..9e2a0957547 100644
--- a/code/modules/ruins/spaceruin_code/bigderelict1.dm
+++ b/code/modules/ruins/spaceruin_code/bigderelict1.dm
@@ -6,13 +6,3 @@
/obj/item/paper/crumpled/ruins/bigderelict1/coward
icon_state = "scrap_bloodied"
default_raw_text = "If anyone finds this, please, don't let my kids know I died a coward.."
-
-/obj/item/disk/design_disk/ammo_1911
- name = "design disk - 1911 magazine"
- desc = "A design disk containing the pattern for the classic 1911's seven round .45ACP magazine."
- illustration = "ammo"
-
-/obj/item/disk/design_disk/ammo_1911/Initialize()
- . = ..()
- var/datum/design/colt_1911_magazine/M = new
- blueprints[1] = M
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 00000000000..5369d0e2f2d
--- /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/emergency.dm b/code/modules/shuttle/emergency.dm
index 0c535f58ae2..756d889f5bc 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -91,7 +91,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/storage/overmap_ship, 28)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/pickaxe/emergency(src)
- new /obj/item/kitchen/knife/hunting(src)
+ new /obj/item/melee/knife/hunting(src)
new /obj/item/survivalcapsule(src)
/obj/item/storage/overmap_ship/fueled/PopulateContents()
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index f4d68520c87..65e89399491 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)
@@ -291,6 +292,7 @@ All ShuttleMove procs go here
/************************************Item move procs************************************/
+
/obj/item/storage/pod/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
// If the pod was launched, the storage will always open. The reserved_level check
@@ -299,6 +301,11 @@ All ShuttleMove procs go here
if (oldT && !is_reserved_level(oldT))
unlocked = TRUE
+/obj/item/gun/lateShuttleMove(turf/oldT, list/movement_force, move_dir)
+ . = ..()
+ if(prob(GUN_NO_SAFETY_MALFUNCTION_CHANCE_MEDIUM))
+ discharge("is thrown around by the force of the take off")
+
/************************************Mob move procs************************************/
/mob/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock, list/obj/docking_port/mobile/towed_shuttles)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 14a7497728a..5b6e6239f6a 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
@@ -321,6 +321,9 @@
///A list of all gravity generators currently linked to the shuttle.
var/list/gravgen_list = list()
+ ///A list of all turrets currently linked to the shuttle.
+ var/list/turret_list = list()
+
///if this shuttle can move docking ports other than the one it is docked at
var/can_move_docking_ports = TRUE
@@ -406,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
@@ -428,6 +431,7 @@
for(var/each in place)
var/atom/atom = each
atom.connect_to_shuttle(src, dock)
+ SEND_SIGNAL(src, COMSIG_SHIP_DONE_CONNECTING, dock)
//this is a hook for custom behaviour. Maybe at some point we could add checks to see if engines are intact
/obj/docking_port/mobile/proc/can_move()
@@ -647,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
@@ -718,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 42888130b54..e41da1eccfa 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -1,19 +1,15 @@
GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/mob/living,
- /obj/structure/blob,
- /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
@@ -30,168 +26,3 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/obj/machinery/camera,
/obj/item/gps
)))
-
-/*
-/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 45d7f96b7df..bc453eecd3d 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,13 +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
- if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult))
- to_chat(H, "You don't feel strong enough without your armor.")
- return FALSE
- if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult))
- 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/conjure.dm b/code/modules/spells/spell_types/conjure.dm
index c47205a2732..d2e3cc957ad 100644
--- a/code/modules/spells/spell_types/conjure.dm
+++ b/code/modules/spells/spell_types/conjure.dm
@@ -55,18 +55,6 @@
range = 3
newVars = list("emagged" = 2, "remote_disabled" = 1,"shoot_sound" = 'sound/weapons/laser.ogg',"projectile" = /obj/projectile/beam/laser, "declare_arrests" = 0,"name" = "Wizard's Justicebot")
-/obj/effect/proc_holder/spell/aoe_turf/conjure/linkWorlds
- name = "Link Worlds"
- desc = "A whole new dimension for you to play with! They won't be happy about it, though."
- invocation = "WTF"
- clothes_req = FALSE
- charge_max = 600
- cooldown_min = 200
- summon_type = list(/obj/structure/spawner/nether)
- summon_amt = 1
- range = 1
- cast_sound = 'sound/weapons/marauder.ogg'
-
/obj/effect/proc_holder/spell/targeted/conjure_item
name = "Summon weapon"
desc = "A generic spell that should not exist. This summons an instance of a specific type of item, or if one already exists, un-summons it. Summons into hand if possible."
@@ -75,7 +63,7 @@
range = -1
clothes_req = FALSE
var/obj/item/item
- var/item_type = /obj/item/banhammer
+ var/item_type = /obj/item
school = "conjuration"
charge_max = 150
cooldown_min = 10
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 61c05c4170f..00000000000
--- 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 421b7f40f11..00000000000
--- a/code/modules/spells/spell_types/devil.dm
+++ /dev/null
@@ -1,258 +0,0 @@
-/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork
- name = "Summon Pitchfork"
- desc = "A devil's weapon of choice. Use this to summon/unsummon your pitchfork."
- invocation_type = "none"
- include_user = TRUE
- range = -1
- clothes_req = FALSE
- item_type = /obj/item/pitchfork/demonic
-
- school = "conjuration"
- charge_max = 150
- cooldown_min = 10
- action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
- action_icon_state = "pitchfork"
- action_background_icon_state = "bg_demon"
-
-/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/greater
- item_type = /obj/item/pitchfork/demonic/greater
-
-/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/ascended
- item_type = /obj/item/pitchfork/demonic/ascended
-
-/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 01ea14b15fa..00000000000
--- 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/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index 5cf7e7e1e50..94f0c8a4fca 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -4,7 +4,7 @@
var/catchphrase = "High Five!"
var/on_use_sound = null
var/obj/effect/proc_holder/spell/targeted/touch/attached_spell
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi'
icon_state = "latexballon"
diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm
index 720670e3fc2..e7d4a1e3988 100644
--- a/code/modules/spells/spell_types/lichdom.dm
+++ b/code/modules/spells/spell_types/lichdom.dm
@@ -67,8 +67,6 @@
H.dropItemToGround(H.w_uniform)
H.dropItemToGround(H.wear_suit)
H.dropItemToGround(H.head)
- H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), ITEM_SLOT_OCLOTHING)
- H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), ITEM_SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), ITEM_SLOT_ICLOTHING)
// you only get one phylactery.
@@ -99,7 +97,7 @@
name = "phylactery of [mind.name]"
active_phylacteries++
- GLOB.poi_list |= src
+ SSpoints_of_interest.make_point_of_interest(src)
START_PROCESSING(SSobj, src)
if(initial(SSticker.mode.round_ends_with_antag_death))
SSticker.mode.round_ends_with_antag_death = FALSE
@@ -107,7 +105,7 @@
/obj/item/phylactery/Destroy(force=FALSE)
STOP_PROCESSING(SSobj, src)
active_phylacteries--
- GLOB.poi_list -= src
+ SSpoints_of_interest.remove_point_of_interest(src)
if(!active_phylacteries)
SSticker.mode.round_ends_with_antag_death = initial(SSticker.mode.round_ends_with_antag_death)
. = ..()
@@ -133,8 +131,6 @@
lich.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(lich), ITEM_SLOT_FEET)
lich.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(lich), ITEM_SLOT_ICLOTHING)
- lich.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(lich), ITEM_SLOT_OCLOTHING)
- lich.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(lich), ITEM_SLOT_HEAD)
lich.real_name = mind.name
mind.transfer_to(lich)
diff --git a/code/modules/spells/spell_types/mime.dm b/code/modules/spells/spell_types/mime.dm
index 0e56c111248..0cfb0ca0444 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 e0ef3566fa0..04a91f09b5e 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 55138a36c36..a5c542c819c 100644
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -9,27 +9,26 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/energy/e_gun,
/obj/item/gun/energy/e_gun/advtaser,
/obj/item/gun/energy/laser,
- /obj/item/gun/ballistic/revolver/syndicate,
+ /obj/item/gun/ballistic/revolver/viper,
/obj/item/gun/ballistic/revolver/detective,
/obj/item/gun/ballistic/automatic/pistol/deagle/camo,
/obj/item/gun/ballistic/automatic/gyropistol,
/obj/item/gun/energy/pulse,
- /obj/item/gun/ballistic/automatic/pistol/syndicate,
+ /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/ballistic/automatic/smg/mini_uzi,
/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/c20r,
- /obj/item/gun/ballistic/automatic/hmg/l6_saw,
- /obj/item/gun/ballistic/automatic/smg/m90,
+ /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,
/obj/item/gun/energy/alien,
/obj/item/gun/energy/e_gun/dragnet,
/obj/item/gun/energy/e_gun/turret,
@@ -40,10 +39,10 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/energy/plasmacutter/adv,
/obj/item/gun/energy/wormhole_projector,
/obj/item/gun/ballistic/automatic/smg/wt550,
- /obj/item/gun/ballistic/shotgun/bulldog,
+ /obj/item/gun/ballistic/shotgun/automatic/bulldog,
/obj/item/gun/ballistic/revolver/grenadelauncher,
/obj/item/gun/ballistic/revolver/golden,
- /obj/item/gun/ballistic/automatic/marksman/sniper_rifle,
+ /obj/item/gun/ballistic/automatic/marksman/taipan,
/obj/item/gun/ballistic/rocketlauncher,
/obj/item/gun/medbeam,
/obj/item/gun/energy/laser/scatter,
diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm
index 254a43dc23a..3c087cc8840 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 2fab8c5848e..bc800a49c7d 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 4c9b3556b6a..e42cb866b50 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 d1c882f9662..501cad86da4 100644
--- a/code/modules/surgery/advanced/lobotomy.dm
+++ b/code/modules/surgery/advanced/lobotomy.dm
@@ -25,8 +25,8 @@
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/kitchen/knife = 15,
+ /obj/item/melee/energy/sword = 25,
+ /obj/item/melee/knife = 15,
/obj/item/shard = 10,
/obj/item = 5)
time = 10 SECONDS
diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm
index 91cd1dce07e..e737acbb78d 100644
--- a/code/modules/surgery/amputation.dm
+++ b/code/modules/surgery/amputation.dm
@@ -14,9 +14,9 @@
TOOL_SCALPEL = 100,
TOOL_SAW = 100,
/obj/item/melee/arm_blade = 80,
- /obj/item/fireaxe = 50,
+ /obj/item/melee/axe/fire = 50,
/obj/item/hatchet = 40,
- /obj/item/kitchen/knife/butcher = 25)
+ /obj/item/melee/knife/butcher = 25)
time = 6.4 SECONDS
preop_sound = 'sound/surgery/scalpel1.ogg'
success_sound = 'sound/surgery/organ2.ogg'
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 94da7fb26c0..8f35606776b 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)]"
@@ -153,11 +159,6 @@
if(burn_dam > DAMAGE_PRECISION)
. += "This limb has [burn_dam > 30 ? "severe" : "minor"] burns."
-
-/obj/item/bodypart/blob_act()
- take_damage(max_damage)
-
-
/obj/item/bodypart/attack(mob/living/carbon/C, mob/user)
if(ishuman(C))
var/mob/living/carbon/human/H = C
@@ -244,7 +245,7 @@
burn *= 2
// Is the damage greater than the threshold, and if so, probability of damage + item force
- if((brute_dam > bone_break_threshold) && prob(brute_dam + break_modifier))
+ if(brute && (brute_dam > bone_break_threshold) && prob(brute_dam + break_modifier))
break_bone()
// Bleeding is applied here
@@ -378,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)
@@ -516,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
@@ -569,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.
@@ -587,6 +588,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
@@ -668,12 +674,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
@@ -765,6 +771,8 @@
limb_gender,
)*/
+ stored_icon_state = limb.icon_state
+
return
/obj/item/bodypart/deconstruct(disassembled = TRUE)
@@ -782,7 +790,11 @@
if (bone_status == BONE_FLAG_NORMAL && body_part & LEGS) // Because arms are not legs
owner.set_broken_legs(owner.broken_legs + 1)
bone_status = BONE_FLAG_BROKEN
- addtimer(CALLBACK(owner, TYPE_PROC_REF(/atom, 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."), 1 SECONDS)
+// addtimer(CALLBACK(src, PROC_REF(break_bone_feedback), 1 SECONDS)) testing sommething
+
+///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, 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
@@ -796,7 +808,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 07d30e727c7..4a98e6b93ea 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 05dffd8b4ff..4c9a9be3b6d 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 5f89d15aa95..543a0e5fddd 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 0794602de95..ebf294a3ccc 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 1437e191578..b2502f6a172 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 c5bfd110820..00000000000
--- 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/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm
index a4628d19eff..ceb376f3587 100644
--- a/code/modules/surgery/coronary_bypass.dm
+++ b/code/modules/surgery/coronary_bypass.dm
@@ -22,7 +22,7 @@
name = "incise heart"
implements = list(
TOOL_SCALPEL = 90,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/knife = 40,
/obj/item/shard = 33)
time = 1.6 SECONDS
preop_sound = 'sound/surgery/scalpel1.ogg'
diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm
index 70dbac246e4..fd3c740b9eb 100644
--- a/code/modules/surgery/experimental_dissection.dm
+++ b/code/modules/surgery/experimental_dissection.dm
@@ -13,7 +13,7 @@
/datum/surgery_step/clamp_bleeders,
/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
@@ -34,7 +34,7 @@
/obj/item/scalpel/augment = 75,
/obj/item/scalpel/advanced = 60,
TOOL_SCALPEL = 45,
- /obj/item/kitchen/knife = 30,
+ /obj/item/melee/knife = 30,
/obj/item/shard = 10)// special tools not only cut down time but also improve probability
time = 125
silicons_obey_prob = TRUE
diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm
index f4bd48c4729..201e9125c06 100644
--- a/code/modules/surgery/gastrectomy.dm
+++ b/code/modules/surgery/gastrectomy.dm
@@ -24,8 +24,8 @@
name = "remove lower duodenum"
implements = list(
TOOL_SCALPEL = 95,
- /obj/item/melee/transforming/energy/sword = 33,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/energy/sword = 33,
+ /obj/item/melee/knife = 40,
/obj/item/shard = 10)
time = 52
experience_given = (MEDICAL_SKILL_ORGAN_FIX*0.8) //for consistency across organ surgeries
diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm
index e612b6fa18c..b5b017831d7 100644
--- a/code/modules/surgery/hepatectomy.dm
+++ b/code/modules/surgery/hepatectomy.dm
@@ -23,8 +23,8 @@
name = "remove damaged liver section"
implements = list(
TOOL_SCALPEL = 95,
- /obj/item/melee/transforming/energy/sword = 33,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/energy/sword = 33,
+ /obj/item/melee/knife = 40,
/obj/item/shard = 25)
time = 52
experience_given = (MEDICAL_SKILL_ORGAN_FIX*0.8) //repeatable so not as much xp
diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm
index 09ef68f03e1..9e9b8e5241a 100644
--- a/code/modules/surgery/lobectomy.dm
+++ b/code/modules/surgery/lobectomy.dm
@@ -22,8 +22,8 @@
name = "excise damaged lung node"
implements = list(
TOOL_SCALPEL = 95,
- /obj/item/melee/transforming/energy/sword = 33,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/energy/sword = 33,
+ /obj/item/melee/knife = 40,
/obj/item/shard = 25)
time = 4.2 SECONDS
preop_sound = 'sound/surgery/scalpel1.ogg'
diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm
index 3730f7cf130..694081f7af7 100644
--- a/code/modules/surgery/mechanic_steps.dm
+++ b/code/modules/surgery/mechanic_steps.dm
@@ -4,7 +4,7 @@
implements = list(
TOOL_SCREWDRIVER = 100,
TOOL_SCALPEL = 75, // med borgs could try to unscrew shell with scalpel
- /obj/item/kitchen/knife = 50,
+ /obj/item/melee/knife/kitchen = 50,
/obj/item = 10)
time = 2.4 SECONDS
preop_sound = 'sound/items/screwdriver.ogg'
@@ -28,7 +28,7 @@
implements = list(
TOOL_SCREWDRIVER = 100,
TOOL_SCALPEL = 75,
- /obj/item/kitchen/knife = 50,
+ /obj/item/melee/knife/kitchen = 50,
/obj/item = 10)
time = 2.4 SECONDS
preop_sound = 'sound/items/screwdriver.ogg'
diff --git a/code/modules/surgery/mechanical.dm b/code/modules/surgery/mechanical.dm
index 0c73c34bd0c..2cf72dab173 100644
--- a/code/modules/surgery/mechanical.dm
+++ b/code/modules/surgery/mechanical.dm
@@ -33,14 +33,14 @@
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
/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 42018e6c1d8..a3df7efc62a 100644
--- a/code/modules/surgery/organic_steps.dm
+++ b/code/modules/surgery/organic_steps.dm
@@ -4,8 +4,8 @@
name = "make incision"
implements = list(
TOOL_SCALPEL = 100,
- /obj/item/melee/transforming/energy/sword = 40,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/energy/sword = 40,
+ /obj/item/melee/knife = 40,
/obj/item/shard = 25,
/obj/item = 15) //any sharp item
time = 1.6 SECONDS
@@ -151,18 +151,22 @@
name = "saw bone"
implements = list(
TOOL_SAW = 100,
- /obj/item/fireaxe = 50,
+ /obj/item/melee/axe/fire = 50,
+ /obj/item/gear_handle/anglegrinder = 50,
/obj/item/melee/arm_blade = 40,
/obj/item/hatchet = 40,
- /obj/item/kitchen/knife/butcher = 33,
+ /obj/item/melee/knife/butcher = 33,
+ /obj/item/gun/energy/plasmacutter = 30,
/obj/item = 10) //10% success (sort of) with any sharp item with a force>=10
time = 5.4 SECONDS
preop_sound = list(
/obj/item/circular_saw = 'sound/surgery/saw.ogg',
+ /obj/item/gear_handle/anglegrinder = 'sound/surgery/saw.ogg',
+ /obj/item/gun/energy/plasmacutter = 'sound/weapons/plasma_cutter.ogg',
/obj/item/melee/arm_blade = 'sound/surgery/scalpel1.ogg',
- /obj/item/fireaxe = 'sound/surgery/scalpel1.ogg',
+ /obj/item/melee/axe/fire = 'sound/surgery/scalpel1.ogg',
/obj/item/hatchet = 'sound/surgery/scalpel1.ogg',
- /obj/item/kitchen/knife/butcher = 'sound/surgery/scalpel1.ogg',
+ /obj/item/melee/knife/butcher = 'sound/surgery/scalpel1.ogg',
/obj/item = 'sound/surgery/scalpel1.ogg',
)
success_sound = 'sound/surgery/bone3.ogg'
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 5d6fac852d5..27ccf1421a3 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -232,17 +232,17 @@
/obj/item/organ/cyberimp/arm/toolset/emag_act(mob/user)
for(var/datum/weakref/created_item in items_list)
var/obj/potential_knife = created_item.resolve()
- if(istype(/obj/item/kitchen/knife/combat/cyborg, potential_knife))
+ if(istype(/obj/item/melee/knife/combat/cyborg, potential_knife))
return FALSE
to_chat(user, "You unlock [src]'s integrated knife!")
- items_list += WEAKREF(new /obj/item/kitchen/knife/combat/cyborg(src))
+ items_list += WEAKREF(new /obj/item/melee/knife/combat/cyborg(src))
return TRUE
/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/heart.dm b/code/modules/surgery/organs/heart.dm
index 26b93d2c464..6ba9ce69d70 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -55,7 +55,7 @@
update_appearance()
return 1
-/obj/item/organ/heart/OnEatFrom(eater, feeder)
+/obj/item/organ/heart/on_eat_from(eater, feeder)
. = ..()
beating = FALSE
update_appearance()
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 05ca5131e0f..d5e90e83634 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()
@@ -85,7 +92,7 @@
damage_type = safe_damage_type
)
-/obj/item/organ/lungs/proc/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
+/obj/item/organ/lungs/proc/check_breath (datum/gas_mixture/breath, mob/living/carbon/human/H)
//TODO: add lung damage = less oxygen gains
var/breathModifier = (5-(5*(damage/maxHealth)/2)) //range 2.5 - 5
if(H.status_flags & GODMODE)
@@ -212,6 +219,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])
@@ -248,48 +258,183 @@
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)
breath.adjust_moles(GAS_FREON, -gas_breathed)
- // Stimulum
- gas_breathed = PP(breath,GAS_STIMULUM)
+ // Chlorine
+ var/chlorine_pp = PP(breath,GAS_CHLORINE)
+ if (prob(chlorine_pp))
+ to_chat(H, span_alert("Your lungs feel awful!"))
+ if (chlorine_pp >20)
+ H.emote("gasp")
+ H.adjustOxyLoss(5)
+ if (prob(chlorine_pp/2))
+ to_chat(H, span_alert("Your throat closes up!"))
+ H.silent = max(H.silent, 3)
+ else
+ 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)
+
+ breath.adjust_moles(GAS_CHLORINE, -gas_breathed)
+ // Hydrogen Chloride
+ var/hydrogen_chloride_pp = PP(breath,GAS_HYDROGEN_CHLORIDE)
+ if (prob(hydrogen_chloride_pp))
+ to_chat(H, span_alert("Your lungs feel terrible!"))
+ if (hydrogen_chloride_pp >20)
+ H.emote("gasp")
+ H.adjustOxyLoss(10)
+ if (prob(hydrogen_chloride_pp/2))
+ to_chat(H, span_alert("Your throat closes up!"))
+ H.silent = max(H.silent, 3)
+ else
+ H.adjustOxyLoss(round(hydrogen_chloride_pp/4))
+ if (gas_breathed > gas_stimulation_min)
+ H.reagents.add_reagent(/datum/reagent/hydrogen_chloride)
+
+ 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)
. = 0
@@ -308,35 +453,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()
. = ..()
@@ -361,6 +585,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 b8871b21524..72b7fba9d2d 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -38,7 +38,14 @@
/obj/item/organ/Initialize()
. = ..()
if(organ_flags & ORGAN_EDIBLE)
- AddComponent(/datum/component/edible, food_reagents, null, RAW | MEAT | GORE, null, 10, null, null, null, COLOR_PINK, CALLBACK(src, PROC_REF(OnEatFrom)))
+ AddComponent(/datum/component/edible,\
+ initial_reagents = food_reagents,\
+ foodtypes = RAW | MEAT | GORE,\
+ volume = 10,\
+ filling_color = COLOR_PINK,\
+ pre_eat = CALLBACK(src, PROC_REF(pre_eat)),\
+ on_compost = CALLBACK(src, PROC_REF(pre_compost)),\
+ after_eat = CALLBACK(src, PROC_REF(on_eat_from)))
///When you take a bite you cant jam it in for surgery anymore.
/obj/item/organ/proc/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
@@ -133,8 +140,21 @@
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/organ/proc/OnEatFrom(eater, feeder)
- useable = FALSE //You can't use it anymore after eating it you spaztic
+// Put any "can we eat this" checks for edible organs here
+/obj/item/organ/proc/pre_eat(eater, feeder)
+ if(iscarbon(eater))
+ var/mob/living/carbon/target = eater
+ for(var/S in target.surgeries)
+ var/datum/surgery/surgery = S
+ if(surgery.location == zone)
+ return FALSE
+ return TRUE
+
+/obj/item/organ/proc/pre_compost(user)
+ return TRUE
+
+/obj/item/organ/proc/on_eat_from(eater, feeder)
+ useable = FALSE //You bit it, no more using it
/obj/item/organ/item_action_slot_check(slot,mob/user)
return //so we don't grant the organ's action to mobs who pick up the organ.
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index 62ca9cd2fe8..bf229226e25 100644
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -48,37 +48,50 @@
/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)
- if(prob(pukeprob)) //iT hAndLeS mOrE ThaN PukInG
- 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
+ if(prob(pukeprob)) //iT hAndLeS mOrE ThaN PukInG
+ 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 4469410f9b5..729dc0fe840 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -276,7 +276,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 c0313adb253..4c69dd532a8 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++
@@ -439,14 +422,6 @@
var/mob/living/L = V
L.emote("flip")
- //SPEAK
- else if((findtext(message, speak_words)))
- cooldown = COOLDOWN_MEME
- for(var/V in listeners)
- var/mob/living/L = V
- addtimer(CALLBACK(L, TYPE_PROC_REF(/atom/movable, say), pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")), 5 * i)
- i++
-
//GET UP
else if((findtext(message, getup_words)))
cooldown = COOLDOWN_DAMAGE //because stun removal
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
index 9c87a5b5a93..ed54575bb1b 100644
--- a/code/modules/surgery/plastic_surgery.dm
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -8,7 +8,7 @@
name = "reshape face"
implements = list(
TOOL_SCALPEL = 100,
- /obj/item/kitchen/knife = 40,
+ /obj/item/melee/knife = 40,
TOOL_WIRECUTTER = 33)
time = 64
experience_given = MEDICAL_SKILL_MEDIUM
diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm
index 13e4e3b784c..7aef39fb545 100644
--- a/code/modules/surgery/revival.dm
+++ b/code/modules/surgery/revival.dm
@@ -42,7 +42,7 @@
. = TRUE
if(istype(tool, /obj/item/shockpaddles))
var/obj/item/shockpaddles/S = tool
- if((S.req_defib && !S.defib.powered) || !S.wielded || S.cooldown || S.busy)
+ if((S.req_defib && !S.defib.powered) || !HAS_TRAIT(S, TRAIT_WIELDED) || S.cooldown || S.busy)
to_chat(user, "You need to wield both paddles, and [S.defib] must be powered!")
return FALSE
if(istype(tool, /obj/item/melee/baton))
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 317297c4fe8..a9235c07b74 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
@@ -171,7 +168,7 @@
//spases 4 legibilititie
icon_state = "swa"
- icon = 'icons/obj/items_and_weapons.dmi'
+ icon = 'icons/obj/items.dmi'
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
diff --git a/code/modules/tgs/README.md b/code/modules/tgs/README.md
index 6319028d810..35ca73d7e9a 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 b82d8f49e29..965e21b549a 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 00000000000..6ef8d841b8f
--- /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 15622228e91..63cb5a2c351 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 f734fd0527f..3ca53e9bf7c 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 23b714f9d06..f5118ed55a3 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 f4806f7adb9..29ea239ad84 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 92c7a8388a7..a47bfd78000 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 95b8edd3ee5..3e328fc7c27 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 0c5e701a32b..62201fcc9e5 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 e1f2cb63857..59e5e63e5cd 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 237207fdfd0..acd19dfa641 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/states/zlevel.dm b/code/modules/tgui/states/zlevel.dm
index 152e35803d9..6c4fb13f646 100644
--- a/code/modules/tgui/states/zlevel.dm
+++ b/code/modules/tgui/states/zlevel.dm
@@ -12,6 +12,6 @@ GLOBAL_DATUM_INIT(z_state, /datum/ui_state/z_state, new)
/datum/ui_state/z_state/can_use_topic(src_object, mob/user)
var/turf/turf_obj = get_turf(src_object)
var/turf/turf_usr = get_turf(user)
- if(turf_obj && turf_usr && turf_obj.virtual_z() == turf_usr.virtual_z())
+ if(turf_obj && turf_usr && turf_obj.virtual_z == turf_usr.virtual_z)
return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/tgui/tgui_alert.dm b/code/modules/tgui/tgui_alert.dm
index 9d2dd3b5a05..f732bda9abe 100644
--- a/code/modules/tgui/tgui_alert.dm
+++ b/code/modules/tgui/tgui_alert.dm
@@ -80,7 +80,7 @@
start_time = world.time
QDEL_IN(src, timeout)
-/datum/tgui_modal/Destroy(force, ...)
+/datum/tgui_modal/Destroy(force)
SStgui.close_uis(src)
QDEL_NULL(buttons)
. = ..()
@@ -141,7 +141,7 @@
..(user, title, message, buttons, timeout)
src.callback = callback
-/datum/tgui_modal/async/Destroy(force, ...)
+/datum/tgui_modal/async/Destroy(force)
QDEL_NULL(callback)
. = ..()
diff --git a/code/modules/tgui/tgui_input_list.dm b/code/modules/tgui/tgui_input_list.dm
index a02dfac5f55..2b2c2149683 100644
--- a/code/modules/tgui/tgui_input_list.dm
+++ b/code/modules/tgui/tgui_input_list.dm
@@ -102,7 +102,7 @@
start_time = world.time
QDEL_IN(src, timeout)
-/datum/tgui_list_input/Destroy(force, ...)
+/datum/tgui_list_input/Destroy(force)
SStgui.close_uis(src)
QDEL_NULL(buttons)
. = ..()
@@ -172,7 +172,7 @@
..(user, message, title, buttons, timeout)
src.callback = callback
-/datum/tgui_list_input/async/Destroy(force, ...)
+/datum/tgui_list_input/async/Destroy(force)
QDEL_NULL(callback)
. = ..()
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 4b4e10edd7a..3195d86e7fb 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 017356d9152..ed3d9c6ed0a 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
@@ -72,7 +68,7 @@
ignore += typesof(/obj/effect/pod_landingzone_effect)
ignore += typesof(/obj/effect/pod_landingzone)
//These want fried food to take on the shape of, we can't pass that in
- ignore += typesof(/obj/item/reagent_containers/food/snacks/deepfryholder)
+ ignore += typesof(/obj/item/food/deepfryholder)
//Can't pass in a thing to glow
ignore += typesof(/obj/effect/abstract/eye_lighting)
//It wants a lot more context then we have
@@ -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 67b6072d3b9..f6736ccb1d5 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 00000000000..36630dfea8d
--- /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 858c6d2f284..b3e5265e2f0 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 f548d2844a0..36343da89c2 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 eb2d84b73f6..31c5d432dfa 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)))
@@ -78,7 +76,7 @@
spacer = "\n\t"
if(cached_slot_flags & ITEM_SLOT_EYES)
- icon_file = 'icons/mob/clothing/eyes.dmi'
+ icon_file = 'icons/mob/clothing/eyes/eyes.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]"
@@ -113,4 +111,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 b381bfeb7bf..00000000000
--- 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 4dc12b4dc6e..6fc875d9483 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 d3fa6e6cdfc..c725fcdc6dd 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/serving_tray.dm b/code/modules/unit_tests/serving_tray.dm
index 9bd487ba68a..b4dc1f77a52 100644
--- a/code/modules/unit_tests/serving_tray.dm
+++ b/code/modules/unit_tests/serving_tray.dm
@@ -6,7 +6,7 @@
var/obj/structure/table/the_table = allocate(/obj/structure/table)
var/obj/item/storage/bag/tray/test_tray = allocate(/obj/item/storage/bag/tray)
var/obj/item/reagent_containers/food/banana = allocate(/obj/item/reagent_containers/food/snacks/grown/banana)
- var/obj/item/reagent_containers/food/the_bread = allocate(/obj/item/reagent_containers/food/snacks/breadslice)
+ var/obj/item/reagent_containers/food/the_bread = allocate(/obj/item/food/breadslice)
var/obj/item/reagent_containers/food/sugarcookie = allocate(/obj/item/reagent_containers/food/snacks/sugarcookie)
var/obj/item/clothing/under/jumpsuit = allocate(/obj/item/clothing/under/color/black)
diff --git a/code/modules/unit_tests/ship_outpost_placement.dm b/code/modules/unit_tests/ship_outpost_placement.dm
index 48bbd6a181e..0762af79e30 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 7240adb3385..18b5b12e7f4 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 11eb6a4b49e..0cf5a125896 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -325,7 +325,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "84mm Rocket Propelled Grenade Launcher"
desc = "A reusable rocket propelled grenade launcher preloaded with a low-yield 84mm HE round. \
Guaranteed to send your target out with a bang or your money back!"
- item = /obj/item/gun/ballistic/rocketlauncher
+ item = /obj/item/gun/ballistic/rocketlauncher/mako
cost = 8
surplus = 30
include_modes = list(/datum/game_mode/nuclear)
@@ -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)
@@ -387,7 +387,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Bulldog Shotgun"
desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatible with all 12g rounds. Designed for close \
quarter anti-personnel engagements."
- item = /obj/item/gun/ballistic/shotgun/bulldog
+ item = /obj/item/gun/ballistic/shotgun/automatic/bulldog
cost = 8
surplus = 40
include_modes = list(/datum/game_mode/nuclear)
@@ -396,7 +396,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "C-20r Submachine Gun"
desc = "A fully-loaded Scarborough Arms bullpup submachine gun. The C-20r fires .45 rounds with a \
24-round magazine and is compatible with suppressors."
- item = /obj/item/gun/ballistic/automatic/smg/c20r
+ item = /obj/item/gun/ballistic/automatic/smg/cobra
cost = 10
surplus = 40
include_modes = list(/datum/game_mode/nuclear)
@@ -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,21 +445,11 @@ 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. \
This deadly weapon has a massive 50-round magazine of devastating 7.12x82mm ammunition."
- item = /obj/item/gun/ballistic/automatic/hmg/l6_saw
+ item = /obj/item/gun/ballistic/automatic/assault/hydra/lmg/extended
cost = 18
surplus = 0
include_modes = list(/datum/game_mode/nuclear)
@@ -468,7 +458,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "M-90gl Carbine"
desc = "A fully-loaded, specialized three-round burst carbine that fires 5.56mm ammunition from a 30 round magazine \
with a toggleable 40mm underbarrel grenade launcher."
- item = /obj/item/gun/ballistic/automatic/smg/m90
+ item = /obj/item/gun/ballistic/automatic/assault/hydra
cost = 18
surplus = 50
include_modes = list(/datum/game_mode/nuclear)
@@ -485,7 +475,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/sniper
name = "Sniper Rifle"
desc = "Ranged fury, Syndicate style. Guaranteed to cause shock and awe or your TC back!"
- item = /obj/item/gun/ballistic/automatic/marksman/sniper_rifle
+ item = /obj/item/gun/ballistic/automatic/marksman/taipan
cost = 16
surplus = 25
include_modes = list(/datum/game_mode/nuclear)
@@ -494,7 +484,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Stechkin Pistol"
desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible \
with suppressors."
- item = /obj/item/gun/ballistic/automatic/pistol/syndicate
+ item = /obj/item/gun/ballistic/automatic/pistol/ringneck
cost = 7
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -508,7 +498,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/revolver
name = "Syndicate Revolver"
desc = "A brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers."
- item = /obj/item/gun/ballistic/revolver/syndicate
+ item = /obj/item/gun/ballistic/revolver/viper
cost = 13
surplus = 50
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -516,7 +506,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/foamsmg
name = "Toy Submachine Gun"
desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade darts with a 20-round magazine."
- item = /obj/item/gun/ballistic/automatic/smg/c20r/toy/riot
+ item = /obj/item/gun/ballistic/automatic/toy
cost = 5
surplus = 0
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
@@ -525,7 +515,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Toy Machine Gun"
desc = "A fully-loaded Donksoft belt-fed machine gun. This weapon has a massive 50-round magazine of devastating \
riot grade darts, that can briefly incapacitate someone in just one volley."
- item = /obj/item/gun/ballistic/automatic/hmg/l6_saw/toy/riot
+ item = /obj/item/gun/ballistic/automatic/toy
cost = 10
surplus = 0
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
@@ -565,28 +555,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
surplus = 5
limited_stock = 1
-/datum/uplink_item/dangerous/tec9
- name = "TEC9 Machine Pistol"
- desc = "A powerful machine pistol sporting a high rate of fire and armor-piercing rounds."
- item = /obj/item/gun/ballistic/automatic/pistol/tec9
- cost = 12
- surplus = 20
-
-/datum/uplink_item/dangerous/ebr
- name = "M514 EBR"
- desc = "A cheap rifle with high stopping power and low capacity."
- item = /obj/item/gun/ballistic/automatic/marksman/ebr
- cost = 8
- surplus = 20
- include_modes = list(/datum/game_mode/nuclear)
-
// Stealthy Weapons
/datum/uplink_item/stealthy_weapons
category = "Stealthy Weapons"
/datum/uplink_item/stealthy_weapons/combatglovesplus
name = "Combat Gloves Plus"
- desc = "A pair of gloves that are fireproof and electrically insulated, however unlike the regular Combat Gloves these use nanotechnology \
+ desc = "A pair of gloves that are fireproof and acid-resistant, however unlike the regular Combat Gloves these use nanotechnology \
to teach the martial art of krav maga to the wearer."
item = /obj/item/clothing/gloves/krav_maga/combatglovesplus
cost = 5
@@ -683,7 +658,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/stealthy_weapons/suppressor
name = "Suppressor"
desc = "This suppressor will silence the shots of the weapon it is attached to for increased stealth and superior ambushing capability. It is compatible with many small ballistic guns including the Stechkin and C-20r, but not revolvers or energy guns."
- item = /obj/item/suppressor
+ item = /obj/item/attachment/silencer
cost = 3
surplus = 10
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -726,7 +701,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/ammo/pistol
name = "10mm Handgun Magazine"
desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol."
- item = /obj/item/ammo_box/magazine/m10mm
+ item = /obj/item/ammo_box/magazine/m10mm_ringneck
cost = 1
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -734,7 +709,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "10mm Armour Piercing Magazine"
desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
These rounds are less effective at injuring the target but penetrate protective gear."
- item = /obj/item/ammo_box/magazine/m10mm/ap
+ item = /obj/item/ammo_box/magazine/m10mm_ringneck
cost = 2
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -742,7 +717,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "10mm Hollow Point Magazine"
desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
These rounds are more damaging but ineffective against armour."
- item = /obj/item/ammo_box/magazine/m10mm/hp
+ item = /obj/item/ammo_box/magazine/m10mm_ringneck
cost = 3
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -750,7 +725,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "10mm Incendiary Magazine"
desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
Loaded with incendiary rounds which inflict little damage, but ignite the target."
- item = /obj/item/ammo_box/magazine/m10mm/inc
+ item = /obj/item/ammo_box/magazine/m10mm_ringneck
cost = 2
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -767,13 +742,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/ammo/shotgun/buck
name = "12g Buckshot Drum"
desc = "An additional 8-round buckshot magazine for use with the Bulldog shotgun. Front towards enemy."
- item = /obj/item/ammo_box/magazine/m12g
+ item = /obj/item/ammo_box/magazine/m12g_bulldog/drum
/datum/uplink_item/ammo/shotgun/dragon
name = "12g Dragon's Breath Drum"
desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. \
'I'm a fire starter, twisted fire starter!'"
- item = /obj/item/ammo_box/magazine/m12g/dragon
+ item = /obj/item/ammo_box/magazine/m12g_bulldog/drum/dragon
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/shotgun/meteor
@@ -782,7 +757,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
An alternative 8-round meteorslug magazine for use in the Bulldog shotgun.
Great for blasting airlocks off their frames and knocking down enemies.
"}
- item = /obj/item/ammo_box/magazine/m12g/meteor
+ item = /obj/item/ammo_box/magazine/m12g_bulldog/drum/meteor
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/shotgun/slug
@@ -790,7 +765,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "An additional 8-round slug magazine for use with the Bulldog shotgun. \
Now 8 times less likely to shoot your pals."
cost = 3
- item = /obj/item/ammo_box/magazine/m12g/slug
+ item = /obj/item/ammo_box/magazine/m12g_bulldog/drum/slug
/datum/uplink_item/ammo/revolver
name = ".357 Speed Loader"
@@ -819,7 +794,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/ammo/smg
name = ".45 SMG Magazine"
desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun."
- item = /obj/item/ammo_box/magazine/smgm45
+ item = /obj/item/ammo_box/magazine/m45_cobra
cost = 3
include_modes = list(/datum/game_mode/nuclear)
@@ -849,7 +824,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "5.56mm Toploader Magazine"
desc = "An additional 30-round 5.56mm magazine; suitable for use with the M-90gl carbine. \
These bullets pack less punch than 7.12x82mm rounds, but they still offer more power than .45 ammo."
- item = /obj/item/ammo_box/magazine/m556
+ item = /obj/item/ammo_box/magazine/m556_42_hydra
cost = 4
include_modes = list(/datum/game_mode/nuclear)
@@ -858,38 +833,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
surplus = 0
include_modes = list(/datum/game_mode/nuclear)
-/datum/uplink_item/ammo/machinegun/basic
- name = "7.12x82mm Box Magazine"
- desc = "A 50-round magazine of 7.12x82mm ammunition for use with the L6 SAW. \
- By the time you need to use this, you'll already be standing on a pile of corpses."
- item = /obj/item/ammo_box/magazine/mm712x82
-
-/datum/uplink_item/ammo/machinegun/ap
- name = "7.12x82mm (Armor Penetrating) Box Magazine"
- desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; equipped with special properties \
- to puncture even the most durable armor."
- item = /obj/item/ammo_box/magazine/mm712x82/ap
- cost = 9
-
-/datum/uplink_item/ammo/machinegun/hollow
- name = "7.12x82mm (hollow point) Box Magazine"
- desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; equipped with hollow point tips to help \
- with the unarmored masses of crew."
- item = /obj/item/ammo_box/magazine/mm712x82/hollow
-
-/datum/uplink_item/ammo/machinegun/incen
- name = "7.12x82mm (Incendiary) Box Magazine"
- desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; tipped with a special flammable \
- mixture that'll ignite anyone struck by the bullet. Some men just want to watch the world burn."
- item = /obj/item/ammo_box/magazine/mm712x82/inc
-
-/datum/uplink_item/ammo/machinegun/match
- name = "7.12x82mm (Match) Box Magazine"
- desc = "A 50-round magazine of 7.12x82mm ammunition for use in the L6 SAW; you didn't know there was a demand for match grade \
- precision bullet hose ammo, but these rounds are finely tuned and perfect for ricocheting off walls all fancy-like."
- item = /obj/item/ammo_box/magazine/mm712x82/match
- cost = 10
-
/datum/uplink_item/ammo/rocket
include_modes = list(/datum/game_mode/nuclear)
@@ -909,14 +852,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/ammo/pistolaps
name = "9mm Handgun Magazine"
desc = "An additional 15-round 9mm magazine, compatible with the Stechkin APS pistol, found in the Spetsnaz Pyro bundle."
- item = /obj/item/ammo_box/magazine/pistolm9mm
+ item = /obj/item/ammo_box/magazine/m9mm_rattlesnake
cost = 2
include_modes = list(/datum/game_mode/nuclear)
/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
@@ -937,30 +880,30 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/mech/bag
- name = "Mech Support Kit Bag"
- desc = "A duffel bag containing ammo for four full reloads of the scattershotm which is equipped on standard Dark Gygax and Mauler exosuits. Also comes with some support equipment for maintaining the mech, including tools and an inducer."
+ name = "Exosuit Support Kit Bag"
+ desc = "A duffel bag containing ammo for four full reloads of the scattershot which is equipped on standard Dark Gygax and Touro exosuits. Also comes with some support equipment for maintaining the exosuit, including tools and an inducer."
item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mech
cost = 4
include_modes = list(/datum/game_mode/nuclear)
-/datum/uplink_item/ammo/mauler/bag
- name = "Mauler Ammo Bag"
- desc = "A duffel bag containing ammo for three full reloads of the LMG, scattershot carbine, and SRM-8 missile laucher that are equipped on a standard Mauler exosuit."
- item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mauler
+/datum/uplink_item/ammo/touro/bag
+ name = "Touro Ammo Bag"
+ desc = "A duffel bag containing ammo for three full reloads of the LMG, scattershot carbine, and SRM-8 missile laucher that are equipped on a standard Touro exosuit."
+ item = /obj/item/storage/backpack/duffelbag/syndie/ammo/touro
cost = 6
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/tec9
name = "TEC9 Magazine"
desc = "An additional 20 round 9mm magazine for the TEC9."
- item = /obj/item/ammo_box/magazine/tec9
+ item = /obj/item/ammo_box/magazine/m9mm_rattlesnake
cost = 3
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/ammo/ebr
name = "M2514 EBR Magazine"
desc = "An additional 10 round .308 magazine for the EBR."
- item = /obj/item/ammo_box/magazine/ebr
+ item = /obj/item/ammo_box/magazine/m556_42_hydra/small
cost = 2
include_modes = list(/datum/game_mode/nuclear)
@@ -1187,19 +1130,11 @@ 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/mauler
- name = "Mauler Exosuit"
- desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \
+/datum/uplink_item/support/touro
+ name = "Touro Exosuit"
+ desc = "A well-armored and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \
and deployable smoke. Comes equipped with an LMG, scattershot carbine, missile rack, an antiprojectile armor booster and a Tesla energy array."
- item = /obj/mecha/combat/marauder/mauler/loaded
+ item = /obj/mecha/combat/marauder/touro/loaded
cost = 140
// Stealth Items
@@ -1247,16 +1182,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/codespeak_manual/unlimited
cost = 3
-/datum/uplink_item/stealthy_tools/combatbananashoes
- name = "Combat Banana Shoes"
- desc = "While making the wearer immune to most slipping attacks like regular combat clown shoes, these shoes \
- can generate a large number of synthetic banana peels as the wearer walks, slipping up would-be pursuers. They also \
- squeak significantly louder."
- item = /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat
- cost = 6
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
/datum/uplink_item/stealthy_tools/emplight
name = "EMP Flashlight"
desc = "A small, self-recharging, short-ranged EMP device disguised as a working flashlight. \
@@ -1573,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!"
@@ -1832,9 +1748,9 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/role_restricted/concealed_weapon_bay
name = "Concealed Weapon Bay"
- desc = "A modification for non-combat mechas that allows them to equip one piece of equipment designed for combat mechs. \
+ desc = "A modification for civilian exosuits that allows them to equip one piece of equipment designed for combat exosuits. \
It also hides the equipped weapon from plain sight. \
- Only one can fit on a mecha."
+ Only one can fit on an exosuit."
item = /obj/item/mecha_parts/concealed_weapon_bay
cost = 3
restricted_roles = list("Roboticist", "Research Director")
@@ -1848,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"
@@ -1920,15 +1829,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 12
restricted_roles = list("Chemist", "Chief Medical Officer")
-/datum/uplink_item/role_restricted/reverse_bear_trap
- name = "Reverse Bear Trap"
- desc = "An ingenious execution device worn on (or forced onto) the head. Arming it starts a 1-minute kitchen timer mounted on the bear trap. When it goes off, the trap's jaws will \
- violently open, instantly killing anyone wearing it by tearing their jaws in half. To arm, attack someone with it while they're not wearing headgear, and you will force it onto their \
- head after three seconds uninterrupted."
- cost = 5
- item = /obj/item/reverse_bear_trap
- restricted_roles = list("Clown")
-
/datum/uplink_item/role_restricted/laser_arm
name = "Laser Arm Implant"
desc = "An implant that grants you a recharging laser gun inside your arm. Weak to EMPs. Comes with a syndicate autosurgeon for immediate self-application."
@@ -1939,7 +1839,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/role_restricted/greykingsword
name = "Blade of The Grey Tide"
desc = "A weapon of legend, forged by the greatest crackheads of our generation."
- item = /obj/item/melee/greykingsword
+ item = /obj/item/melee/sword/greyking
cost = 2
restricted_roles = list("Assistant", "Chemist")
diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm
index a785ba5985d..bd0a0f04c84 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/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index e9addbd2d5b..1df30ff3be9 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -111,8 +111,7 @@
var/randomnum = rand(1,6)
switch(randomnum)
if(1)
- visible_message("[user] presses one of the colorful buttons on [src], and a special banana peel drops out of it.")
- new /obj/item/grown/bananapeel/specialpeel(loc)
+ visible_message("[user] presses one of the colorful buttons on [src], and doesn't do anything. Oops.")
if(2)
visible_message("[user] presses one of the colorful buttons on [src], and unknown chemicals flood out of it.")
var/datum/reagents/R = new/datum/reagents(300)
diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm
index d4a9aff2d8b..ad1d3750aa9 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/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 8d6acea2845..ebef11cd263 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -57,7 +57,7 @@
///Stores the default icon state
var/board_icon = "skateboard"
///The handheld item counterpart for the board
- var/board_item_type = /obj/item/melee/skateboard
+ var/board_item_type = /obj/item/skateboard
///Stamina drain multiplier
var/instability = 10
@@ -165,13 +165,13 @@
desc = "A RaDSTORMz brand professional skateboard. Looks a lot more stable than the average board."
icon_state = "skateboard2"
board_icon = "skateboard2"
- board_item_type = /obj/item/melee/skateboard/pro
+ board_item_type = /obj/item/skateboard/pro
instability = 6
/obj/vehicle/ridden/scooter/skateboard/hoverboard/
name = "hoverboard"
desc = "A blast from the past, so retro!"
- board_item_type = /obj/item/melee/skateboard/hoverboard
+ board_item_type = /obj/item/skateboard/hoverboard
instability = 3
icon_state = "hoverboard_red"
board_icon = "hoverboard_red"
@@ -188,7 +188,7 @@
/obj/vehicle/ridden/scooter/skateboard/hoverboard/admin
name = "\improper Board Of Directors"
desc = "The engineering complexity of a spaceship concentrated inside of a board. Just as expensive, too."
- board_item_type = /obj/item/melee/skateboard/hoverboard/admin
+ board_item_type = /obj/item/skateboard/hoverboard/admin
instability = 0
icon_state = "hoverboard_nt"
board_icon = "hoverboard_nt"
diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm
index 22b1eb42bec..d883764c172 100644
--- a/code/modules/vehicles/sealed.dm
+++ b/code/modules/vehicles/sealed.dm
@@ -89,9 +89,10 @@
user.put_in_hands(inserted_key)
inserted_key = null
-/obj/vehicle/sealed/Destroy()
+/obj/vehicle/sealed/deconstruct(disassembled = TRUE)
DumpMobs()
- explosion(loc, 0, 1, 2, 3, 0)
+ if(!disassembled)
+ explosion(loc, 0, 1, 2, 3, 0)
return ..()
/obj/vehicle/sealed/proc/DumpMobs(randomstep = TRUE)
diff --git a/code/modules/vehicles/vehicle_key.dm b/code/modules/vehicles/vehicle_key.dm
index ba21f01289b..6c662390133 100644
--- a/code/modules/vehicles/vehicle_key.dm
+++ b/code/modules/vehicles/vehicle_key.dm
@@ -12,15 +12,3 @@
/obj/item/key/janitor
desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
icon_state = "keyjanitor"
-
-/obj/item/key/lasso
- name = "bone lasso"
- desc = "Perfect for taming all kinds of supernatural beasts! (Warning: only perfect for taming one kind of supernatural beast.)"
- force = 12
- icon_state = "lasso"
- item_state = "chain"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- attack_verb = list("flogged", "whipped", "lashed", "disciplined")
- hitsound = 'sound/weapons/whip.ogg'
- slot_flags = ITEM_SLOT_BELT
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 6d73fad566f..17249d8aae1 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)
@@ -552,7 +553,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)
@@ -795,12 +796,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
flick(icon_deny,src)
vend_ready = TRUE
return
-
- var/datum/bank_account/payment_account = payment_account_ref.resolve()
- if(payment_account)
- payment_account.transfer_money(account, price_to_use)
- else
- account.adjust_money(-price_to_use, "vendor_purchase")
+ 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)
@@ -811,9 +807,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
@@ -1032,7 +1032,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 cb3cd0053d8..44715238ed9 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 367c309d59a..5e15b2a2497 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -7,8 +7,6 @@
product_slogans = "Dress for success!;Suited and booted!;It's show time!;Why leave style up to fate? Use AutoDrobe!"
vend_reply = "Thank you for using AutoDrobe!"
products = list(
- /obj/item/clothing/suit/chickensuit = 1,
- /obj/item/clothing/head/chicken = 1,
/obj/item/clothing/under/costume/gladiator = 1,
/obj/item/clothing/head/helmet/gladiator = 1,
/obj/item/clothing/under/rank/command/captain/suit = 1,
@@ -21,7 +19,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,
@@ -29,16 +27,11 @@
/obj/item/clothing/head/that = 1,
/obj/item/clothing/under/costume/kilt = 1,
/obj/item/clothing/head/beret = 1,
- /obj/item/clothing/head/beret/vintage = 1,
- /obj/item/clothing/head/beret/archaic = 1,
/obj/item/clothing/accessory/waistcoat = 1,
- /obj/item/clothing/glasses/monocle =1,
- /obj/item/clothing/head/bowler = 1,
/obj/item/cane = 1,
/obj/item/clothing/under/suit/sl = 1,
/obj/item/clothing/mask/fakemoustache = 1,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,
- /obj/item/clothing/head/plaguedoctorhat = 1,
/obj/item/clothing/mask/gas/plaguedoctor = 1,
/obj/item/clothing/suit/toggle/owlwings = 1,
/obj/item/clothing/under/costume/owl = 1,
@@ -53,17 +46,9 @@
/obj/item/clothing/head/bandana = 1,
/obj/item/clothing/head/bandana = 1,
/obj/item/clothing/head/trapper = 1,
- /obj/item/clothing/suit/imperium_monk = 1,
/obj/item/clothing/mask/gas/cyborg = 1,
- /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1,
- /obj/item/clothing/suit/chaplainsuit/whiterobe = 1,
- /obj/item/clothing/head/wizard/marisa/fake = 1,
- /obj/item/clothing/suit/wizrobe/marisa/fake = 1,
/obj/item/clothing/under/dress/sundress = 1,
- /obj/item/clothing/head/witchwig = 1,
/obj/item/staff/broom = 1,
- /obj/item/clothing/suit/wizrobe/fake = 1,
- /obj/item/clothing/head/wizard/fake = 1,
/obj/item/staff = 3,
/obj/item/clothing/under/rank/civilian/mime/sexy = 1,
/obj/item/clothing/under/rank/civilian/mime/skirt = 1,
@@ -77,12 +62,6 @@
/obj/item/clothing/mask/rat/tribal = 1,
/obj/item/clothing/mask/rat = 1,
/obj/item/clothing/suit/apron/overalls = 1,
- /obj/item/clothing/head/rabbitears =1,
- /obj/item/clothing/head/sombrero = 1,
- /obj/item/clothing/head/sombrero/green = 1,
- /obj/item/clothing/suit/poncho = 1,
- /obj/item/clothing/suit/poncho/green = 1,
- /obj/item/clothing/suit/poncho/red = 1,
/obj/item/clothing/head/maidheadband = 1,
/obj/item/clothing/under/costume/maid = 1,
/obj/item/clothing/gloves/maid = 1,
@@ -90,29 +69,15 @@
/obj/item/clothing/under/rank/civilian/janitor/maid = 1,
/obj/item/clothing/glasses/cold=1,
/obj/item/clothing/glasses/heat=1,
- /obj/item/clothing/suit/whitedress = 1,
- /obj/item/clothing/head/jester = 1,
/obj/item/clothing/suit/hooded/carp_costume = 1,
- /obj/item/clothing/suit/hooded/ian_costume = 1,
- /obj/item/clothing/suit/hooded/bee_costume = 1,
/obj/item/clothing/suit/snowman = 1,
/obj/item/clothing/head/snowman = 1,
/obj/item/clothing/mask/joy = 1,
- /obj/item/clothing/head/cueball = 1,
/obj/item/clothing/under/suit/white_on_white = 1,
/obj/item/clothing/under/costume/sailor = 1,
- /obj/item/clothing/head/delinquent = 1,
/obj/item/clothing/head/wig/random = 3,
- /obj/item/clothing/head/shrine_wig = 1,
- /obj/item/clothing/suit/shrine_maiden = 1,
- /obj/item/clothing/suit/changshan_red = 1,
- /obj/item/clothing/suit/changshan_blue = 1,
- /obj/item/clothing/suit/cheongsam_red = 1,
- /obj/item/clothing/suit/cheongsam_blue = 1,
/obj/item/gohei = 1,
/obj/item/clothing/suit/judgerobe = 1,
- /obj/item/clothing/head/powdered_wig = 1,
- /obj/item/clothing/glasses/sunglasses/garb = 2,
/obj/item/clothing/glasses/blindfold = 1,
/obj/item/clothing/mask/muzzle = 2)
premium = list(
@@ -121,13 +86,11 @@
/obj/item/clothing/head/helmet/roman/fake = 1,
/obj/item/clothing/head/helmet/roman/legionnaire/fake = 1,
/obj/item/clothing/under/costume/roman = 1,
- /obj/item/clothing/shoes/roman = 1,
/obj/item/shield/riot/roman/fake = 1,
- /obj/item/skub = 1,
- /obj/item/clothing/suit/hooded/mysticrobe = 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 45dc055e1b2..ce8abf81c99 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -74,8 +74,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 b2608b6556f..b69f40525ac 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 1c377c30946..3bbb10afb9c 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
@@ -41,7 +41,7 @@
/obj/item/lighter/greyscale = 4,
/obj/item/storage/fancy/rollingpapers = 5)
-/obj/machinery/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin
+/obj/machinery/vending/cigarette/beach //Used in the old lavaland biodome ruin
name = "\improper ShadyCigs Ultra"
desc = "Now with extra premium products!"
product_ads = "Probably not bad for you!;Dope will get you through times of no money better than money will get you through times of no dope!;It's good for you!"
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index e9eef49a0e3..c462422830b 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -16,14 +16,10 @@
/obj/item/clothing/head/beanie/yellow = 3,
/obj/item/clothing/head/beanie/orange = 3,
/obj/item/clothing/head/beanie/cyan = 3,
- /obj/item/clothing/head/beanie/christmas = 3,
/obj/item/clothing/head/beanie/striped = 3,
/obj/item/clothing/head/beanie/stripedred = 3,
/obj/item/clothing/head/beanie/stripedblue = 3,
/obj/item/clothing/head/beanie/stripedgreen = 3,
- /obj/item/clothing/head/beanie/rasta = 3,
- /obj/item/clothing/head/kippah = 3,
- /obj/item/clothing/head/taqiyahred = 3,
/obj/item/clothing/gloves/fingerless = 2,
/obj/item/clothing/neck/scarf/pink = 3,
/obj/item/clothing/neck/scarf/red = 3,
@@ -55,14 +51,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,
@@ -85,15 +84,14 @@
/obj/item/clothing/accessory/waistcoat = 1,
/obj/item/clothing/head/that = 1,
/obj/item/clothing/head/fedora = 1,
- /obj/item/clothing/glasses/monocle = 1,
- /obj/item/clothing/head/sombrero = 1,
- /obj/item/clothing/suit/poncho = 1,
/obj/item/clothing/under/costume/kilt = 1,
/obj/item/clothing/under/dress/sundress = 1,
/obj/item/clothing/under/dress/striped = 1,
/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,
@@ -112,12 +110,10 @@
/obj/item/storage/belt/fannypack/black = 2,
/obj/item/clothing/suit/jacket/letterman_syndie = 1,
/obj/item/clothing/under/costume/jabroni = 1,
- /obj/item/clothing/suit/vapeshirt = 1,
/obj/item/clothing/under/costume/geisha = 1)
premium = list(
/obj/item/clothing/under/suit/checkered = 1,
/obj/item/clothing/suit/jacket/leather = 1,
- /obj/item/clothing/suit/jacket/leather/overcoat = 1,
/obj/item/clothing/neck/necklace/dope = 3,
/obj/item/clothing/suit/jacket/letterman_nanotrasen = 1,
/obj/item/instrument/piano_synth/headphones/spacepods = 1)
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index 9c4851c134a..f56336a0d44 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 a3fa70ce620..b69adcec1fb 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -23,25 +23,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/drinnerware.dm b/code/modules/vending/drinnerware.dm
index 3e51271093a..0dc0102c91e 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -8,17 +8,17 @@
/obj/item/reagent_containers/glass/bowl = 20,
/obj/item/kitchen/fork = 6,
/obj/item/reagent_containers/food/drinks/drinkingglass = 8,
- /obj/item/reagent_containers/food/condiment/pack/ketchup = 5,
- /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5,
- /obj/item/reagent_containers/food/condiment/pack/astrotame = 5,
- /obj/item/reagent_containers/food/condiment/saltshaker = 5,
- /obj/item/reagent_containers/food/condiment/peppermill = 5,
+ /obj/item/reagent_containers/condiment/pack/ketchup = 5,
+ /obj/item/reagent_containers/condiment/pack/hotsauce = 5,
+ /obj/item/reagent_containers/condiment/pack/astrotame = 5,
+ /obj/item/reagent_containers/condiment/saltshaker = 5,
+ /obj/item/reagent_containers/condiment/peppermill = 5,
/obj/item/clothing/suit/apron/chef = 2,
/obj/item/kitchen/rollingpin = 2,
- /obj/item/kitchen/knife = 2,
- /obj/item/kitchen/knife/pizza_cutter = 2,
+ /obj/item/melee/knife/kitchen = 2,
+ /obj/item/melee/knife/pizza_cutter = 2,
/obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 2,
- /obj/item/kitchen/knife/butcher = 1)
+ /obj/item/melee/knife/butcher = 1)
refill_canister = /obj/item/vending_refill/dinnerware
default_price = 50
extra_price = 250
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index b5a9d073e8f..1050e14de93 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 fb096656c1c..c3b3e175d18 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/games.dm b/code/modules/vending/games.dm
index c803fa347e9..e54479cd55c 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -15,8 +15,8 @@
/obj/item/camera = 3,
/obj/item/dyespray = 3)
premium = list(
- /obj/item/melee/skateboard/pro = 3,
- /obj/item/melee/skateboard/hoverboard = 1)
+ /obj/item/skateboard/pro = 3,
+ /obj/item/skateboard/hoverboard = 1)
refill_canister = /obj/item/vending_refill/games
default_price = 50
extra_price = 250
diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm
index 911a190703f..931611da1df 100644
--- a/code/modules/vending/liberation_toy.dm
+++ b/code/modules/vending/liberation_toy.dm
@@ -10,16 +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/gun/ballistic/automatic/smg/c20r/toy = 10,
- /obj/item/gun/ballistic/automatic/hmg/l6_saw/toy = 10,
- /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 5a35a75a449..ec96150e92d 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 dd498ffded0..41f97ab888a 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 911eaed2065..8ffd760c953 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(
@@ -98,7 +96,7 @@
/obj/item/storage/box/lethalshot = 6,
/obj/item/stock_parts/cell/gun = 5,
- /obj/item/ammo_box/magazine/uzim9mm = 5,
+ /obj/item/ammo_box/magazine/spitter_9mm = 5,
/obj/item/grenade/c4 = 5,
/obj/item/grenade/frag = 5,
@@ -107,8 +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,
- "Type U3 Uzi" = /obj/item/gun/ballistic/automatic/smg/mini_uzi)
+ "Combat Shotgun" = /obj/item/gun/ballistic/shotgun/automatic/m11)
/obj/machinery/vending/security/marine/syndicate
icon_state = "syndicate-marine"
@@ -120,20 +117,20 @@
/obj/item/restraints/handcuffs = 3,
/obj/item/assembly/flash/handheld = 2,
/obj/item/flashlight/seclite = 2,
- /obj/item/ammo_box/magazine/m10mm = 3,
- /obj/item/ammo_box/magazine/smgm45 = 3,
+ /obj/item/ammo_box/magazine/m10mm_ringneck = 3,
+ /obj/item/ammo_box/magazine/m45_cobra = 3,
/obj/item/ammo_box/magazine/sniper_rounds = 3,
- /obj/item/ammo_box/magazine/m556 = 2,
- /obj/item/ammo_box/magazine/m12g = 3,
- /obj/item/ammo_box/magazine/ebr = 5,
+ /obj/item/ammo_box/magazine/m556_42_hydra = 2,
+ /obj/item/ammo_box/magazine/m12g_bulldog/drum = 3,
+ /obj/item/ammo_box/magazine/m556_42_hydra/small = 5,
/obj/item/grenade/c4 = 1,
/obj/item/grenade/frag = 1,
)
voucher_items = list(
- "M-90gl Carbine" = /obj/item/gun/ballistic/automatic/smg/m90,
- "sniper rifle" = /obj/item/gun/ballistic/automatic/marksman/sniper_rifle,
- "C-20r SMG" = /obj/item/gun/ballistic/automatic/smg/c20r,
- "Bulldog Shotgun" = /obj/item/gun/ballistic/shotgun/bulldog)
+ "M-90gl Carbine" = /obj/item/gun/ballistic/automatic/assault/hydra,
+ "sniper rifle" = /obj/item/gun/ballistic/automatic/marksman/taipan,
+ "C-20r SMG" = /obj/item/gun/ballistic/automatic/smg/cobra,
+ "Bulldog Shotgun" = /obj/item/gun/ballistic/shotgun/automatic/bulldog)
/obj/machinery/vending/security/marine/nanotrasen
icon_state = "nt-marine"
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 45d76a4754f..034d9df27ba 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/sustenance.dm b/code/modules/vending/sustenance.dm
index 0519285d26a..02a95555468 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -7,11 +7,11 @@
icon_state = "sustenance"
products = list(
/obj/item/reagent_containers/food/snacks/tofu/prison = 24,
- /obj/item/reagent_containers/food/snacks/breadslice/moldy = 15,
+ /obj/item/food/breadslice/moldy = 15,
/obj/item/reagent_containers/food/drinks/ice/prison = 12,
/obj/item/reagent_containers/food/snacks/candy_corn/prison = 6)
contraband = list(
- /obj/item/kitchen/knife = 6,
+ /obj/item/melee/knife/kitchen = 6,
/obj/item/reagent_containers/food/drinks/coffee = 12,
/obj/item/tank/internals/emergency_oxygen = 6,
/obj/item/clothing/mask/breath = 6)
diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm
index a5092cf7373..3ee07932fdd 100644
--- a/code/modules/vending/toys.dm
+++ b/code/modules/vending/toys.dm
@@ -12,20 +12,18 @@
/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,
/obj/item/gun/ballistic/shotgun/toy/crossbow = 10,
- /obj/item/gun/ballistic/automatic/smg/c20r/toy = 5,
- /obj/item/gun/ballistic/automatic/hmg/l6_saw/toy = 5,
/obj/item/toy/katana = 10,
/obj/item/dualsaber/toy = 5)
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 da3fdb13401..ac4286799eb 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"
@@ -163,8 +163,7 @@
/obj/item/clothing/head/soft/black = 2,
/obj/item/clothing/mask/bandana/skull = 2
)
- contraband = list(/obj/item/clothing/suit/hooded/enginseer = 2, // WS edit: enginsineer robes
- /obj/item/organ/tongue/robot = 2)
+ contraband = list(/obj/item/organ/tongue/robot = 2)
refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe
extra_price = 300
/obj/item/vending_refill/wardrobe/robo_wardrobe
@@ -282,7 +281,7 @@
vend_reply = "Thank you for using the ChefDrobe!"
products = list(/obj/item/clothing/under/suit/waiter = 2,
/obj/item/radio/headset/headset_srv = 2,
- /obj/item/clothing/head/beret/service = 2, //WS edit - berets
+ /obj/item/clothing/head/beret/service = 2,
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/suit/apron/chef = 3,
/obj/item/clothing/head/soft/mime = 2,
@@ -291,10 +290,8 @@
/obj/item/clothing/suit/toggle/chef = 1,
/obj/item/clothing/under/rank/civilian/chef = 1,
/obj/item/clothing/under/rank/civilian/chef/skirt = 2,
- ///obj/item/clothing/under/rank/chef = 3,//WS edit - Better security jumpsuit sprites
/obj/item/clothing/head/chefhat = 1,
/obj/item/clothing/under/shorts/cookjorts = 2,
- /obj/item/clothing/shoes/cookflops = 2,
/obj/item/reagent_containers/glass/rag = 1,
/obj/item/clothing/accessory/armband/med = 4,
/obj/item/clothing/suit/hooded/wintercoat = 2)
@@ -375,29 +372,16 @@
icon_state = "chapdrobe"
product_ads = "Are you being bothered by cultists or pesky revenants? Then come and dress like the holy man!;Clothes for men of the cloth!"
vend_reply = "Thank you for using the ChapDrobe!"
- products = list(/obj/item/storage/box/holy = 1,
- /obj/item/storage/backpack/cultpack = 1,
+ products = list(/obj/item/storage/backpack/cultpack = 1,
/obj/item/clothing/head/beret/service = 1, //WS edit - berets
/obj/item/clothing/accessory/pocketprotector/cosmetology = 1,
/obj/item/clothing/under/rank/civilian/chaplain = 1,
/obj/item/clothing/under/rank/civilian/chaplain/skirt = 2,
/obj/item/clothing/shoes/sneakers/black = 1,
- /obj/item/clothing/suit/chaplainsuit/nun = 1,
- /obj/item/clothing/head/nun_hood = 1,
- /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1,
- /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit = 1,
/obj/item/storage/fancy/candle_box = 2,
- /obj/item/clothing/head/kippah = 3,
- /obj/item/clothing/suit/chaplainsuit/whiterobe = 1,
- /obj/item/clothing/head/taqiyahwhite = 1,
- /obj/item/clothing/head/taqiyahred = 3,
- /obj/item/clothing/suit/chaplainsuit/monkrobeeast = 1,
- /obj/item/clothing/accessory/armband/med = 4,
- /obj/item/clothing/head/beanie/rasta = 1)
+ /obj/item/clothing/accessory/armband/med = 4)
contraband = list(/obj/item/toy/plush/plushvar = 1,
/obj/item/toy/plush/narplush = 1)
- premium = list(/obj/item/clothing/suit/chaplainsuit/bishoprobe = 1,
- /obj/item/clothing/head/bishopmitre = 1)
refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
/obj/item/vending_refill/wardrobe/chap_wardrobe
machine_name = "ChapDrobe"
@@ -433,8 +417,7 @@
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/clothing/accessory/armband/medblue = 4,
- /obj/item/storage/backpack/genetics = 2,
- /obj/item/storage/backpack/satchel/gen = 2)
+ /obj/item/storage/backpack/genetics = 2)
refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe
/obj/item/vending_refill/wardrobe/gene_wardrobe
machine_name = "GeneDrobe"
@@ -455,7 +438,6 @@
/obj/item/clothing/accessory/armband/hydro = 4,
/obj/item/storage/backpack/satchel/vir = 2)
contraband = list(/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,
- /obj/item/clothing/head/plaguedoctorhat = 1,
/obj/item/clothing/mask/gas/plaguedoctor = 1)
refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe
/obj/item/vending_refill/wardrobe/viro_wardrobe
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index 98a5331b274..d4335680a51 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/admins.txt b/config/admins.txt
index 53b25ff1f20..5d12358889b 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -5,5 +5,6 @@
#If SQL-based admin loading is enabled, admins listed here will always be loaded first and will override any duplicate entries in the database.
#MarkSuckerberg = Development Head
+#rkz = Development Head
-#just use the database, this is deprecated
+# just use the database, this is deprecated
diff --git a/config/config.txt b/config/config.txt
index 0c8c28d3546..048fdddceab 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 LectroNyx
@@ -300,8 +293,6 @@ DISCORDURL https://discord.gg/ynY7MXHfbh
# 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 44e798943f6..ee0559d2500 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 0
@@ -467,9 +419,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
@@ -477,9 +426,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.
@@ -512,17 +458,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
@@ -531,12 +466,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
@@ -544,9 +473,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
@@ -559,9 +485,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
@@ -595,3 +518,7 @@ BLUESPACE_JUMP_WAIT 12000
## If admins are allowed to use the authentication server as a regular server for testing
AUTH_ADMIN_TESTING
+
+## HEART COMMENDATIONS ###
+## Uncomment this if you'd like to enable commendation pollings for this percentage of players near the end of the round (5% suggested)
+COMMENDATION_PERCENT_POLL 0.05
diff --git a/dependencies.sh b/dependencies.sh
index 6f5a61810a8..b702df60dac 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/AutoChangeLog-pr-3921.yml b/html/changelogs/AutoChangeLog-pr-3921.yml
new file mode 100644
index 00000000000..62a45a2aa2c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3921.yml
@@ -0,0 +1,4 @@
+author: Apogee-dev
+changes:
+ - {bugfix: the Derecho's missing APCs have been replaced}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3945.yml b/html/changelogs/AutoChangeLog-pr-3945.yml
new file mode 100644
index 00000000000..921cd380005
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3945.yml
@@ -0,0 +1,4 @@
+author: Thera-Pissed
+changes:
+ - {bugfix: chem dispensers take refined bluespace instead of polycrystal}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3954.yml b/html/changelogs/AutoChangeLog-pr-3954.yml
new file mode 100644
index 00000000000..a3023e73106
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3954.yml
@@ -0,0 +1,4 @@
+author: generalthrax
+changes:
+ - {bugfix: SG-8 fits in the holster like all the other energy pistols}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3960.yml b/html/changelogs/AutoChangeLog-pr-3960.yml
new file mode 100644
index 00000000000..4adc8464280
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3960.yml
@@ -0,0 +1,4 @@
+author: Erikafox
+changes:
+ - {bugfix: you should see the spur sprite a lot less}
+delete-after: true
diff --git a/html/changelogs/archive/2019-03.yml b/html/changelogs/archive/2019-03.yml
index b5fd83b8ae4..af4cd2063ff 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/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
index 9f6fd5a203a..9f9679a752b 100644
--- a/html/changelogs/archive/2024-07.yml
+++ b/html/changelogs/archive/2024-07.yml
@@ -20,3 +20,148 @@
- rscadd: Resprites the E-50 and gives it proper inhands now!
- bugfix: The Syndicate sniper rifle fires at a normal rate of fire and has the
correct recoil now.
+2024-07-09:
+ Apogee-dev:
+ - bugfix: N+S Captains no longer spawn with Nanotrasen coats.
+ - balance: reduced default ship spawn limit to 1.
+ - bugfix: Cargo pods no longer land in Talos maint
+ - bugfix: Gas tanks on the Talos have higher security
+ - bugfix: Talos now has an autolathe in cargo
+ Sadhorizon:
+ - rscadd: Added a plastic flower - a selection of flowers to wear. Added it to the
+ loadout too.
+ SapphicOverload:
+ - rscadd: Adds an igniter and button to the TEG of every ship that was missing one
+ - rscdel: Removed the welding tool TEG chute some ships had
+ SomeguyManperson:
+ - bugfix: loadout boxes will no longer sometimes not spawn
+ - code_imp: People who are stunned are now more reliably passed by bullets not aimed
+ directly at them
+ generalthrax:
+ - rscdel: Removed some irrelevant old tips of the round
+ - rscadd: Added 80+ new tips more relevant to Shiptest's gameplay loop
+2024-07-10:
+ Cloudbreak:
+ - bugfix: A few clothing items now properly display again for Vox.
+ meemofcourse:
+ - rscadd: Minor changes to the Tortuga.
+ - bugfix: The holofields on the Tortuga-class and Brawler-class now work.
+2024-07-11:
+ Cloudbreak:
+ - code_imp: Fixes a singular typo within the code.
+ Martinpachu:
+ - balance: Pizzas have become cheaper. (6000 cr - 3000 cr)
+ PositiveEntropy:
+ - bugfix: Mars and Venus are now referred to by their correct names!
+ - bugfix: You can now store guns, ammunition, and melee weapons on the armor slot
+ when equipping a SolCon/SolGov hardsuit, and its subtypes!
+ generalthrax:
+ - rscdel: Removed tator tots and raw potato wedges
+2024-07-12:
+ generalthrax:
+ - rscdel: Removed mice possession
+ - rscdel: Broad removal of forcesays from most reagents and items
+ - rscdel: Removed char reagent and spraytan overdose
+ - rscdel: Removed gibbering lines
+ - rscdel: Removed Chav, Swedish, Elvis mutations
+ - rscadd: The outpost is now offering bounties to defuse landmines to Frontier vessels.
+ meemofcourse:
+ - balance: Remapped the Valor, with two extra jobs (Shuttle Corpsman, Shuttle Pilot).
+ - code_imp: The Vanguard base outfit starts with gear.
+2024-07-13:
+ FalloutFalcon:
+ - bugfix: pets no longer cause run times trying to open ship doors
+ - bugfix: no longer have to reinsert your id into your wallet for access
+ - rscadd: A new generic nest used across all planets
+ - rscdel: Old portal and tendrils and other cruft
+ - refactor: refactorted mob spawners to have one for each planet
+ Gristlebee:
+ - bugfix: 357 guncase spawns with the correct revolver
+ Skies-Of-Blue:
+ - balance: you can now fit radios and pill bottles in both hoodies and winter coats
+ - bugfix: the innate storage on winter coats has been restored, alt click to access!
+ SomeguyManperson:
+ - bugfix: brute damage is now required to break bones
+ TiberianEuan:
+ - rscadd: Black hoodie with grey hood.
+ - imageadd: New hoodie icons.
+ cuddleandtea:
+ - admin: new light maker subtype for build mode
+ generalthrax:
+ - bugfix: Fixed the Landmine mission description and flavoured it a little
+ - balance: Decreased the amount of landmines required for its mission and increased
+ the value per mine slightly
+ - rscdel: Capsaicin no longer Boils you
+2024-07-15:
+ FalloutFalcon:
+ - refactor: refactored attachments to be modular
+ Sadhorizon:
+ - tweak: Changed sunskipper's prefix to SV.
+ - bugfix: Added a missing pipe to the sunskipper.
+ Skies-Of-Blue:
+ - rscadd: typing indicators now trigger off of the command bar
+ - rscadd: an SSD Indicator for when you have been disconnected for less than three
+ minutes
+ - balance: players will now remain awake for three minutes after disconnecting,
+ with a new SSD icon to boot!
+ - balance: players SSD longer than three minutes will lose their icon and fall asleep,
+ much like the previous behavior
+ SomeguyManperson:
+ - bugfix: gun cargo packs now act more as they would be expected to
+2024-07-17:
+ FalloutFalcon:
+ - rscadd: Orbit menu is less cluttered and just shows the real name, hovering over
+ it shows their standard name.
+ - refactor: refactored express console to not be a subtype of the cargo console
+ and replacing it.
+ Martinpachu:
+ - balance: Doubled the price on every automatic gun and added 250 credits to the
+ price of every semi-auto pistol.
+ Sadhorizon:
+ - tweak: Choice beacons were reflavored into choice boxes.
+ - rscdel: Removed a bunch of meme, weird and unused items from the loadout.
+ - tweak: Reflavored the Cybersun labcoat into a generic "translucent labcoat"
+ SomeguyManperson:
+ - bugfix: ships docked to eachother now share gravity
+2024-07-18:
+ Fest1v3:
+ - rscadd: adds a few vox sprites
+ - bugfix: fixes a few vox sprites
+2024-07-24:
+ DIB-DOG:
+ - bugfix: fixed the foodtype of two Gezenan drinks to match their descriptions
+ - rscadd: added a taste description to Keh'Lu'Tex Liqueur
+ Gristlebee:
+ - rscadd: Acquire Mission containers and Mission drills display their objective
+ type.
+ - rscadd: Changed name of base fish type to generic fish
+ SomeguyManperson:
+ - bugfix: the BG-16 is now as ammo efficient as the BG-12
+ - bugfix: the BG-16 has automatic fire again
+ generalthrax:
+ - balance: Undoubles the price on every automatic gun and removed 250 from the price
+ of every semi-auto pistol.
+2024-07-26:
+ Cloudbreak:
+ - rscadd: A new ruin, the Abandoned Listening Post.
+ - rscadd: Areas associated with the listening post.
+ - bugfix: Single line in maps catalogue.
+2024-07-27:
+ Gristlebee:
+ - rscadd: Marker beacons can now be printed at the autolathe from the Misc tab
+2024-07-31:
+ rkz, benbot(benjamin), Time-Green, SteelSlayer, floyd, Qustinuus, ArcaneDefence, FlowerCuco:
+ - rscadd: Food storage! Hide some glass in the captains cake! Begone digestive tract!
+ - rscadd: Bread, Cake and Spaghetti to Newfood
+ - rscadd: some smaller foods can now be eaten whilst on the run! (This ONLY applies
+ to newfood items thus far!)
+ - rscadd: converted edible component to work with newfood
+ - rscdel: oldfood for Bread, Cake and Spaghetti
+ - rscdel: Temporarily removes customfood bread, cake, pasta, and sandwiches
+ - tweak: edited a few messed up values
+ - tweak: food trash is sensible now. Finishing stuff like cake will actually spawn
+ a plate rubbish. Instead of you eating the plate, biggun, perhaps properly dispose
+ of it!
+ - bugfix: Wildly STUPID item weights. Candycorn and cakes are no longer the SAME
+ size
+ - code_imp: provides some semblance of sorting for signal defines
diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml
new file mode 100644
index 00000000000..722a5737762
--- /dev/null
+++ b/html/changelogs/archive/2024-08.yml
@@ -0,0 +1,234 @@
+2024-08-02:
+ FalloutFalcon:
+ - rscadd: New admin button to launch a distress announcement quicker.
+ Sadhorizon:
+ - tweak: Cafe latte, iced coffee, hot ice coffee and soy latte now only make your
+ character jitter on OD.
+ - tweak: Reduced the prices of first aid kits.
+ - tweak: Remapped the Kilo-class Mining Ship
+ SomeguyManperson:
+ - rscadd: legion attacks will now inject an organ which eventually causes a transformation,
+ rather than instantly killing and transforming people.
+2024-08-03:
+ Anticept:
+ - bugfix: Executing someone with a gun is back, you psychos. Paint the floor red!
+ Martinpachu:
+ - balance: 8x50 boxes now come with 25 ammo as opposed to 20.
+ Sadhorizon:
+ - tweak: Internals Crate now costs 100 credits and contains full oxygen tanks.
+ - tweak: Plasmaman Tank Kit renamed to Plasmaman Internals Crate. It now costs 100
+ credits and contains full plasma tanks.
+ SomeguyManperson:
+ - bugfix: mini/energy gun cases no longer spawn with the wrong weapon in them
+ - balance: gun attachments are now small instead of normal sized
+ Yata9ar4su:
+ - bugfix: Cash bundle value will now be correct in chat, cash will not drop upon
+ stacking
+ firebudgy:
+ - rscadd: New sprites for Vox! Vanguard and Honorable Vanguard Battlecoat sprite
+ changes, NGR hard hats, and hazard vests!
+ generalthrax:
+ - rscadd: Industrial jacket now keeps you warm
+ - bugfix: Contender is now called the Beacon in cargo
+ zimon9:
+ - rscadd: an anesthetics crate
+2024-08-04:
+ Apogee-dev:
+ - bugfix: Changed almost every player facing instance of the word "mech" to "exosuit"
+ - balance: Replaced syndie survival boxes in outfit datums with normal job-equivalent
+ boxes
+ FalloutFalcon:
+ - balance: nerfed legion money drops.
+ Gristlebee:
+ - rscadd: Sandbags can be deconed by click dragging them onto your mob.
+ - rscadd: Sandbags to the outpost for 150 credits.
+ Martinpachu:
+ - rscadd: Clips of all kinds (not magazines!) can now be produced on the autolathe.
+ - rscdel: Clip cargo packs, as they are now redundant.
+ PositiveEntropy:
+ - imageadd: Resprites muzzle flashes!
+ Sadhorizon:
+ - imageadd: Added directionals for mining processing consoles.
+ Thera-Pissed:
+ - bugfix: hydrogen and combustion bugs
+ Zevotech:
+ - balance: the Quirk Social Anxiety no longer silences you randomly
+ - bugfix: Stuttering is now far less extreme and will not delete characters
+ - bugfix: Psicodine now actually suppresses the effects of social anxiety
+ firebudgy:
+ - bugfix: Fixed three typos in the code.
+ phoaly:
+ - balance: Buffed LP hardsuits
+2024-08-07:
+ Sadhorizon:
+ - tweak: Remapped the Dwayne-class Long Range Mining Transport.
+ - rscadd: Added a random plushie spawner and a random moth plushie spawner.
+ Thera-Pissed:
+ - rscadd: Chlorine and Hydrogen Chloride gases! Wear your goggles!
+2024-08-10:
+ generalthrax:
+ - rscadd: Cleanbots now destroy cigarette butts, and dispense enough acid to do
+ so.
+ rye-rice:
+ - bugfix: indie sec hardsuit now shows up
+2024-08-11:
+ firebudgy:
+ - rscadd: Sprites for several different kinds of scarves for Vox!
+ - rscadd: Additional sprites for several other items for Vox, such as chest-high
+ towels and hazard jackets.
+ - rscadd: Created onmob_neck_vox.dmi file, plus enabled support for it.
+ generalthrax:
+ - bugfix: Fixes the Industrial Jacket to be warm (For Real)
+ phoaly:
+ - balance: Talos Corpsman has been readded with a different medkit loadout.
+2024-08-16:
+ OrionTheFox:
+ - rscadd: Suit Storage Units now provide feedback when Decontamination fails to
+ activate
+ - imageadd: Suit Storage Units now have a visible red light when Locked - when hacked,
+ Decontamination now has a red-yellow flashing light to distinguish from the
+ Locked light.
+2024-08-18:
+ Cloudbreak:
+ - rscadd: Frontiersman sprites for the Vox!
+ Gristlebee:
+ - bugfix: water turfs reagent scooping
+ - code_imp: span classes to span macros
+ - refactor: acid turfs repathed under water
+ - refactor: Pouring out a reagent container is now bound to disarm intent instead
+ of help intent.
+ - rscadd: Examine hints for flipped tables
+ - bugfix: You can no longer phase through a flipped table.
+ meemofcourse:
+ - bugfix: Hardliner troopers should no longer spawn as Hardliner pilots
+2024-08-20:
+ Aquidu:
+ - bugfix: Fixed a bug relating to literal spaghetti code.
+ zimon9:
+ - bugfix: fixed a short on the Shetland
+2024-08-21:
+ FalloutFalcon:
+ - rscadd: Added var to let admins bypass do_teleport vlevel restriction
+ Sadhorizon:
+ - bugfix: Ranged frontersman with internals now drops the correct revolver type.
+2024-08-22:
+ rye-rice, Imaginos16:
+ - rscadd: Adds new belt sprites
+2024-08-23:
+ retlaw34, rye-rice, Apogee-dev:
+ - rscadd: Adds CLIPs weapons
+ - rscadd: Adds the New Frontiersmen weapons
+ - rscadd: 556 ammo box to cargo
+ - rscadd: inteq sprites should look better
+2024-08-24:
+ generalthrax:
+ - rscdel: Removed a bunch of random items from fitting in wallets (notably screwdrivers,
+ cigarettes, suture / mesh / gauze)
+ - rscadd: Ship keys and derringers can now fit in wallets
+2024-08-26:
+ Aquidu:
+ - rscadd: Rations now have icons that help show the contents.
+ - rscadd: Condiments and drink mixes now have colors when full to help show the
+ contents.
+ - rscadd: Unique sprites for the ration heater, drink packs ration drinks, and "side"
+ category rations.
+ - code_imp: Changes the sound effect for opening the drink ration to the bottle
+ cap sound to line up with the icon.
+ DIB-DOG:
+ - rscadd: Added a standard vest to the armory office locker
+ - rscadd: Added a Security camera console to the bridge
+ - balance: Silkenweave jackets and Betzu hats now provide cold protection but no
+ armor
+ - balance: Crying Sun now has 4 combustion/2 ion engines instead of 2/4
+ - bugfix: Fixes turrets on the Crying Sun and its subshuttle, the Nail.
+ FalloutFalcon, MrSamu99, Fikou:
+ - rscadd: a few shipments of MOD control units have found there way to the frontier,
+ premium versions of existing hard suits with the latest tech!
+ - rscadd: Ported modsuits from tg, no mapped stuff yet
+ Gristlebee:
+ - balance: Durand shield consumes less charge on being hit, passive drain increased.
+ - bugfix: Mechs consume the correct amount of power on movement.
+ - refactor: normal_step_energy_drain is now base_step_energy_drain
+ - rscadd: Grills can now cook food.
+ - rscdel: Xeno-energy working as grill fuel.
+ - balance: Outpost food costs
+ - bugfix: Grills
+ Ms-Mee:
+ - bugfix: fixed handle_quirk_conflict behavior
+ Sadhorizon:
+ - bugfix: Gloves now show up in the loadout preview.
+ - rscadd: Brown gloves were added to the loadout.
+ - tweak: Moved everything out of autolathe contraband - you no longer have to hack
+ it, ever.
+ - rscdel: Removed foilhat, flamethrower, electropack, .357 casing and slime scanner
+ from the autolathe.
+ - rscadd: Added a bunch of new items to the loadout.
+ - tweak: Changed the description of red suspenders.
+ - rscadd: Ihejirka space outpost now has player-accessible cryogenics.
+ SomeguyManperson:
+ - balance: wormholes on the overmap no longer decay when used
+ Thera-Pissed:
+ - code_imp: TEG efficiency now depends on temperature delta.
+ Vekter:
+ - bugfix: Removed an extra fire extinguisher from the crew quarters on the IRMV
+ Talos.
+2024-08-27:
+ Baystation12, Kapu1178, rye-rice:
+ - rscadd: Particles!
+ - rscadd: Bleeding has better feedback
+ - rscadd: Bone breaking now has sound effects
+ - rscadd: Getting shot now throws blood squirts! Live through the somme for REAL
+ this time!
+ - balance: gibbing no longer destroys your chest, no more legion transfers!
+ - bugfix: Lava particles should no longer destroy your FPS
+ FalloutFalcon:
+ - balance: Ballistic weapons now have a minimum camera shake.
+ - bugfix: Gunslinger now functions as intended.
+2024-08-28:
+ Anticept:
+ - bugfix: Adjusted the Box Hospital Ship's engineering layout so that it's less
+ jank, and the power system doesn't loop on itself anymore.
+ FalloutFalcon:
+ - rscdel: Removed blob and alot of stuff close to blob
+ Gristlebee:
+ - rscadd: Weapon cells can be inserted directly into weapon chargers to charge them.
+ - bugfix: e40s not charging in weapons rechargers.
+ firebudgy:
+ - bugfix: Medical Examinations via Flashlight is now an option again. Check eye
+ health or see what's in someone's mouth!
+ meemofcourse:
+ - rscadd: Vox lore blurb
+ - bugfix: Inconsistent capitalization when speaking due to guestbook
+ - code_imp: Changed how the game recognizes Vox and Sarathi age
+ thgvr:
+ - imageadd: Kepori hardsuits now have a fallback icon
+2024-08-29:
+ Apogee-dev:
+ - balance: SUNS and SolCon armor now uses standard armor rather than bulletproof
+ - balance: Normalized armor values between various faction helmets, coats, and vests
+ - balance: Armored coats now provide armor protection for the chest and groin only;
+ environmental protection unchanged
+ - bugfix: removed armor from some overlooked berets and soft hats
+ - refactor: Renamed the Mauler exosuit and several exosuit weapons to avoid confusion
+ Gristlebee:
+ - rscadd: Black Market Stock Cycling and item weighting
+ - rscadd: New black market stock
+ - rscadd: Tech and Ammo tab
+ - rscadd: Dead Drops
+ - rscadd: LTRSBT moved to the Black Market Catalogue
+ - rscadd: LTSRBT Crafting Recipe, 2 BS crystals, a bank card, 5 duct tape, a circuit
+ board and a network card
+ - rscadd: Reflavours the disco grenade
+ - rscadd: variable for powercells to show if they're rigged
+ - rscdel: Some old blackmarket stock
+ - balance: LTRSBT shipping cost up to 100 credits
+ - balance: Launch delivery more reliable
+ - bugfix: Powerfist works again
+ - spellcheck: fixed a few typos in the black market
+ - code_imp: Dynamic Overmap encounters store what ruins were spawned
+ - code_imp: get_block_portion and get_position_in_margin methods in mapzones.dm
+ - code_imp: Pair items now handled by a list
+ - refactor: Black Market item stocking
+2024-08-30:
+ meemofcourse:
+ - rscadd: Character slots have been raised to 40. BYOND members get 50.
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
new file mode 100644
index 00000000000..52b3cbfbf67
--- /dev/null
+++ b/html/changelogs/archive/2024-09.yml
@@ -0,0 +1,220 @@
+2024-09-04:
+ generalthrax:
+ - balance: E-40 is now slightly less expensive
+2024-09-05:
+ Apogee-dev:
+ - balance: Removed electrical insulation from all gloves except insulated gloves
+ - balance: Removed siemens coefficient from hardsuits, except for engi atmos and
+ CE
+ - balance: Added siemens coefficient to engineer space suits
+ - balance: Replaced combat gloves with insulated gloves for some factions' engineer
+ lockers
+ Zevotech:
+ - bugfix: winter biodome and buried shrine ruins no longer have an egregious amount
+ of creature burrows
+ zimon9:
+ - bugfix: fixed typepath for 10mm rubber rounds
+2024-09-07:
+ Martinpachu:
+ - rscadd: To-do once i get the proper names and all
+ Zevotech:
+ - bugfix: The "pulse carbine" in the sandplanet saloon has a sprite again
+ - tweak: Added some extra mobs to the sandplanet saloon to balance out the money
+ in it
+ meemofcourse:
+ - spellcheck: Human generic names (the ones that show up when you examine someone)
+ will be prefixed consistently
+2024-09-09:
+ Gristlebee:
+ - rscadd: Adds the Mauler, Spitter, and Pounder to the black market
+ ZephyrTFA:
+ - server: CDN fully operational again after noticing an incorrectly absolute relative
+ path
+2024-09-10:
+ Apogee-dev:
+ - balance: Made security hardsuits faster and blood-red hardsuits slower
+ - balance: Normalized some weird hardsuit speed outliers
+ - bugfix: NT captain gloves no longer lie about shockproofing
+ - balance: Reduced hollowpoint damage by 5 (and 8mm Hollowpoint by 6)
+ FalloutFalcon, MrMelbert, Coiax:
+ - code_imp: ported alot tg botany code along with gene desc and icons to be used
+ more soon
+ - refactor: moves most plant effects into genetics stuff
+ Gristlebee:
+ - rscadd: Bandolier auto-loading and examine hint
+ - rscadd: Welders/Plasmacutters now deal damage to wall integrity to decon
+ - rscadd: Plasmacutters are now engineering tools and fit in toolbelts. They can
+ damage ores into slag if used to mine. They are now researched with plasma technology
+ and advanced plasma technology.
+ - rscadd: Plasmacutters to cargo for 1250
+ - rscadd: Adds plasmacutters to the Mudskipper, Riggs, Talos, Gecko, Heron, Osprey,
+ Ranger, Hyena, Komodo, Shetland and Twinkleshine
+ - rscdel: Plasmacutters extra mining range
+ - bugfix: Plasmacutters can repair prosthetic limbs like welders
+ - code_imp: Moves damage behavior of concrete walls to closed turfs. Basic walls
+ are now repaired with a welder.
+ - code_imp: R-walls d-state tied to their integrity. R-walls can be deconstructed
+ with plasmacutters.
+ - code_imp: Crate decon checks for tool behavior rather than a istype check
+ - rscadd: Gun safeties can be toggled from 1st level storage slots.
+ zimon9:
+ - rscadd: Adds a rubbershot box to the outpost market
+2024-09-11:
+ FalloutFalcon:
+ - rscdel: Removed sheetz. Feel free to send me threats for this crime!
+ - rscadd: Added faction datums, this will be cool soon!
+ Sadhorizon:
+ - rscdel: Removed a lot of cruft from the loadout.
+ - rscdel: Removed flamethrower slapcrafting.
+ - rscdel: Removed the Tribal crafting tab (some items were moved to other tabs).
+ - rscdel: Removed bone club, skull helmet and bone armor from the bone construction
+ menu.
+2024-09-13:
+ retlaw34, rye-rice, Apogee-dev, generalthrax, Tamamitsune, Nitha(emotional support):
+ - rscadd: Scarborough Arms for every syndicate faction
+ - rscadd: New sounds for the commander
+ - balance: scout's price has been reduced slightly
+ - rscdel: Donksoft toy guns
+ - bugfix: You can no longer attach shit to revolvers
+2024-09-14:
+ FalloutFalcon:
+ - bugfix: no emergency for floor lights untill someone adds a sprite for them!
+ Gristlebee:
+ - rscadd: Adds binocs, lavaproof rods, gps, deep core mining scanner, anomaly neutralizer
+ to exploration cargo
+ - rscadd: You can hit veins with a deep core scanner on harm intent to stop it tracking,
+ and hit it again to readd it.
+ - rscadd: Deep core scanner fits in explorer webbing and explorer suits.
+ - balance: Outpost Cargo exploration tab
+ MemeSnorfer:
+ - rscdel: Removed forced emotes from most reagents.
+ ToasterBiome:
+ - bugfix: Centcom Ban DB is now accessible again through PP
+2024-09-15:
+ FalloutFalcon:
+ - rscdel: Removed useless vars
+ Gristlebee:
+ - rscadd: Unsaftied guns can go off on their own.
+ - code_imp: Changes ammo casing firing code so it's able to work without a user.
+ Zevotech:
+ - bugfix: Certain Subshuttle engine prechargers have now been correctly rotated.
+2024-09-16:
+ Gristlebee:
+ - bugfix: Misfires no longer have 100% chance
+2024-09-18:
+ Bjarl:
+ - rscadd: You can now purchase concrete mix at the outpost. For concrete making.
+2024-09-19:
+ FalloutFalcon:
+ - code_imp: ctf machines now only process while ctf is running
+ Rye-Rice, Gristlebee:
+ - rscadd: Comfortable Temperature ranges
+ - imageadd: Temperature HUD alerts
+2024-09-21:
+ Bjarl:
+ - rscadd: The PGF now has it's own turret offerings. They come in light, normal,
+ and heavy flavor.
+ FalloutFalcon:
+ - code_imp: added ruin tags to ruin map templates to be used soon for stuff.
+ Gristlebee:
+ - rscadd: Inteq wintercoats and hoodies in the Talos, Colossus, Vaquero and Valor
+ uniform lockers
+ PositiveEntropy:
+ - rscadd: A new and refurbished Elite Syndicate suit has just been unveiled!
+ Sadhorizon:
+ - rscadd: Added "ballistic goggles" - new indie security clothing item.
+ - imageadd: Added Kepori bulletproof helmet sprites.
+2024-09-22:
+ Bjarl:
+ - code_imp: Ship Turrets can now be attached to control consoles outside the area
+ they are in. please look at ship maps for examples on how.
+ - rscadd: Every single ship with turrets now does the above
+ PositiveEntropy:
+ - rscadd: Gorlex Splinters now have winter coats!
+ Sadhorizon:
+ - bugfix: Panacea-class is no longer an independent ship.
+2024-09-23:
+ Bjarl:
+ - rscadd: You can now buy flares at the outpost
+ - rscadd: Wasteplanets now will generate concrete filled caves.
+2024-09-24:
+ Apogee-dev:
+ - balance: Changed decoration on Miskilamo ships to look similar to each other
+ - balance: reduced Kilo starting funds to 1500
+ - bugfix: fixed wires on Mudskipper
+ Bjarl:
+ - bugfix: turrets will now _actually_ connect to their console. i swear im a real
+ coder.
+ FalloutFalcon:
+ - code_imp: bunch of code organization related to melee
+ - refactor: cleaned up a bunch of melee items to have better inheritance and paths
+ PositiveEntropy:
+ - imageadd: Resprites all balaclavas!
+ Thera-Pissed:
+ - rscdel: unused did_fire var
+ - rscdel: B.E.P.I.S. and related tech nodes.
+ rye, erika:
+ - rscadd: concrete jugs have been replaced by much more appropriate concrete bags,
+ jee, i hope whoever made *that* blunder got fired.
+ thgvr:
+ - balance: Colossus now only has 2 recruit slots instead of a whopping !!5!!
+ - rscadd: A bunch of kepori underwear have sprites now
+ trazodont:
+ - bugfix: miso soup spelling error
+ zimon9:
+ - rscadd: Adds a bit more contrast to the output of health analyzers
+2024-09-25:
+ Jedi-Toothpaste:
+ - bugfix: Added windows to the mudskipper and shetland's engines.
+ - bugfix: Adjusted the blast doors which open on the Shetland's engines.
+ SomeguyManperson:
+ - bugfix: sawn off illestren/improvised shotgun stats are now consistent if they
+ are spawned in
+2024-09-26:
+ FalloutFalcon:
+ - rscadd: Added new blank shells for training drills!
+ - refactor: Minor refactor of design disks to reduce repeated code
+ - rscadd: Ballistics now have a minimum recoil, not enough to mess up your shot!
+ - bugfix: ships now start closed. shiptesters be writing there memos and ship names.
+ - rscadd: You can now see ships in the orbit menu and its alot prettier!
+ - code_imp: ported tg points of interest and a much improved orbit menu
+ Gristlebee:
+ - bugfix: fixes wall deconstruction causing runtimes
+ Jedi-Toothpaste:
+ - bugfix: Fixed the lack of windows for the Kilo's Thrusters, and fixed the broken
+ link for the new blast doors.
+ generalthrax:
+ - balance: Most common accessories now fit on pants
+ - rscadd: Exosuit Recharger machines are now available from cargo
+ - balance: Rust Reds on the blackmarket are now available to a maximum of 3
+ zimon9:
+ - rscadd: Added fruit puree to vegan rations
+ - rscdel: Removed pizza crackers from vegan rations
+2024-09-27:
+ Jedi-Toothpaste:
+ - rscadd: Firelocks to the Valor-Class' Doors
+ - rscadd: Lighting to dark areas on the Valor-Class' Doors
+ - rscadd: New areas on the Valor-Class to seperate rooms
+ - rscadd: Added APC for the Surgical Area
+ PositiveEntropy:
+ - imageadd: Adjusts the inner part of the normal rabbit ears.
+2024-09-28:
+ Sadhorizon:
+ - rscadd: Added a fax machine to the Dwayne-class.
+ SomeguyManperson:
+ - bugfix: legion skulls will no longer check if they should rise up and consume
+ their owner if they are ownerless
+2024-09-29:
+ fighterslam:
+ - balance: Modernizes and slightly buffs the Ranger.
+2024-09-30:
+ Bjarl:
+ - rscdel: The Elephant Graveyard ruin has been taken out back
+ - bugfix: m90 posters are real again
+ FalloutFalcon:
+ - bugfix: sawnoff weapons made from init now function correctly
+ - bugfix: condiment packs are no longer invisible and missing names
+ MassiveMen:
+ - rscadd: Added the fire axe to the black market uplink
+ Thera-Pissed:
+ - rscadd: New wasteplanet ruin, the abandoned Miskilamo shipbreaking yard!
diff --git a/html/changelogs/archive/2024-10.yml b/html/changelogs/archive/2024-10.yml
new file mode 100644
index 00000000000..00628fe7d83
--- /dev/null
+++ b/html/changelogs/archive/2024-10.yml
@@ -0,0 +1,462 @@
+2024-10-01:
+ Erika Fox:
+ - rscadd: Anti-Radiation Foam is now available at the outpost
+ - code_imp: Fireaxe cabinets have been repathed, and now function as a more general
+ cabinet object. please report any inconsistencies with behavior
+ Sadhorizon:
+ - tweak: You can now put knives in secbelts and the subtypes of secbelts.
+ - bugfix: You can now fit all knives in mining webbings.
+ SomeguyManperson:
+ - bugfix: hallucinations can no longer be permanent unless treated
+2024-10-02:
+ Bjarl:
+ - rscadd: One-Shot Rocket Launcher. A quick solution to an armored problem.
+ - rscadd: You can now scribble profane things onto the tube of your rocket launcher.
+ Use this power wisely.
+ - imageadd: 'Rye: A sprite for a one-shot rocket launcher'
+ generalthrax:
+ - balance: Molotov cocktails now create turf fires
+ - balance: Hearthwine now create turf fires in a 3x3 area
+ tmtmtl30, Thgvr:
+ - rscadd: Added bunkbeds, which can now be crafted with metal or placed by mappers.
+ - bugfix: Beds facing alternate directions now correctly support people buckling
+ to them and bedsheets being placed on top of them.
+2024-10-03:
+ Bjarl:
+ - bugfix: defibs now work again.
+2024-10-05:
+ Bjarl:
+ - rscadd: A cargo ship happened to lose an entire crate of Hammer Rocket Launchers
+ while travelling through the system. We have reason to believe they're probably
+ on sale now.
+ - rscdel: you can no longer purchase PML-9s on the black market.
+ Gristlebee, Rye-Rice, INFRARED_BARON:
+ - rscadd: Inteq Gygax and mech charges
+ - rscadd: Paladin shield backlash
+ - bugfix: Durand shield blocking all projectiles
+ - imageadd: Inteq Gygax sprites
+ Jedi-Toothpaste:
+ - rscadd: Added extra intercoms in high traffic areas on the Valor Class
+ - rscadd: Added Firelocks underneath the Cargo-Bay Doors on the Valor Class
+ - rscadd: Air Alarms, Scrubbers and Vents to every applicable room
+ MemeSnorfer:
+ - rscadd: Three new Elzuose horn types. Cervid, Prong, and Brow
+ PositiveEntropy:
+ - imageadd: Waste Planet Turfs Now Look Much More Refined!
+ Thera-Pissed:
+ - rscadd: pipe dispenser UI is now similar to rapid pipe dispenser UI.
+ generalthrax:
+ - balance: Replace red insuls with yellow insuls in syndicate toolboxes
+ zimon9:
+ - bugfix: fixed the waste and scrubber gas reclamation filters on the colossus
+2024-10-06:
+ Apogee-dev:
+ - balance: removed one recruit slot from the vaquero
+ - rscadd: Added Nanotrasen Harrier-class cruiser
+ - rscdel: Removed Osprey-class cruiser
+ - rscdel: Removed Skipper-class cruiser
+ - balance: increased mudskipper limit to 2
+ - balance: cut a deckhand slot from kilo
+ Bjarl:
+ - rscadd: IRMG engineers have rolled new turrets out into the frontier. Please report
+ back on their effectiveness. Unless you have been shot. Then you should be dead.
+ - rscadd: Sharplite has produced a line of turrets for Nanotrasen, which is now
+ mounting them on relevant vessels.
+ Sadhorizon:
+ - bugfix: Komodo Bridge Officer is now actually an officer.
+ SomeguyManperson:
+ - rscdel: missions will no longer request capturing ice demons
+ Thera-Pissed:
+ - rscadd: angle grinders for salvage
+ - rscadd: reworks plasma cutters for salvage
+2024-10-07:
+ Aquidu:
+ - code_imp: Changes flameless ration heaters to "small" items
+ - code_imp: Adds flameless ration heaters to the ration pack item whitelist.
+ thgvr:
+ - imageadd: Some backpack sprites for Kepori
+ - imageadd: Shrunk down the sprite of guncases
+2024-10-08:
+ Anticept:
+ - rscadd: Added more purchasable chemicals to outpost.
+ - rscadd: Added missing elemental chems to chem starter kit
+ - rscdel: removed sulfuric acid from chem starter set. You have to make it.
+ - imageadd: tweaked and added more elemental chemical jugs.
+ Bjarl:
+ - code_imp: A large amount of cruft has been deleted.
+ DrCrawler:
+ - rscadd: Gives IPCs a little more adjectives to work with.
+ - rscdel: Removed some duplicate adjectives from the raw file.
+ FalloutFalcon:
+ - code_imp: tweaks to the syntax of unit test logs to be more readable by humans
+ and flaky tests
+ FalloutFalcon, Mothblocks, Cyberboss:
+ - rscadd: retry failed unit tests.
+ PositiveEntropy:
+ - imageadd: We now have improved visuals for circuit boards!
+ Sadhorizon:
+ - rscadd: Cybersun Biodynamics stamp.
+ - rscadd: Cybersun secret documents.
+ - rscadd: Cybersun captain's safe.
+ SomeguyManperson:
+ - balance: you no longer need a lasso to ride a goliath
+ - rscdel: no more lasso
+ rye-rice, Imaginos16:
+ - rscadd: Resprites Wisp
+ thgvr:
+ - bugfix: fixed digitigrade combat/jackboots
+2024-10-09:
+ PositiveEntropy:
+ - imageadd: Dog Beds Now Look Fancier!
+ - imageadd: Tank Dispensers have been repaletted!
+ - imageadd: Nuclear Waste Barrels Look A Lot Better!
+ Sun-Soaked:
+ - rscadd: Boxes are now volumetric. Some special boxes have been adjusted.
+ - balance: small objects in volumetric storage are now slightly smaller
+ zimon9:
+ - rscadd: Added flamethrower crate
+ - rscadd: Added incendiary grenade crate
+ - rscdel: Removed incendiary supply crate
+2024-10-10:
+ Bjarl:
+ - bugfix: Turrets should now actually fire at their defined fire rates.
+ - balance: Factional turrets now have new damage thresholds
+ - balance: ship turrets now have 100 less integrity by default
+ FalloutFalcon:
+ - rscadd: Cats have been genetically engineered to detect radiation
+ Gristlebee:
+ - rscadd: PGF Rakalla space suits can hold a gun in their suit storage.
+ PositiveEntropy:
+ - imageadd: Long (And Short) Braid hairstyles have been redone!
+ zimon9:
+ - rscadd: Adds bowmans to Artificer and Enforcer loadouts, and regular headsets
+ to Recruit loadouts
+2024-10-11:
+ Bjarl:
+ - rscadd: Reports of people inflicted with congenital analgesia travelling to the
+ Frontier have reached this newscaster.
+ - rscadd: Painkillers may circumvent pain in some cases now.
+ - rscadd: Please remember to ensure your soul is filled with spite before kicking
+ a rack.
+ - code_imp: abandoned airlocks now have more effects
+ FalloutFalcon:
+ - rscadd: Readdes world icons for a few knives. Expect more soon!
+2024-10-13:
+ FalloutFalcon:
+ - rscadd: update path txt for ammo boxes, thgvr will be FIRED for forgeting this.
+ Imaginos16, rye-rice:
+ - rscadd: A few hairstyles have been resprited!
+ - rscdel: the Braided and Braid line of hairs.
+ thgvr:
+ - rscadd: Added bullet stacks, they allow you to stack ammo of the same type into
+ a group.
+ - balance: Changed old ammo boxes into storage items containing stacks of bullets
+ zimon9:
+ - bugfix: fixed halved throw range
+2024-10-14:
+ Spooky, PositiveEntropy:
+ - imageadd: Smartfridges and Booze-O-Mats have been resprited!
+2024-10-15:
+ Erika Fox:
+ - rscadd: Transfusion anomaly; yum! Blood!
+ - rscadd: Anomaly cores now have an effect when detonated out of the anomaly
+ - rscadd: new anomaly description fluff
+ Gristlebee:
+ - bugfix: Abandoned Miskilamo Shipbreaking Yard ruin has the correct revolver subtype.
+ - bugfix: Shipping dock ruin correctly has a rattlesnake instead of a ringneck case
+ Sadhorizon:
+ - rscadd: Added stamps for New Gorlex Republic.
+ - rscadd: Added secret documents for New Gorlex Republic.
+ - rscadd: Added a honorable corpsman stamp and tweaked honorable arti one.
+ - rscadd: Inteq ships now use inteq stamps.
+ - code_imp: Repathed IRMG and CLIP stamps.
+ firebudgy:
+ - bugfix: War Correspondent helmet has a proper sprite for Vox.
+ rye-rice:
+ - rscadd: Various sprite improvemnts
+ - bugfix: Boomslang no longer fits on the belt
+2024-10-16:
+ Anticept:
+ - bugfix: blood smart-fridge selectable on smartfridge boards now when screwdrivering
+ them.
+ Apogee-dev:
+ - balance: Valor and Vaquero have combat hardsuits for their enforcers now
+ Bjarl:
+ - rscadd: NGR turrets
+ - rscadd: Flipped tables actually let you throw things over them now.
+ - rscadd: Holofans now have a small window before shutting down if they are deactivated
+ by lack of power
+ - balance: Syndicate smokes are now laced with stimulants instead of omnizine.
+ - rscdel: Holoparasites
+ - rscadd: The Frontiersmen have duct taped some turrets of their own together
+ FalloutFalcon:
+ - bugfix: ghosts cannot duplicate themselves across multiple z levels.
+ Gristlebee:
+ - bugfix: Fixes walls and an enemy spawn in the Wrecked Factory
+ Sadhorizon:
+ - bugfix: Pubby ruin can no longer randomly have acid in airlocks.
+ - tweak: Syndicate soap is now in-line with NT soap.
+ - rscdel: Syndicate tools are no longer faster. They are just reskinned normal tools
+ now.
+ - rscdel: Syndicate toolbox lost it's damage buff.
+ - rscdel: Removed Karl Marx from the game.
+ - rscdel: Removed all the job statues.
+ - rscdel: Cardborg suit, human, gondola and monkey skinsuits are no longer craftable.
+ firebudgy:
+ - bugfix: Mudskipper windows are correctly reinforced, like other ships by the same
+ manufacturer.
+ - rscadd: Active smoking pipe sprites for Vox.
+ zimon9:
+ - balance: increased amount of plasma in plasma internals cargo crate
+ - balance: rebalanced the probability of a grenade going off in one's hands
+ - bugfix: fixed fauna spawning after drill malfunctions
+2024-10-17:
+ Bjarl:
+ - rscdel: South Bronx Paradise Bar
+ Gristlebee:
+ - rscadd: Ice Lodge Ruin Map and areas
+ - rscadd: Simple Mob Frontiersmen Flametrooper and Surgeon
+ - rscadd: shoot_point_blank option for simple mobs
+ - rscadd: dragon_fire_line supports igniting tiles
+ - rscadd: broken display case, gunpowder barrel, SRM corpse spawners, chemical jug
+ spawners
+ - rscdel: Cat Butcher
+ - bugfix: Frontiersmen simplemob pathing
+ - bugfix: Fence doors spawning open when they should be closed and vice versa
+ - code_imp: scattering can be disabled with auto_scatter var for bullets, grown
+ items and nutrient bottles
+ - bugfix: Shotgun calibers and shotguns being unable to load certain rounds
+ MemeSnorfer:
+ - imageadd: Resprites colored skirts, black tango, red evening gown, sailors dress,
+ sundress, white dress, and some suitskirts.
+ - rscadd: Six pinafore variants, white colored skirt, one shoulder dress, and iko-ikssoal
+ dress.
+ PositiveEntropy:
+ - imageadd: All colored jumpsuits have been resprited!
+ - rscdel: Rainbow and khaki jumpsuits (including the buster subtype) have been removed.
+ generalthrax:
+ - bugfix: Gezena has shoes again
+ - rscdel: Gezenan captain gloves no longer have partial insulation in parity with
+ other captain gloves.
+2024-10-18:
+ DIB-DOG:
+ - rscdel: Removed extra turret that wasn't supposed to be on the ship
+ - bugfix: Moved armory flashbangs to a more secure location
+ Erikafox:
+ - rscdel: Wasteplanets no longer spawn welding fuel tanks.
+ SomeguyManperson:
+ - balance: being thrown over lava by tackling, jump boots, or with assistance now
+ fully clears the lava instead of burning you horribly and setting you on fire
+ generalthrax:
+ - bugfix: Fixed a typo in the Frontiersman softcap that made the sprite go invisible
+ meemofcourse:
+ - rscadd: Atlas-class Light Armored Crusier
+ rye-rice:
+ - rscadd: Resprites the commander and Commissioner
+2024-10-19:
+ Apogee-dev:
+ - balance: Reduced Cobra-20 magazine size to 24 rounds
+ - bugfix: removed a typo from Scarborough cargo catalog entries
+ Erikafox:
+ - rscdel: Xenobiology (minus slimes)
+ - code_imp: pre-weld and pre-sealed airlock helpers for maps.
+ FalloutFalcon:
+ - rscadd: Autolathes can now print space heater boards.
+ - bugfix: examine on ammo casings now properly hint that you can write on them
+ Gristlebee:
+ - rscadd: Bullets can have a message written on them.
+ NithaIsTired:
+ - rscadd: Adds a ton of audible emotes and visible emotes like snapping your fingers
+ or twitching
+ - rscadd: You can boop people on the nose by clicking on their mouth with help intent
+ - rscadd: Sound variation with a few emotes like snapping and clapping
+ - rscadd: Laying down now plays a sound if you aren't on walk intent
+ Orchidthederg:
+ - bugfix: fallback sprite for dust storms was set to the carp sprite for some reason.
+ - imageadd: fancy new carp, meteor, and electrical storm
+ - imagedel: old carp, meteor, and electrical storm sprites
+ Spookywastaken:
+ - imageadd: Handrails have been resprited!
+ generalthrax:
+ - balance: E40 hybrid rifle ballistic mode now shoots faster
+2024-10-20:
+ FalloutFalcon:
+ - balance: blind people can examine twice as fast
+ - code_imp: makes defines for the two primary atoms requirement lists
+2024-10-21:
+ Apogee-dev:
+ - balance: Made Komodo aspawn
+2024-10-22:
+ Imaginos, Erika:
+ - rscadd: The Pan Gezenan Federation has sent out shipments of boarding cutlasses
+ to the Frontier. Expect cool doohickeys on your friendly neighborhood PGF Vessel
+ - imageadd: 'Imaginos: PGF sord sprites'
+ - code_imp: sabres now take up less space in code
+2024-10-23:
+ Erikafox:
+ - bugfix: Hallucination Anomalies will stay on their tile now.
+ - rscadd: You can now fax credit holochips
+ - bugfix: Analgesia can no longer be taken with self-aware
+ - bugfix: Few edge cases for analgesiacs getting pain
+ FalloutFalcon:
+ - bugfix: ammo
+ - refactor: refactored ammo types to not be snowflaked when handling spawning subtyped
+ guns
+ FeenieRU:
+ - code_imp: Changing qdel() and SSgarbage procs
+ - code_imp: rewrite /Destroy(force, silent) to /Destroy(force)
+ Sun-Soaked:
+ - rscadd: Directional Mines, implemented as Claymores.
+ - rscadd: Mines now have World Icons
+ - balance: explosions now only strip to space when a tile is already damaged
+ - bugfix: Prox mines explode from slightly further away & no longer activate through
+ walls.
+ - bugfix: Multiple mines can no longer be stacked on a tile
+ - code_imp: fire_casing() can now be called by non-mobs, allowing objects to shoot
+ casings.
+ - bugfix: cleans up mine wire datums on mine deletion
+ generalthrax:
+ - rscadd: Added Stamped Steel Machetes, 5 for 500
+ meemofcourse:
+ - rscadd: A lot of ERTs and ERT remasters, including Fronties, Ramzi, PGF, NGR,
+ Indies and whatnot
+ - rscdel: Most Nanotrasen ERTs have been shelved pending assets
+ - rscdel: Smokebomb randomized descriptions
+2024-10-24:
+ Erika Fox:
+ - rscadd: An abandoned tradepost has been located in the system. Investigate nearby
+ waste worlds for more information.
+ - rscadd: preburnt flares
+ Erikafox:
+ - rscadd: Kasagi-Fischer has begun a new production run of the venerable Raleigh-class
+ Corvette. See your purchaser's manual for more information!
+ - balance: Fireaxes on the black market now cost less. Thanks Kiirv-Waha!
+ FalloutFalcon:
+ - code_imp: better pr labeling for ships and ruins
+2024-10-25:
+ Erikafox:
+ - bugfix: Newscasters can now read IDs through a wallet.
+ FalloutFalcon:
+ - refactor: refactored some mapping stuff including random spawners!
+ Gristlebee:
+ - rscadd: Vote sound changed to announce_dig.ogg
+ MemeSnorfer and Moffball:
+ - imageadd: Snouted balaclava sprites for both Sarathi and Elzuose
+ - code_imp: Elzuose snout type, for use with mask sprites
+ Sadhorizon:
+ - tweak: Medical stacks now work on corpses.
+ SomeguyManperson:
+ - balance: simple humans now have as much health as normal humans! This makes them
+ weaker!
+ - balance: simple humans now also benefit from their armor as much as normal humans!
+ This makes them stronger!
+ generalthrax:
+ - bugfix: Design disks work again
+ thgvr:
+ - balance: Removed Kepori damage modifiers.
+ - balance: Decreased Kepori move speed modifier. (They are still a bit faster than
+ average)
+ zimon9:
+ - bugfix: fixed the orbit menu search function so that names work again
+ - rscadd: Added plastitanium shards
+ - bugfix: fixed some artifacts in the plasma glass shard sprites
+2024-10-26:
+ FalloutFalcon:
+ - rscadd: Faction statistics are now logged to the blackbox
+ - rscdel: Removes some cruft, red and blue team radios, out date/useless database
+ logging station trash cleaned
+ MarkSuckerberg:
+ - server: qdel logs work again
+2024-10-27:
+ Anticept:
+ - refactor: Refactored moods so explicit newlines are not required in descriptions.
+ None of this changes player facing stuff.
+ 'Apogeesys, Ryerice, Erikafox ':
+ - rscadd: Serene Outdoors has begun a new production run of its classics - the Model
+ 17, Model 12, Model 15, and Model 11
+ - rscdel: old combat shotgun
+ Erika - porting from /tg/ mostly.:
+ - rscadd: Tape Recorders now have a radial menu when used
+ - rscadd: Tape recorders now make noises
+ - rscadd: Tape recorders now have wires (can be remotely used)
+ Erikafox:
+ - balance: Hammer RPGs should no longer annihilate you completely. Just partially.
+ - bugfix: Weapons with no bolt can no longer be racked. Use your hand on them instead
+ - rscadd: Transceivers have been picking up an intermittent radio signal coming
+ from a nearby sand world. People with too much spare time - please check it
+ out.
+ - rscadd: Satchel Charges. Exceedingly rare and decently explosive.
+ - balance: Chances are, if there was a plasma cutter on a ship, it's an angle grinder
+ now. Rejoice. Cry in terror. Whatever honestly.
+ - balance: Angle grinders can now grind blast doors. reinforced windows are now
+ less bad to grind down.
+ - balance: angle grinder packs now slow you down less
+ - balance: angle grinders now sound less Screechy
+ - balance: angle grinders can now be safely used with a Bowman headset.
+ Sadhorizon:
+ - rscadd: All the inteq ships (and the beluga inteq office) now start with a rail
+ light for every gun.
+ - tweak: Rail light crate now costs 100 credits.
+ - rscadd: Added the Scarab-class Heavy Mining Ship
+ Sun-Soaked:
+ - bugfix: cleans up 3 potentially sticky refs
+ - bugfix: limb items no longer runtime when moved or dropped
+ - bugfix: vox blood & body damage overlays.
+ - imageadd: something something fixed vox overlays countless hours of work
+ - code_imp: replaced a horrifying var reference in clothing with a weakref
+ - code_imp: the thresholds for limb damage sprites have been reduced
+ - refactor: reworks clothing blood overlay into a central proc called by clothing
+ generalthrax:
+ - balance: Reloading speed from stacks doubled
+ - balance: Increase ammo can to bulky and lets it hold 4 normal-sized ammoboxes,
+ can only hold ammo and explosives.
+ - balance: Adjusted price of .299 Eoehoma slightly, adds a second box to the cargo
+ order since its 60 instead of 120
+ - bugfix: Fixes a bunch of bullet stacks to have correct numbers
+ - bugfix: Larger handfuls (.22lr)
+ - bugfix: Mapped in ammo cans now hold their boxes
+ - bugfix: 12g beanbag now has beanbag instead of rubber + beanbag
+ - bugfix: Ammo box icons and descriptions
+ - rscdel: Removed .22lr from the blackmarket. Its in cargo already.
+ zimon9:
+ - rscadd: Added better names for some material shards
+ - rscadd: Added ability to see screens using the examine_more function
+2024-10-28:
+ Sadhorizon:
+ - rscadd: A new sand ruin - the E-11 Manufacturing Plant - and associated code.
+ - rscadd: A purple hardhat.
+2024-10-29:
+ FalloutFalcon:
+ - rscdel: Removed some ancient away mission cruft
+ - code_imp: flaky tests can now comment under its own prs.
+ FalloutFalcon, Melbert:
+ - refactor: transforming weapons are easier to add
+ MarkSuckerberg:
+ - server: Logs a few more stats for use in the Statbus at https://shiptest.net/stats
+ thgvr:
+ - imageadd: Updated world icons for knives
+2024-10-30:
+ Erikafox:
+ - rscadd: Some planets now have new lighting values. Please report back on if they
+ are "Pleasant"
+ rye-rice:
+ - rscadd: You can now detect certain gases from smell, most notably plasma
+ - rscadd: Adds 6 new gases, all unused at the moment
+ - rscdel: 3 gases, Pluox, Nitryl, and Stimming
+ - balance: The noble gas suppresssion threshold has been increased from 10 mols
+ to 75 mols
+ - balance: Various gases have had their enthalpy (energy released during fires)
+ adjusted, changing the behavior of gas fires slightly.
+ - balance: Plasma is a much more potent skin/eye irritant
+ - balance: Hydrogen gas is no longer visible
+ - bugfix: Freon's stage one breath effects should work now, before they were tied
+ to nitryl's amount
+ rye-rice, Jedi Toothpaste:
+ - rscadd: adds Beagle Mug
+ - rscadd: adds Beagle Mug to Atlas Class
+2024-10-31:
+ Gristlebee:
+ - rscadd: Indie Viper guncase comes with 2 speedloaders.
+ SomeguyManperson:
+ - code_imp: empty energy weapons now get emptied slightly differently, no player-facing
+ changes
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
new file mode 100644
index 00000000000..7e29f8db7a4
--- /dev/null
+++ b/html/changelogs/archive/2024-11.yml
@@ -0,0 +1,341 @@
+2024-11-01:
+ Erikafox:
+ - rscadd: A new PGFN vessel has entered the frontier - the Elated Bolide class makes
+ a bright entry into the local system.
+ SomeguyManperson:
+ - bugfix: strippers and speedloaders for rifles now work again
+2024-11-02:
+ Apogee-dev:
+ - balance: Balaclavas and half masks are now just breath masks, not gas masks
+ - balance: Normal balaclavas can use internals too
+ - bugfix: Balaclavas don't have a joke description anymore
+ Erikafox:
+ - code_imp: cauterization now checks for pain feeling traits instead of morphine
+ - balance: morphine pills no longer addict and overdose you
+ - balance: frontier import guns now misfire more often
+ - rscadd: guns can now misfire into your head.
+ - rscadd: You can now recycle gun cases and ammo boxes.
+ - code_imp: Cargo ammo has been reorganized so it's not godawful
+ - rscadd: CM357 pistol
+ - rscadd: pistol cases for the CM70 and CM357
+ - rscadd: Holocalls now tell you they are coming from a location
+ Geoengi:
+ - tweak: unstations some of the hud alerts.
+ Gristlebee:
+ - rscadd: Jetpack harnesses to outpost for 1750
+ - rscdel: Black market jetpack harness
+ - balance: Jetpacks cost 1000 from 2000 at the outpost
+ - balance: Black market improvised jetpack average cost reduced
+ - balance: Black market hardsuit jetpack upgrade min price reduced
+ - balance: Jetpack fullspeed var now determines whether you're affected by damage
+ slowdown rather than giving a speedboost.
+ thgvr:
+ - imageadd: Added Kepori sprites for loadout dresses.
+2024-11-03:
+ Erikafox:
+ - balance: Outpost vending machines now cost money.
+ - rscadd: Some cargo packs have new descriptions
+ - code_imp: cargo is slightly more organized. again
+ - rscadd: Platforms. Please use them in maps. they look cool.
+ - imageadd: 'Spooky: Platform sprites'
+ - bugfix: 2 bolide map fixes. quality control is my passion.
+ - rscadd: Hermits now breath weirdly sometimes.
+ - balance: SKM hermits have realized they have been using the wrong calibre round
+ for the past 3 years and are now fixing such.
+ MemeSnorfer:
+ - rscadd: Vigilitas gas masks, which are added to the Harrier and Ranger
+ - rscadd: Inteq gas masks, which are added to the Colossus, Vaquero, Talos, and
+ Valor
+ Sadhorizon:
+ - rscadd: Added Nanotrasen, Vigilitas and N+S stamps.
+ thgvr:
+ - bugfix: chat icons work again
+ - bugfix: fishing UI has icons again
+2024-11-04:
+ DIB-DOG:
+ - rscadd: Improved miscellaneous supplies on the Crying Sun
+ - rscadd: Added a blackbox recorder and set of handrails to the Crying Sun
+ - bugfix: Changed out the loose beampistols with cased versions on Crying Sun
+ - bugfix: Fixed Crying Sun roles to display properly
+ - rscdel: Removed the beer ring and cigarette machine from the Crying Sun
+ Erikafox:
+ - rscadd: Energy Bayonets
+ - rscadd: Some frontiersmen ruins have been updated to have frontiersmen turrets
+ - rscadd: Clover Photonics' contract for manufacturing turrets has finally caught
+ up to the CLIP MIC. Expect to see them on the Atlas.
+ FalloutFalcon:
+ - code_imp: flaky test github comments dont spam
+ Gristlebee:
+ - rscadd: Increases 357 hollowpoint AP to -20 from -50
+ - rscadd: PGF Factional office
+ - rscadd: PGF Faxes
+ - rscadd: No diagonal indestructible titanium walls
+ Sadhorizon:
+ - rscdel: Beluga-class, Box-class, Schmiedeberg-class, Colossus-class, Skipper-class
+ and Kansatsu-class lost their Ore Redemption Machines.
+ - tweak: Reflavored Li Tieguai-class to use Cybersun Biodynamics colors.
+ - balance: Removed the Viper, the Dart Gun and two Ringnecks from the Li Tieguai.
+ Instead, added a Rattlesnake, a Himehabu and two edaggers.
+ - bugfix: Li Tieguai captain is now an officer.
+ zimon9:
+ - rscadd: Added ability to make cabinets and easels
+ - bugfix: fixed painting frame persistence and initialization bugs
+2024-11-05:
+ Apogee-dev:
+ - bugfix: left/right shifted number decals now have dirs and are the right color
+ Erikafox:
+ - rscdel: arnold pizza
+ - rscadd: A new PGF ship is in the neighborhood - Woeful Cthonians have been deployed
+ in the frontier!
+ SomeguyManperson:
+ - bugfix: shields work as intended again
+2024-11-07:
+ Apogee-dev:
+ - rscadd: the NGR Kali Andhi-class destroyer
+ - rscadd: NGR floor decals and flags
+ - balance: red space suit armor made equivalent to sec hardsuits
+ MarkSuckerberg:
+ - rscadd: Added a confirmation pop up for abandoning missions.
+2024-11-09:
+ Erikafox:
+ - balance: wasteplanets no longer spawn manhacks
+ SomeguyManperson:
+ - bugfix: the kilo sawnoff shotgun is no longer the private domicile of The Void
+2024-11-10:
+ Aquidu:
+ - rscadd: Added a suit storage whitelist to the Nanotrasen, Hardliner, NGR, and
+ Frontiersmen smocks. Expands the whitelist of the surgical smock.
+ FeenieRU:
+ - imageadd: added icons for inbox donuts
+ MarkSuckerberg:
+ - config: Removes a lot of old, unused config options
+ SomeguyManperson:
+ - code_imp: weapons which can be wielded may now have a force of 0 when wielded
+ or unwielded
+2024-11-11:
+ Erikafox:
+ - balance: Crusher damage has been slightly increased across the board.
+ SomeguyManperson:
+ - bugfix: guns with magazines can no longer sometimes refuse to accept those magazines
+ - balance: etherbor military and civilian weapon cells are interchangeable between
+ military and civilian arms
+2024-11-12:
+ firebudgy:
+ - balance: Kansatsu has been removed from the player-accessible ship pool.
+2024-11-14:
+ randy10122:
+ - bugfix: fixes a typo in the .45 HP ammo crate's description
+2024-11-15:
+ Anticept:
+ - balance: growth serum now maxes out at 30% growth with 30u and has a smooth sliding
+ scale.
+ Burning02:
+ - balance: Rail lights have been brightened
+ Erikafox:
+ - balance: medium and light ngr turrets swapped ammo. mediums should be more effective
+ now.
+ - rscadd: implements thick railings from code
+ - bugfix: platform dirs
+ - imageadd: platform internal corners
+ - balance: legion cores now slowly build up cloneloss when you use them.
+ - balance: Hivebots now have some armor and real bullets. Please bring guns to waste
+ planets.
+ - code_imp: you can now looc while unconscious/in crit.
+ MarkSuckerberg:
+ - rscdel: Most fishing missions. Now only the cooking one, that takes 1-3 of any
+ fish, has been left.
+ - tweak: The fish cooking mission now pays twice as much as it used to, 500 credits
+ per fish. It's also less likely to appear as a mission.
+ Sadhorizon:
+ - rscadd: Added an inteq survival box.
+ SomeguyManperson:
+ - code_imp: legion virus stage messages now properly display themselves. instead
+ of not doing that.
+ - code_imp: legion infesting people now give them a direct chat message. Say hello
+ to your new friend! They might be sticking around your body longer than you
+ will.
+ generalthrax:
+ - balance: Ramzi mobs now use the rusted-red as a reference item instead of blood-reds
+ to have lower armour.
+2024-11-16:
+ Apogee-dev:
+ - balance: Massively buffed combat exosuit armor
+ - balance: Made repairing exosuits with a welder a do_after
+ - balance: Combat exosuits get less healing from repairs
+ - balance: The Paladin now has higher melee armor and lower bullet armor than the
+ Durand
+ Erikafox:
+ - rscadd: Trickwine fluff has been rewritten
+ - balance: Trickwines have been somewhat nerfed
+ - rscdel: prismwine, forcewine
+ - rscadd: N+S has reported losing contact with one of their rockplanet based mining
+ installations
+ - rscadd: You can now add shelves to crate racks
+ - rscadd: you can now buy marine armor at the outpost
+ - balance: marine armor now has different levels of protection.
+ - bugfix: marine crate path + price
+ PositiveEntropy:
+ - rscadd: Ditigrade sprites for NGR and Hardliner regular and officer jumpsuits.
+ Sadhorizon:
+ - bugfix: E-11 Manufactory ruin is no longer dark.
+ firebudgy:
+ - rscadd: New sprites for hard hats and soft caps for Vox! Flipped states and on/off
+ states included.
+ - bugfix: Black Shorts are now able to fit Vox
+ generalthrax:
+ - balance: Frontiersmen vests now count as normal armour vests and not bulletproof
+ - balance: Frontiersmen simplemobs count this for their armour values
+ - balance: Frontie armour vest in the blackmarket cost decreased
+ - bugfix: 9mm AP spawns with 9mm AP now
+2024-11-17:
+ fighterslam:
+ - rscadd: Various minor fixes & QOL adjustments to the Ranger. Major changes include
+ updating all of the Specialist quarters and a complete re-arrangement of the
+ Medical and Supply areas.
+2024-11-18:
+ Apogee-dev:
+ - rscadd: Replaced NGR Hyena with the NGR Derecho-class salvage ship
+ Erikafox:
+ - rscadd: girlfailing adjective
+ - rscadd: vomiting now removes a random amount of disgust.
+ - balance: vomiting should no longer trigger 12000 times in one minute on that one
+ person. im so sorry
+ firebudgy:
+ - rscadd: Four new hats for your blorbo customization! Find them in loadout. Sponsored
+ by Miskilamo Shipbreaking.
+ - bugfix: Vox Frontiersmen Officers finally stitched up their clothing.
+2024-11-20:
+ Erikafox:
+ - balance: frontiersmen turrets kill everything not in their faction
+ - balance: medium marine armor now costs 3k at da outpost.
+ - bugfix: crate shelves now return all metal
+ - bugfix: crate shelves no longer lead to 0 metal stacks
+ - bugfix: Cthonian Platforms now have proper dirs
+ Sadhorizon:
+ - code_imp: Added a Hardliner faction datum.
+ SomeguyManperson:
+ - bugfix: 9mm AP boxes now work right
+ generalthrax:
+ - balance: Replaced rubbershot on the Kilo and Scarab with buckshot
+ - rscadd: Added a soft suit to the Listening Post
+ - bugfix: Fixed the Listening Post Comms Monitor to be the right type
+2024-11-21:
+ Anticept:
+ - bugfix: growth serum capped at 25 instead of 30% for sprite scaling reasons.
+ Erikafox:
+ - rscadd: rifle calibre and pdw calibre rubbershot/armor piercing/hollow point.
+ check da outpost
+ - rscadd: tracker rounds for a few guns. check the black market :3
+ - rscdel: most forms of incendiary ammo
+ - rscdel: A bunch of clown and mime stuff tangentially related to guns
+ - rscadd: walls on wasteworlds now have a chance to start damaged
+ - balance: walls on waste worlds are now universally weaker
+ - rscadd: fax secret documents
+ - rscadd: and space cash and biscuit folders. without
+ MarkSuckerberg:
+ - tweak: Whispering (as in, directly using the verb or typing `#` before your message)
+ will now skip the succumb confirmation prompt, while normal talking will still
+ continue to prompt if you want to succumb.
+ fighterslam:
+ - bugfix: fixes access on the ranger armory
+ firebudgy:
+ - rscadd: Enabled thee screaming audio emote for Vox.
+ generalthrax:
+ - bugfix: You can no longer see through Marauder hardsuits
+2024-11-22:
+ MarkSuckerberg:
+ - bugfix: Examine more should now say the actual object as the subject and not yourself.
+ zimon9:
+ - balance: reduces drink and cigarette vender item costs
+2024-11-23:
+ Apogee-dev:
+ - rscadd: Ramzi and Frontiersman mobs now have more names and descriptions
+ Sadhorizon:
+ - tweak: Dwayne is now made out of titanium.
+ SomeguyManperson:
+ - bugfix: mech repair now loop
+2024-11-24:
+ SomeguyManperson:
+ - bugfix: some weapons are now more visible than they weren't supposed to be (which
+ is none)
+ firebudgy:
+ - rscadd: Species sprites for various Vigilitas items
+ - rscadd: Nanotrasen vox.dmi
+ generalthrax:
+ - rscdel: You no longer slur your speech at low drunkenness.
+ - balance: Thresholds for slurred speech increased as well as the threshold for
+ getting drunk.
+ - rscdel: Making weird groaning sounds and burping loudly at random was removed
+ from slurred speech.
+2024-11-27:
+ Burning02:
+ - rscadd: Adds a singular light tube to the SSU room in the Atlas
+ - bugfix: The Atlas Sergeant can now access their belongings
+2024-11-28:
+ Apogee-dev:
+ - balance: replaced sec hailers in outfits and maps with gas masks or breath masks
+ depending on circumstance
+ Erikafox:
+ - balance: marine armor is now less protective, marginally, and slows you down |more|
+ - rscdel: Marine Helmets
+ - bugfix: legion cores should now ACTUALLY give you cloneloss. my bad there guys.
+ sorry.
+ - rscadd: new detonate effect for phantom cores and plasmasoul cores.
+ - rscadd: Anomaly cores now grind down into something.
+ - balance: plasmasouls suck less
+ - rscadd: hivebots now drop stock parts. Stronger ones drop better parts
+ - balance: claymores are now less explody - they have increased shrapnel prowess
+ to mildly compensate.
+ Gristlebee:
+ - rscadd: Shoulder holsters to outpost for 600
+ - rscadd: Cham holsters to black market
+ - rscadd: Accessories will fall off jumpsuits when destroyed.
+ - balance: Shoulder holsters can only hold one gun a time.
+ - bugfix: Accessory storage acts more consistently like other storage items.
+ MarkSuckerberg:
+ - tweak: Kepori can't hold items in their beak that are (allegedly) meant to be
+ equipped to other slots.
+ Martinpachu:
+ - rscdel: The cargo listing for the SWAT suit.
+ Sadhorizon:
+ - bugfix: Waiters can access Sunskipper kitchen again.
+ Spooky, Erika:
+ - rscadd: thin railings
+ - imageadd: 'spooky: thin railing sprites and sprites for wooden railings'
+ Yule&:
+ - bugfix: Tiles modified by the Floor Painter no longer reset after shuttle transit
+ Zevotech:
+ - rscdel: Removed the unused NT_Asteroid outpost.
+ - rscadd: Remapped and moved the Brazillab ruin to Sandplanet.
+ - bugfix: Fixed the Trabuco's inhand sprites.
+ generalthrax:
+ - rscadd: Adds Dogtag Missions to hunt down Ramzi Clique and Frontiersman NPCS from
+ Ruins
+ - rscadd: Adds Salvage Missions to collect Protolathe or R&D Console Boards
+ - rscdel: Removes Fishing Missions
+ - rscdel: Removes impossible missions like Bluespace Watcher and Abandoned Floorbot
+ - balance: Increases price of Migo missions to be on par with Legion
+ - balance: Increases the value of Strange Crystal missions
+ - rscdel: Remove R&D design board from unlocked Protolathes and Science Protolathes
+2024-11-29:
+ Apogee-dev:
+ - rscdel: Removed inteq and syndicate maid outfits
+ Burning02:
+ - bugfix: Swaps the planetary tiles on Brazil lab to be non-planetary tile types.
+ Gristlebee:
+ - bugfix: Sealed and note placer mapping helper
+ PositiveEntropy:
+ - imageadd: The Vox have been visually overhauled and resprited!
+ - imageadd: 'Adds a new hair gradient: Splotches!'
+ generalthrax:
+ - rscadd: Adds the Gorlex Marauder Breaching Sledgehammer, for both utility and
+ combat. Available in the black market.
+ - rscadd: Sledgehammers are mapped in on the Kali and Derecho-class
+2024-11-30:
+ Jedi-Toothpaste:
+ - bugfix: Claris and Gar can now be stored on your back
+ 'rye-rice, firebudgy ':
+ - rscadd: Factional cargo.
+ - rscdel: the remminants of the P16 as it was already completely removed in Serene
+ Sporting
+ - balance: Sporter is now 400 credits.
diff --git a/html/changelogs/archive/2024-12.yml b/html/changelogs/archive/2024-12.yml
new file mode 100644
index 00000000000..ad900aa39f6
--- /dev/null
+++ b/html/changelogs/archive/2024-12.yml
@@ -0,0 +1,149 @@
+2024-12-01:
+ Erikafox:
+ - balance: Gun slowdown has been reduced across the board
+ - balance: E-tars are now less bad
+2024-12-04:
+ Burning02:
+ - balance: The Dwayne filing cabinet located in the bridge is no longer dense
+ Cloudbreak:
+ - rscdel: AI Private frequency
+ - balance: Syndicate communications are no longer able to monitor all other factions.
+ - balance: Syndicate communications are no longer unable to be monitored.
+ - balance: Nanotrasen has modernized their handhelds. Possible radio frequencies
+ adjusted from 144.1-148.9 to 144.1-168.9.
+ - rscadd: Reflavored set channels to properly ID their faction.
+ - bugfix: Vox sprite compatibility in a single sprite.
+ Erikafox:
+ - rscadd: the valor now carries an artificer
+ - bugfix: expands subshuttle dock on the Raleigh
+ Gristlebee:
+ - balance: Syndicate esword simplemob block chance down to 25.
+ - bugfix: Syndi space knife enemies dying in space, and having block chance.
+ MarkSuckerberg:
+ - rscadd: You can now set turrets to filter by faction, mob type, and a few more
+ criteria including "dangerous only" as well as the ability to disable retaliation.
+ - rscadd: Turret retaliation is a lot more vengeful. Don't mess with them.
+ - rscadd: Turrets will now spend a short time targetting you, pointing a beam at
+ you to indicate that they're doing so.
+ - rscdel: Turret covers, because they sucked.
+ - bugfix: Turretcode is a LOT less laggy.
+ - tweak: Turrets are now built like normal machines. The boards are currently not
+ available (except through salvaging).
+ - tweak: You can now access full turret settings from the turret control panel.
+ SomeguyManperson:
+ - bugfix: mechs will now immediately fail a channel if they move, turn, or swap
+ equipment. Previously the channel would run to completion before checking if
+ it was valid.
+ - rscadd: The assault belt has been freed from its SWAT suit prison and is now purchasable
+ in cargo
+ firebudgy:
+ - rscadd: Additional cargo magazine and gun orders that were missing from the previous
+ factional cargo PR.
+ - balance: Adjusts the E-SG to hopefully be used more often.
+ generalthrax:
+ - balance: Angle Grinders now take less charge and are much quicker at deconstructing
+ walls
+ - balance: Plasmacutters are now marginally slower, hardly noticeable.
+ - balance: Blast doors and safes are now very slightly faster to cut open.
+ - rscadd: You can now unanchor Serving Dishes
+ rye-rice:
+ - rscadd: Melbert, rye-rice
+ - balance: you will no longer be fine at 100 c, nor 50 c, you should also NOT be
+ fine at -100 c either. clothing helps.
+ - bugfix: should be able to tell slighlty chilly tempertures
+ thgvr:
+ - rscadd: Allows hand radios to be held on your neck slot
+ - balance: 'Adjusted the item size of various guns and misc objects, see pr #3509
+ for more info'
+ - imageadd: Overhauled the look of autoinjectors
+2024-12-05:
+ Gristlebee:
+ - rscadd: Shoulder slings to outpost cargo for 500 credits.
+ MarkSuckerberg & Anticept:
+ - bugfix: auxmos updated with correct feature flags, windows atmos hosts will function
+ correctly again.
+ firebudgy:
+ - rscadd: An intercepted shipment of CM-40 barrels has led to an influx of SKM-24u
+ LMGs to the black market. Report sightings to your nearest CLIP representative.
+ - bugfix: Bipods actually work now.
+2024-12-08:
+ Erikafox:
+ - bugfix: Signallers no longer hit the other signaller when you're copying frequencies
+ - bugfix: hivebots should no longer attack hivebot spawners
+ - rscadd: curtain directions
+ - balance: m13 larker burst fire speed increased
+ SomeguyManperson:
+ - rscadd: Examining overmap hazards now shows their maximum safe speed, if there
+ is one, which there may not be.
+ rye-rice:
+ - bugfix: phoroids should no longer smell plasma, or anything for that matter.
+ thgvr:
+ - rscadd: Added a new electric welder - buy it from the outpost.
+ - rscdel: Removed experimental welder
+2024-12-13:
+ Burning02:
+ - rscadd: Adds the Ion thruster pack for Exosuits to the outpost market, for 2000
+ credits
+ - balance: Ion thrusters can be detached from exosuits now
+ Erikafox:
+ - balance: Girders on wasteplanet walls are no longer more durable than the walls.
+ generalthrax:
+ - balance: Lasers / Eguns are now normal-sized
+ - rscadd: Lasers / Eguns now fit in holsters
+ - bugfix: Sprite issue on Singulo Lab lasercannons
+ - rscadd: Filled subtype of Molotovs
+ - bugfix: Molotovs can no longer be used to craft themselves
+ - bugfix: Mapped in Molotovs are no longer empty
+2024-12-14:
+ meemofcourse:
+ - rscdel: Beluga-class, Box-class, Lagoon-class, Schmiedeberg-class, Tranquility-class
+ - rscdel: Hound-class
+ - rscdel: Gecko-class, Heron-class (also Falcon-class), Mimir-class
+ - rscdel: Jupiter-class
+ - rscdel: Chronicle-class
+ - rscdel: Many ruins, mostly for being old, have been removed
+2024-12-19:
+ Jedi-Toothpaste:
+ - bugfix: surgery cases now hold all the items
+ MemeSnorfer and Moffball:
+ - rscadd: Atoll-Class Hospital Ship
+ - rscadd: Preloaded organ smartfridge
+ - rscdel: Disabled the Box-Class
+2024-12-21:
+ Zevotech:
+ - bugfix: fixed an incorrect spawner on whitesands_surface_camp_combination
+ - tweak: adjusted loot distribution on whitesands_surface_camp_combination
+2024-12-22:
+ Burning02:
+ - rscadd: Adds the exosuit based saw to the Outpost catalogue for 2000 credits
+ - balance: Buffed the speed and deconstruction damage of the exosuit saw
+ - bugfix: Exosuit saw no longer gets stuck on indestructible walls
+ firebudgy:
+ - rscadd: Commissioner, SAW-80, GAR Carbine, and CM-40 to factional cargo
+ - bugfix: Decimal cargo prices
+ - balance: Magazines now come completely empty. As a result of this, they have now
+ been made cheaper.
+2024-12-23:
+ firebudgy:
+ - balance: SAW-80 is more expensive.
+2024-12-29:
+ Aquidu:
+ - rscadd: Added winter coats to the Harrier
+2024-12-30:
+ Erikafox:
+ - balance: burst fire hivebots now have more time between the shots in their bursts
+ Jedi-Toothpaste:
+ - rscadd: new secondary 'slug' mode for the scatter laser (and other scatter lasers
+ sub-types)
+ - rscadd: scatter laser to cargo, for you freaks who want to buy it
+ - rscdel: removed old secondary mode for scatter lasers (and scatter laser sub-types)
+ - balance: laser scatter mode now fires 10 pellets instead of 5
+ - balance: laser scatter pellets now do 5 damage instead of 3
+ - balance: laser scatter mode variance increased from 25 to 40
+ - balance: doubled laser scatter mode energy cost (6 shots with normal cell, 12
+ with upgraded)
+ MarkSuckerberg:
+ - bugfix: Jukeboxes should not leak across virtual Zs anymore
+ - bugfix: Candles can no longer be used like tiki torches
+ - tweak: Ore silos will now only drop materials when dissasembled or destroyed,
+ instead of any deletion
diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml
new file mode 100644
index 00000000000..13151c56dc7
--- /dev/null
+++ b/html/changelogs/archive/2025-01.yml
@@ -0,0 +1,18 @@
+2025-01-04:
+ Erikafox:
+ - rscdel: kong drink
+ - rscadd: CLIP has lost contact with a facility in the system. Go find it. Go see
+ what happened. I dare you.
+ Ryll/Shaps:
+ - rscadd: Adds a config option for OOC kindness commendations! When enabled, a small
+ percentage of the crew gets asked if anyone made their round better, and those
+ people will get a little heart next to their name in OOC for 24h!
+ SomeguyManperson:
+ - bugfix: mech looping repairs loop now. For real.
+ Thera-Pissed:
+ - bugfix: spaghetti desc and food type updated
+ firebudgy:
+ - rscadd: New medal descriptions and renames.
+ rye-rice:
+ - rscadd: Touches up the ringneck and commander magazine sprites
+ - balance: Ringneck is now 8 rounds and commander is 12 rounds.
diff --git a/html/font-awesome/README.MD b/html/font-awesome/README.MD
index 7d693c36f03..ba9121311d4 100644
--- a/html/font-awesome/README.MD
+++ b/html/font-awesome/README.MD
@@ -1,6 +1,6 @@
Due to the fact browse_rsc can't create subdirectories, every time you update font-awesome you'll need to change relative webfont references in all.min.css
eg ../webfonts/fa-regular-400.ttf => fa-regular-400.ttf (or whatever you call it in asset datum)
-Second change is ripping out file types other than woff and eot(ie8) from the css
+Second change is ripping out file types other than ~~ woff and eot(ie8)~~ ttf from the css
-Finally, removing brand related css.
\ No newline at end of file
+Finally, removing brand related css.
diff --git a/html/font-awesome/css/all.min.css b/html/font-awesome/css/all.min.css
index 5c440798403..7a283f087ca 100644
--- a/html/font-awesome/css/all.min.css
+++ b/html/font-awesome/css/all.min.css
@@ -1,4377 +1,6 @@
/*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.1.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
*/
-.fa,
-.fab,
-.fal,
-.far,
-.fas {
- -moz-osx-font-smoothing: grayscale;
- -webkit-font-smoothing: antialiased;
- display: inline-block;
- font-style: normal;
- font-variant: normal;
- text-rendering: auto;
- line-height: 1;
-}
-.fa-lg {
- font-size: 1.33333em;
- line-height: 0.75em;
- vertical-align: -0.0667em;
-}
-.fa-xs {
- font-size: 0.75em;
-}
-.fa-sm {
- font-size: 0.875em;
-}
-.fa-1x {
- font-size: 1em;
-}
-.fa-2x {
- font-size: 2em;
-}
-.fa-3x {
- font-size: 3em;
-}
-.fa-4x {
- font-size: 4em;
-}
-.fa-5x {
- font-size: 5em;
-}
-.fa-6x {
- font-size: 6em;
-}
-.fa-7x {
- font-size: 7em;
-}
-.fa-8x {
- font-size: 8em;
-}
-.fa-9x {
- font-size: 9em;
-}
-.fa-10x {
- font-size: 10em;
-}
-.fa-fw {
- text-align: center;
- width: 1.25em;
-}
-.fa-ul {
- list-style-type: none;
- margin-left: 2.5em;
- padding-left: 0;
-}
-.fa-ul > li {
- position: relative;
-}
-.fa-li {
- left: -2em;
- position: absolute;
- text-align: center;
- width: 2em;
- line-height: inherit;
-}
-.fa-border {
- border: 0.08em solid #eee;
- border-radius: 0.1em;
- padding: 0.2em 0.25em 0.15em;
-}
-.fa-pull-left {
- float: left;
-}
-.fa-pull-right {
- float: right;
-}
-.fa.fa-pull-left,
-.fab.fa-pull-left,
-.fal.fa-pull-left,
-.far.fa-pull-left,
-.fas.fa-pull-left {
- margin-right: 0.3em;
-}
-.fa.fa-pull-right,
-.fab.fa-pull-right,
-.fal.fa-pull-right,
-.far.fa-pull-right,
-.fas.fa-pull-right {
- margin-left: 0.3em;
-}
-.fa-spin {
- animation: fa-spin 2s infinite linear;
-}
-.fa-pulse {
- animation: fa-spin 1s infinite steps(8);
-}
-@keyframes fa-spin {
- 0% {
- transform: rotate(0deg);
- }
- to {
- transform: rotate(1turn);
- }
-}
-.fa-rotate-90 {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
- transform: rotate(90deg);
-}
-.fa-rotate-180 {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
- transform: rotate(180deg);
-}
-.fa-rotate-270 {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
- transform: rotate(270deg);
-}
-.fa-flip-horizontal {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
- transform: scaleX(-1);
-}
-.fa-flip-vertical {
- transform: scaleY(-1);
-}
-.fa-flip-both,
-.fa-flip-horizontal.fa-flip-vertical,
-.fa-flip-vertical {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
-}
-.fa-flip-both,
-.fa-flip-horizontal.fa-flip-vertical {
- transform: scale(-1);
-}
-:root .fa-flip-both,
-:root .fa-flip-horizontal,
-:root .fa-flip-vertical,
-:root .fa-rotate-90,
-:root .fa-rotate-180,
-:root .fa-rotate-270 {
- filter: none;
-}
-.fa-stack {
- display: inline-block;
- height: 2em;
- line-height: 2em;
- position: relative;
- vertical-align: middle;
- width: 2.5em;
-}
-.fa-stack-1x,
-.fa-stack-2x {
- left: 0;
- position: absolute;
- text-align: center;
- width: 100%;
-}
-.fa-stack-1x {
- line-height: inherit;
-}
-.fa-stack-2x {
- font-size: 2em;
-}
-.fa-inverse {
- color: #fff;
-}
-.fa-500px:before {
- content: "\f26e";
-}
-.fa-accessible-icon:before {
- content: "\f368";
-}
-.fa-accusoft:before {
- content: "\f369";
-}
-.fa-acquisitions-incorporated:before {
- content: "\f6af";
-}
-.fa-ad:before {
- content: "\f641";
-}
-.fa-address-book:before {
- content: "\f2b9";
-}
-.fa-address-card:before {
- content: "\f2bb";
-}
-.fa-adjust:before {
- content: "\f042";
-}
-.fa-adn:before {
- content: "\f170";
-}
-.fa-adobe:before {
- content: "\f778";
-}
-.fa-adversal:before {
- content: "\f36a";
-}
-.fa-affiliatetheme:before {
- content: "\f36b";
-}
-.fa-air-freshener:before {
- content: "\f5d0";
-}
-.fa-airbnb:before {
- content: "\f834";
-}
-.fa-algolia:before {
- content: "\f36c";
-}
-.fa-align-center:before {
- content: "\f037";
-}
-.fa-align-justify:before {
- content: "\f039";
-}
-.fa-align-left:before {
- content: "\f036";
-}
-.fa-align-right:before {
- content: "\f038";
-}
-.fa-alipay:before {
- content: "\f642";
-}
-.fa-allergies:before {
- content: "\f461";
-}
-.fa-amazon:before {
- content: "\f270";
-}
-.fa-amazon-pay:before {
- content: "\f42c";
-}
-.fa-ambulance:before {
- content: "\f0f9";
-}
-.fa-american-sign-language-interpreting:before {
- content: "\f2a3";
-}
-.fa-amilia:before {
- content: "\f36d";
-}
-.fa-anchor:before {
- content: "\f13d";
-}
-.fa-android:before {
- content: "\f17b";
-}
-.fa-angellist:before {
- content: "\f209";
-}
-.fa-angle-double-down:before {
- content: "\f103";
-}
-.fa-angle-double-left:before {
- content: "\f100";
-}
-.fa-angle-double-right:before {
- content: "\f101";
-}
-.fa-angle-double-up:before {
- content: "\f102";
-}
-.fa-angle-down:before {
- content: "\f107";
-}
-.fa-angle-left:before {
- content: "\f104";
-}
-.fa-angle-right:before {
- content: "\f105";
-}
-.fa-angle-up:before {
- content: "\f106";
-}
-.fa-angry:before {
- content: "\f556";
-}
-.fa-angrycreative:before {
- content: "\f36e";
-}
-.fa-angular:before {
- content: "\f420";
-}
-.fa-ankh:before {
- content: "\f644";
-}
-.fa-app-store:before {
- content: "\f36f";
-}
-.fa-app-store-ios:before {
- content: "\f370";
-}
-.fa-apper:before {
- content: "\f371";
-}
-.fa-apple:before {
- content: "\f179";
-}
-.fa-apple-alt:before {
- content: "\f5d1";
-}
-.fa-apple-pay:before {
- content: "\f415";
-}
-.fa-archive:before {
- content: "\f187";
-}
-.fa-archway:before {
- content: "\f557";
-}
-.fa-arrow-alt-circle-down:before {
- content: "\f358";
-}
-.fa-arrow-alt-circle-left:before {
- content: "\f359";
-}
-.fa-arrow-alt-circle-right:before {
- content: "\f35a";
-}
-.fa-arrow-alt-circle-up:before {
- content: "\f35b";
-}
-.fa-arrow-circle-down:before {
- content: "\f0ab";
-}
-.fa-arrow-circle-left:before {
- content: "\f0a8";
-}
-.fa-arrow-circle-right:before {
- content: "\f0a9";
-}
-.fa-arrow-circle-up:before {
- content: "\f0aa";
-}
-.fa-arrow-down:before {
- content: "\f063";
-}
-.fa-arrow-left:before {
- content: "\f060";
-}
-.fa-arrow-right:before {
- content: "\f061";
-}
-.fa-arrow-up:before {
- content: "\f062";
-}
-.fa-arrows-alt:before {
- content: "\f0b2";
-}
-.fa-arrows-alt-h:before {
- content: "\f337";
-}
-.fa-arrows-alt-v:before {
- content: "\f338";
-}
-.fa-artstation:before {
- content: "\f77a";
-}
-.fa-assistive-listening-systems:before {
- content: "\f2a2";
-}
-.fa-asterisk:before {
- content: "\f069";
-}
-.fa-asymmetrik:before {
- content: "\f372";
-}
-.fa-at:before {
- content: "\f1fa";
-}
-.fa-atlas:before {
- content: "\f558";
-}
-.fa-atlassian:before {
- content: "\f77b";
-}
-.fa-atom:before {
- content: "\f5d2";
-}
-.fa-audible:before {
- content: "\f373";
-}
-.fa-audio-description:before {
- content: "\f29e";
-}
-.fa-autoprefixer:before {
- content: "\f41c";
-}
-.fa-avianex:before {
- content: "\f374";
-}
-.fa-aviato:before {
- content: "\f421";
-}
-.fa-award:before {
- content: "\f559";
-}
-.fa-aws:before {
- content: "\f375";
-}
-.fa-baby:before {
- content: "\f77c";
-}
-.fa-baby-carriage:before {
- content: "\f77d";
-}
-.fa-backspace:before {
- content: "\f55a";
-}
-.fa-backward:before {
- content: "\f04a";
-}
-.fa-bacon:before {
- content: "\f7e5";
-}
-.fa-balance-scale:before {
- content: "\f24e";
-}
-.fa-balance-scale-left:before {
- content: "\f515";
-}
-.fa-balance-scale-right:before {
- content: "\f516";
-}
-.fa-ban:before {
- content: "\f05e";
-}
-.fa-band-aid:before {
- content: "\f462";
-}
-.fa-bandcamp:before {
- content: "\f2d5";
-}
-.fa-barcode:before {
- content: "\f02a";
-}
-.fa-bars:before {
- content: "\f0c9";
-}
-.fa-baseball-ball:before {
- content: "\f433";
-}
-.fa-basketball-ball:before {
- content: "\f434";
-}
-.fa-bath:before {
- content: "\f2cd";
-}
-.fa-battery-empty:before {
- content: "\f244";
-}
-.fa-battery-full:before {
- content: "\f240";
-}
-.fa-battery-half:before {
- content: "\f242";
-}
-.fa-battery-quarter:before {
- content: "\f243";
-}
-.fa-battery-three-quarters:before {
- content: "\f241";
-}
-.fa-battle-net:before {
- content: "\f835";
-}
-.fa-bed:before {
- content: "\f236";
-}
-.fa-beer:before {
- content: "\f0fc";
-}
-.fa-behance:before {
- content: "\f1b4";
-}
-.fa-behance-square:before {
- content: "\f1b5";
-}
-.fa-bell:before {
- content: "\f0f3";
-}
-.fa-bell-slash:before {
- content: "\f1f6";
-}
-.fa-bezier-curve:before {
- content: "\f55b";
-}
-.fa-bible:before {
- content: "\f647";
-}
-.fa-bicycle:before {
- content: "\f206";
-}
-.fa-biking:before {
- content: "\f84a";
-}
-.fa-bimobject:before {
- content: "\f378";
-}
-.fa-binoculars:before {
- content: "\f1e5";
-}
-.fa-biohazard:before {
- content: "\f780";
-}
-.fa-birthday-cake:before {
- content: "\f1fd";
-}
-.fa-bitbucket:before {
- content: "\f171";
-}
-.fa-bitcoin:before {
- content: "\f379";
-}
-.fa-bity:before {
- content: "\f37a";
-}
-.fa-black-tie:before {
- content: "\f27e";
-}
-.fa-blackberry:before {
- content: "\f37b";
-}
-.fa-blender:before {
- content: "\f517";
-}
-.fa-blender-phone:before {
- content: "\f6b6";
-}
-.fa-blind:before {
- content: "\f29d";
-}
-.fa-blog:before {
- content: "\f781";
-}
-.fa-blogger:before {
- content: "\f37c";
-}
-.fa-blogger-b:before {
- content: "\f37d";
-}
-.fa-bluetooth:before {
- content: "\f293";
-}
-.fa-bluetooth-b:before {
- content: "\f294";
-}
-.fa-bold:before {
- content: "\f032";
-}
-.fa-bolt:before {
- content: "\f0e7";
-}
-.fa-bomb:before {
- content: "\f1e2";
-}
-.fa-bone:before {
- content: "\f5d7";
-}
-.fa-bong:before {
- content: "\f55c";
-}
-.fa-book:before {
- content: "\f02d";
-}
-.fa-book-dead:before {
- content: "\f6b7";
-}
-.fa-book-medical:before {
- content: "\f7e6";
-}
-.fa-book-open:before {
- content: "\f518";
-}
-.fa-book-reader:before {
- content: "\f5da";
-}
-.fa-bookmark:before {
- content: "\f02e";
-}
-.fa-bootstrap:before {
- content: "\f836";
-}
-.fa-border-all:before {
- content: "\f84c";
-}
-.fa-border-none:before {
- content: "\f850";
-}
-.fa-border-style:before {
- content: "\f853";
-}
-.fa-bowling-ball:before {
- content: "\f436";
-}
-.fa-box:before {
- content: "\f466";
-}
-.fa-box-open:before {
- content: "\f49e";
-}
-.fa-boxes:before {
- content: "\f468";
-}
-.fa-braille:before {
- content: "\f2a1";
-}
-.fa-brain:before {
- content: "\f5dc";
-}
-.fa-bread-slice:before {
- content: "\f7ec";
-}
-.fa-briefcase:before {
- content: "\f0b1";
-}
-.fa-briefcase-medical:before {
- content: "\f469";
-}
-.fa-broadcast-tower:before {
- content: "\f519";
-}
-.fa-broom:before {
- content: "\f51a";
-}
-.fa-brush:before {
- content: "\f55d";
-}
-.fa-btc:before {
- content: "\f15a";
-}
-.fa-buffer:before {
- content: "\f837";
-}
-.fa-bug:before {
- content: "\f188";
-}
-.fa-building:before {
- content: "\f1ad";
-}
-.fa-bullhorn:before {
- content: "\f0a1";
-}
-.fa-bullseye:before {
- content: "\f140";
-}
-.fa-burn:before {
- content: "\f46a";
-}
-.fa-buromobelexperte:before {
- content: "\f37f";
-}
-.fa-bus:before {
- content: "\f207";
-}
-.fa-bus-alt:before {
- content: "\f55e";
-}
-.fa-business-time:before {
- content: "\f64a";
-}
-.fa-buysellads:before {
- content: "\f20d";
-}
-.fa-calculator:before {
- content: "\f1ec";
-}
-.fa-calendar:before {
- content: "\f133";
-}
-.fa-calendar-alt:before {
- content: "\f073";
-}
-.fa-calendar-check:before {
- content: "\f274";
-}
-.fa-calendar-day:before {
- content: "\f783";
-}
-.fa-calendar-minus:before {
- content: "\f272";
-}
-.fa-calendar-plus:before {
- content: "\f271";
-}
-.fa-calendar-times:before {
- content: "\f273";
-}
-.fa-calendar-week:before {
- content: "\f784";
-}
-.fa-camera:before {
- content: "\f030";
-}
-.fa-camera-retro:before {
- content: "\f083";
-}
-.fa-campground:before {
- content: "\f6bb";
-}
-.fa-canadian-maple-leaf:before {
- content: "\f785";
-}
-.fa-candy-cane:before {
- content: "\f786";
-}
-.fa-cannabis:before {
- content: "\f55f";
-}
-.fa-capsules:before {
- content: "\f46b";
-}
-.fa-car:before {
- content: "\f1b9";
-}
-.fa-car-alt:before {
- content: "\f5de";
-}
-.fa-car-battery:before {
- content: "\f5df";
-}
-.fa-car-crash:before {
- content: "\f5e1";
-}
-.fa-car-side:before {
- content: "\f5e4";
-}
-.fa-caret-down:before {
- content: "\f0d7";
-}
-.fa-caret-left:before {
- content: "\f0d9";
-}
-.fa-caret-right:before {
- content: "\f0da";
-}
-.fa-caret-square-down:before {
- content: "\f150";
-}
-.fa-caret-square-left:before {
- content: "\f191";
-}
-.fa-caret-square-right:before {
- content: "\f152";
-}
-.fa-caret-square-up:before {
- content: "\f151";
-}
-.fa-caret-up:before {
- content: "\f0d8";
-}
-.fa-carrot:before {
- content: "\f787";
-}
-.fa-cart-arrow-down:before {
- content: "\f218";
-}
-.fa-cart-plus:before {
- content: "\f217";
-}
-.fa-cash-register:before {
- content: "\f788";
-}
-.fa-cat:before {
- content: "\f6be";
-}
-.fa-cc-amazon-pay:before {
- content: "\f42d";
-}
-.fa-cc-amex:before {
- content: "\f1f3";
-}
-.fa-cc-apple-pay:before {
- content: "\f416";
-}
-.fa-cc-diners-club:before {
- content: "\f24c";
-}
-.fa-cc-discover:before {
- content: "\f1f2";
-}
-.fa-cc-jcb:before {
- content: "\f24b";
-}
-.fa-cc-mastercard:before {
- content: "\f1f1";
-}
-.fa-cc-paypal:before {
- content: "\f1f4";
-}
-.fa-cc-stripe:before {
- content: "\f1f5";
-}
-.fa-cc-visa:before {
- content: "\f1f0";
-}
-.fa-centercode:before {
- content: "\f380";
-}
-.fa-centos:before {
- content: "\f789";
-}
-.fa-certificate:before {
- content: "\f0a3";
-}
-.fa-chair:before {
- content: "\f6c0";
-}
-.fa-chalkboard:before {
- content: "\f51b";
-}
-.fa-chalkboard-teacher:before {
- content: "\f51c";
-}
-.fa-charging-station:before {
- content: "\f5e7";
-}
-.fa-chart-area:before {
- content: "\f1fe";
-}
-.fa-chart-bar:before {
- content: "\f080";
-}
-.fa-chart-line:before {
- content: "\f201";
-}
-.fa-chart-pie:before {
- content: "\f200";
-}
-.fa-check:before {
- content: "\f00c";
-}
-.fa-check-circle:before {
- content: "\f058";
-}
-.fa-check-double:before {
- content: "\f560";
-}
-.fa-check-square:before {
- content: "\f14a";
-}
-.fa-cheese:before {
- content: "\f7ef";
-}
-.fa-chess:before {
- content: "\f439";
-}
-.fa-chess-bishop:before {
- content: "\f43a";
-}
-.fa-chess-board:before {
- content: "\f43c";
-}
-.fa-chess-king:before {
- content: "\f43f";
-}
-.fa-chess-knight:before {
- content: "\f441";
-}
-.fa-chess-pawn:before {
- content: "\f443";
-}
-.fa-chess-queen:before {
- content: "\f445";
-}
-.fa-chess-rook:before {
- content: "\f447";
-}
-.fa-chevron-circle-down:before {
- content: "\f13a";
-}
-.fa-chevron-circle-left:before {
- content: "\f137";
-}
-.fa-chevron-circle-right:before {
- content: "\f138";
-}
-.fa-chevron-circle-up:before {
- content: "\f139";
-}
-.fa-chevron-down:before {
- content: "\f078";
-}
-.fa-chevron-left:before {
- content: "\f053";
-}
-.fa-chevron-right:before {
- content: "\f054";
-}
-.fa-chevron-up:before {
- content: "\f077";
-}
-.fa-child:before {
- content: "\f1ae";
-}
-.fa-chrome:before {
- content: "\f268";
-}
-.fa-chromecast:before {
- content: "\f838";
-}
-.fa-church:before {
- content: "\f51d";
-}
-.fa-circle:before {
- content: "\f111";
-}
-.fa-circle-notch:before {
- content: "\f1ce";
-}
-.fa-city:before {
- content: "\f64f";
-}
-.fa-clinic-medical:before {
- content: "\f7f2";
-}
-.fa-clipboard:before {
- content: "\f328";
-}
-.fa-clipboard-check:before {
- content: "\f46c";
-}
-.fa-clipboard-list:before {
- content: "\f46d";
-}
-.fa-clock:before {
- content: "\f017";
-}
-.fa-clone:before {
- content: "\f24d";
-}
-.fa-closed-captioning:before {
- content: "\f20a";
-}
-.fa-cloud:before {
- content: "\f0c2";
-}
-.fa-cloud-download-alt:before {
- content: "\f381";
-}
-.fa-cloud-meatball:before {
- content: "\f73b";
-}
-.fa-cloud-moon:before {
- content: "\f6c3";
-}
-.fa-cloud-moon-rain:before {
- content: "\f73c";
-}
-.fa-cloud-rain:before {
- content: "\f73d";
-}
-.fa-cloud-showers-heavy:before {
- content: "\f740";
-}
-.fa-cloud-sun:before {
- content: "\f6c4";
-}
-.fa-cloud-sun-rain:before {
- content: "\f743";
-}
-.fa-cloud-upload-alt:before {
- content: "\f382";
-}
-.fa-cloudscale:before {
- content: "\f383";
-}
-.fa-cloudsmith:before {
- content: "\f384";
-}
-.fa-cloudversify:before {
- content: "\f385";
-}
-.fa-cocktail:before {
- content: "\f561";
-}
-.fa-code:before {
- content: "\f121";
-}
-.fa-code-branch:before {
- content: "\f126";
-}
-.fa-codepen:before {
- content: "\f1cb";
-}
-.fa-codiepie:before {
- content: "\f284";
-}
-.fa-coffee:before {
- content: "\f0f4";
-}
-.fa-cog:before {
- content: "\f013";
-}
-.fa-cogs:before {
- content: "\f085";
-}
-.fa-coins:before {
- content: "\f51e";
-}
-.fa-columns:before {
- content: "\f0db";
-}
-.fa-comment:before {
- content: "\f075";
-}
-.fa-comment-alt:before {
- content: "\f27a";
-}
-.fa-comment-dollar:before {
- content: "\f651";
-}
-.fa-comment-dots:before {
- content: "\f4ad";
-}
-.fa-comment-medical:before {
- content: "\f7f5";
-}
-.fa-comment-slash:before {
- content: "\f4b3";
-}
-.fa-comments:before {
- content: "\f086";
-}
-.fa-comments-dollar:before {
- content: "\f653";
-}
-.fa-compact-disc:before {
- content: "\f51f";
-}
-.fa-compass:before {
- content: "\f14e";
-}
-.fa-compress:before {
- content: "\f066";
-}
-.fa-compress-arrows-alt:before {
- content: "\f78c";
-}
-.fa-concierge-bell:before {
- content: "\f562";
-}
-.fa-confluence:before {
- content: "\f78d";
-}
-.fa-connectdevelop:before {
- content: "\f20e";
-}
-.fa-contao:before {
- content: "\f26d";
-}
-.fa-cookie:before {
- content: "\f563";
-}
-.fa-cookie-bite:before {
- content: "\f564";
-}
-.fa-copy:before {
- content: "\f0c5";
-}
-.fa-copyright:before {
- content: "\f1f9";
-}
-.fa-couch:before {
- content: "\f4b8";
-}
-.fa-cpanel:before {
- content: "\f388";
-}
-.fa-creative-commons:before {
- content: "\f25e";
-}
-.fa-creative-commons-by:before {
- content: "\f4e7";
-}
-.fa-creative-commons-nc:before {
- content: "\f4e8";
-}
-.fa-creative-commons-nc-eu:before {
- content: "\f4e9";
-}
-.fa-creative-commons-nc-jp:before {
- content: "\f4ea";
-}
-.fa-creative-commons-nd:before {
- content: "\f4eb";
-}
-.fa-creative-commons-pd:before {
- content: "\f4ec";
-}
-.fa-creative-commons-pd-alt:before {
- content: "\f4ed";
-}
-.fa-creative-commons-remix:before {
- content: "\f4ee";
-}
-.fa-creative-commons-sa:before {
- content: "\f4ef";
-}
-.fa-creative-commons-sampling:before {
- content: "\f4f0";
-}
-.fa-creative-commons-sampling-plus:before {
- content: "\f4f1";
-}
-.fa-creative-commons-share:before {
- content: "\f4f2";
-}
-.fa-creative-commons-zero:before {
- content: "\f4f3";
-}
-.fa-credit-card:before {
- content: "\f09d";
-}
-.fa-critical-role:before {
- content: "\f6c9";
-}
-.fa-crop:before {
- content: "\f125";
-}
-.fa-crop-alt:before {
- content: "\f565";
-}
-.fa-cross:before {
- content: "\f654";
-}
-.fa-crosshairs:before {
- content: "\f05b";
-}
-.fa-crow:before {
- content: "\f520";
-}
-.fa-crown:before {
- content: "\f521";
-}
-.fa-crutch:before {
- content: "\f7f7";
-}
-.fa-css3:before {
- content: "\f13c";
-}
-.fa-css3-alt:before {
- content: "\f38b";
-}
-.fa-cube:before {
- content: "\f1b2";
-}
-.fa-cubes:before {
- content: "\f1b3";
-}
-.fa-cut:before {
- content: "\f0c4";
-}
-.fa-cuttlefish:before {
- content: "\f38c";
-}
-.fa-d-and-d:before {
- content: "\f38d";
-}
-.fa-d-and-d-beyond:before {
- content: "\f6ca";
-}
-.fa-dashcube:before {
- content: "\f210";
-}
-.fa-database:before {
- content: "\f1c0";
-}
-.fa-deaf:before {
- content: "\f2a4";
-}
-.fa-delicious:before {
- content: "\f1a5";
-}
-.fa-democrat:before {
- content: "\f747";
-}
-.fa-deploydog:before {
- content: "\f38e";
-}
-.fa-deskpro:before {
- content: "\f38f";
-}
-.fa-desktop:before {
- content: "\f108";
-}
-.fa-dev:before {
- content: "\f6cc";
-}
-.fa-deviantart:before {
- content: "\f1bd";
-}
-.fa-dharmachakra:before {
- content: "\f655";
-}
-.fa-dhl:before {
- content: "\f790";
-}
-.fa-diagnoses:before {
- content: "\f470";
-}
-.fa-diaspora:before {
- content: "\f791";
-}
-.fa-dice:before {
- content: "\f522";
-}
-.fa-dice-d20:before {
- content: "\f6cf";
-}
-.fa-dice-d6:before {
- content: "\f6d1";
-}
-.fa-dice-five:before {
- content: "\f523";
-}
-.fa-dice-four:before {
- content: "\f524";
-}
-.fa-dice-one:before {
- content: "\f525";
-}
-.fa-dice-six:before {
- content: "\f526";
-}
-.fa-dice-three:before {
- content: "\f527";
-}
-.fa-dice-two:before {
- content: "\f528";
-}
-.fa-digg:before {
- content: "\f1a6";
-}
-.fa-digital-ocean:before {
- content: "\f391";
-}
-.fa-digital-tachograph:before {
- content: "\f566";
-}
-.fa-directions:before {
- content: "\f5eb";
-}
-.fa-discord:before {
- content: "\f392";
-}
-.fa-discourse:before {
- content: "\f393";
-}
-.fa-divide:before {
- content: "\f529";
-}
-.fa-dizzy:before {
- content: "\f567";
-}
-.fa-dna:before {
- content: "\f471";
-}
-.fa-dochub:before {
- content: "\f394";
-}
-.fa-docker:before {
- content: "\f395";
-}
-.fa-dog:before {
- content: "\f6d3";
-}
-.fa-dollar-sign:before {
- content: "\f155";
-}
-.fa-dolly:before {
- content: "\f472";
-}
-.fa-dolly-flatbed:before {
- content: "\f474";
-}
-.fa-donate:before {
- content: "\f4b9";
-}
-.fa-door-closed:before {
- content: "\f52a";
-}
-.fa-door-open:before {
- content: "\f52b";
-}
-.fa-dot-circle:before {
- content: "\f192";
-}
-.fa-dove:before {
- content: "\f4ba";
-}
-.fa-download:before {
- content: "\f019";
-}
-.fa-draft2digital:before {
- content: "\f396";
-}
-.fa-drafting-compass:before {
- content: "\f568";
-}
-.fa-dragon:before {
- content: "\f6d5";
-}
-.fa-draw-polygon:before {
- content: "\f5ee";
-}
-.fa-dribbble:before {
- content: "\f17d";
-}
-.fa-dribbble-square:before {
- content: "\f397";
-}
-.fa-dropbox:before {
- content: "\f16b";
-}
-.fa-drum:before {
- content: "\f569";
-}
-.fa-drum-steelpan:before {
- content: "\f56a";
-}
-.fa-drumstick-bite:before {
- content: "\f6d7";
-}
-.fa-drupal:before {
- content: "\f1a9";
-}
-.fa-dumbbell:before {
- content: "\f44b";
-}
-.fa-dumpster:before {
- content: "\f793";
-}
-.fa-dumpster-fire:before {
- content: "\f794";
-}
-.fa-dungeon:before {
- content: "\f6d9";
-}
-.fa-dyalog:before {
- content: "\f399";
-}
-.fa-earlybirds:before {
- content: "\f39a";
-}
-.fa-ebay:before {
- content: "\f4f4";
-}
-.fa-edge:before {
- content: "\f282";
-}
-.fa-edit:before {
- content: "\f044";
-}
-.fa-egg:before {
- content: "\f7fb";
-}
-.fa-eject:before {
- content: "\f052";
-}
-.fa-elementor:before {
- content: "\f430";
-}
-.fa-ellipsis-h:before {
- content: "\f141";
-}
-.fa-ellipsis-v:before {
- content: "\f142";
-}
-.fa-ello:before {
- content: "\f5f1";
-}
-.fa-ember:before {
- content: "\f423";
-}
-.fa-empire:before {
- content: "\f1d1";
-}
-.fa-envelope:before {
- content: "\f0e0";
-}
-.fa-envelope-open:before {
- content: "\f2b6";
-}
-.fa-envelope-open-text:before {
- content: "\f658";
-}
-.fa-envelope-square:before {
- content: "\f199";
-}
-.fa-envira:before {
- content: "\f299";
-}
-.fa-equals:before {
- content: "\f52c";
-}
-.fa-eraser:before {
- content: "\f12d";
-}
-.fa-erlang:before {
- content: "\f39d";
-}
-.fa-ethereum:before {
- content: "\f42e";
-}
-.fa-ethernet:before {
- content: "\f796";
-}
-.fa-etsy:before {
- content: "\f2d7";
-}
-.fa-euro-sign:before {
- content: "\f153";
-}
-.fa-evernote:before {
- content: "\f839";
-}
-.fa-exchange-alt:before {
- content: "\f362";
-}
-.fa-exclamation:before {
- content: "\f12a";
-}
-.fa-exclamation-circle:before {
- content: "\f06a";
-}
-.fa-exclamation-triangle:before {
- content: "\f071";
-}
-.fa-expand:before {
- content: "\f065";
-}
-.fa-expand-arrows-alt:before {
- content: "\f31e";
-}
-.fa-expeditedssl:before {
- content: "\f23e";
-}
-.fa-external-link-alt:before {
- content: "\f35d";
-}
-.fa-external-link-square-alt:before {
- content: "\f360";
-}
-.fa-eye:before {
- content: "\f06e";
-}
-.fa-eye-dropper:before {
- content: "\f1fb";
-}
-.fa-eye-slash:before {
- content: "\f070";
-}
-.fa-facebook:before {
- content: "\f09a";
-}
-.fa-facebook-f:before {
- content: "\f39e";
-}
-.fa-facebook-messenger:before {
- content: "\f39f";
-}
-.fa-facebook-square:before {
- content: "\f082";
-}
-.fa-fan:before {
- content: "\f863";
-}
-.fa-fantasy-flight-games:before {
- content: "\f6dc";
-}
-.fa-fast-backward:before {
- content: "\f049";
-}
-.fa-fast-forward:before {
- content: "\f050";
-}
-.fa-fax:before {
- content: "\f1ac";
-}
-.fa-feather:before {
- content: "\f52d";
-}
-.fa-feather-alt:before {
- content: "\f56b";
-}
-.fa-fedex:before {
- content: "\f797";
-}
-.fa-fedora:before {
- content: "\f798";
-}
-.fa-female:before {
- content: "\f182";
-}
-.fa-fighter-jet:before {
- content: "\f0fb";
-}
-.fa-figma:before {
- content: "\f799";
-}
-.fa-file:before {
- content: "\f15b";
-}
-.fa-file-alt:before {
- content: "\f15c";
-}
-.fa-file-archive:before {
- content: "\f1c6";
-}
-.fa-file-audio:before {
- content: "\f1c7";
-}
-.fa-file-code:before {
- content: "\f1c9";
-}
-.fa-file-contract:before {
- content: "\f56c";
-}
-.fa-file-csv:before {
- content: "\f6dd";
-}
-.fa-file-download:before {
- content: "\f56d";
-}
-.fa-file-excel:before {
- content: "\f1c3";
-}
-.fa-file-export:before {
- content: "\f56e";
-}
-.fa-file-image:before {
- content: "\f1c5";
-}
-.fa-file-import:before {
- content: "\f56f";
-}
-.fa-file-invoice:before {
- content: "\f570";
-}
-.fa-file-invoice-dollar:before {
- content: "\f571";
-}
-.fa-file-medical:before {
- content: "\f477";
-}
-.fa-file-medical-alt:before {
- content: "\f478";
-}
-.fa-file-pdf:before {
- content: "\f1c1";
-}
-.fa-file-powerpoint:before {
- content: "\f1c4";
-}
-.fa-file-prescription:before {
- content: "\f572";
-}
-.fa-file-signature:before {
- content: "\f573";
-}
-.fa-file-upload:before {
- content: "\f574";
-}
-.fa-file-video:before {
- content: "\f1c8";
-}
-.fa-file-word:before {
- content: "\f1c2";
-}
-.fa-fill:before {
- content: "\f575";
-}
-.fa-fill-drip:before {
- content: "\f576";
-}
-.fa-film:before {
- content: "\f008";
-}
-.fa-filter:before {
- content: "\f0b0";
-}
-.fa-fingerprint:before {
- content: "\f577";
-}
-.fa-fire:before {
- content: "\f06d";
-}
-.fa-fire-alt:before {
- content: "\f7e4";
-}
-.fa-fire-extinguisher:before {
- content: "\f134";
-}
-.fa-firefox:before {
- content: "\f269";
-}
-.fa-first-aid:before {
- content: "\f479";
-}
-.fa-first-order:before {
- content: "\f2b0";
-}
-.fa-first-order-alt:before {
- content: "\f50a";
-}
-.fa-firstdraft:before {
- content: "\f3a1";
-}
-.fa-fish:before {
- content: "\f578";
-}
-.fa-fist-raised:before {
- content: "\f6de";
-}
-.fa-flag:before {
- content: "\f024";
-}
-.fa-flag-checkered:before {
- content: "\f11e";
-}
-.fa-flag-usa:before {
- content: "\f74d";
-}
-.fa-flask:before {
- content: "\f0c3";
-}
-.fa-flickr:before {
- content: "\f16e";
-}
-.fa-flipboard:before {
- content: "\f44d";
-}
-.fa-flushed:before {
- content: "\f579";
-}
-.fa-fly:before {
- content: "\f417";
-}
-.fa-folder:before {
- content: "\f07b";
-}
-.fa-folder-minus:before {
- content: "\f65d";
-}
-.fa-folder-open:before {
- content: "\f07c";
-}
-.fa-folder-plus:before {
- content: "\f65e";
-}
-.fa-font:before {
- content: "\f031";
-}
-.fa-font-awesome:before {
- content: "\f2b4";
-}
-.fa-font-awesome-alt:before {
- content: "\f35c";
-}
-.fa-font-awesome-flag:before {
- content: "\f425";
-}
-.fa-font-awesome-logo-full:before {
- content: "\f4e6";
-}
-.fa-fonticons:before {
- content: "\f280";
-}
-.fa-fonticons-fi:before {
- content: "\f3a2";
-}
-.fa-football-ball:before {
- content: "\f44e";
-}
-.fa-fort-awesome:before {
- content: "\f286";
-}
-.fa-fort-awesome-alt:before {
- content: "\f3a3";
-}
-.fa-forumbee:before {
- content: "\f211";
-}
-.fa-forward:before {
- content: "\f04e";
-}
-.fa-foursquare:before {
- content: "\f180";
-}
-.fa-free-code-camp:before {
- content: "\f2c5";
-}
-.fa-freebsd:before {
- content: "\f3a4";
-}
-.fa-frog:before {
- content: "\f52e";
-}
-.fa-frown:before {
- content: "\f119";
-}
-.fa-frown-open:before {
- content: "\f57a";
-}
-.fa-fulcrum:before {
- content: "\f50b";
-}
-.fa-funnel-dollar:before {
- content: "\f662";
-}
-.fa-futbol:before {
- content: "\f1e3";
-}
-.fa-galactic-republic:before {
- content: "\f50c";
-}
-.fa-galactic-senate:before {
- content: "\f50d";
-}
-.fa-gamepad:before {
- content: "\f11b";
-}
-.fa-gas-pump:before {
- content: "\f52f";
-}
-.fa-gavel:before {
- content: "\f0e3";
-}
-.fa-gem:before {
- content: "\f3a5";
-}
-.fa-genderless:before {
- content: "\f22d";
-}
-.fa-get-pocket:before {
- content: "\f265";
-}
-.fa-gg:before {
- content: "\f260";
-}
-.fa-gg-circle:before {
- content: "\f261";
-}
-.fa-ghost:before {
- content: "\f6e2";
-}
-.fa-gift:before {
- content: "\f06b";
-}
-.fa-gifts:before {
- content: "\f79c";
-}
-.fa-git:before {
- content: "\f1d3";
-}
-.fa-git-alt:before {
- content: "\f841";
-}
-.fa-git-square:before {
- content: "\f1d2";
-}
-.fa-github:before {
- content: "\f09b";
-}
-.fa-github-alt:before {
- content: "\f113";
-}
-.fa-github-square:before {
- content: "\f092";
-}
-.fa-gitkraken:before {
- content: "\f3a6";
-}
-.fa-gitlab:before {
- content: "\f296";
-}
-.fa-gitter:before {
- content: "\f426";
-}
-.fa-glass-cheers:before {
- content: "\f79f";
-}
-.fa-glass-martini:before {
- content: "\f000";
-}
-.fa-glass-martini-alt:before {
- content: "\f57b";
-}
-.fa-glass-whiskey:before {
- content: "\f7a0";
-}
-.fa-glasses:before {
- content: "\f530";
-}
-.fa-glide:before {
- content: "\f2a5";
-}
-.fa-glide-g:before {
- content: "\f2a6";
-}
-.fa-globe:before {
- content: "\f0ac";
-}
-.fa-globe-africa:before {
- content: "\f57c";
-}
-.fa-globe-americas:before {
- content: "\f57d";
-}
-.fa-globe-asia:before {
- content: "\f57e";
-}
-.fa-globe-europe:before {
- content: "\f7a2";
-}
-.fa-gofore:before {
- content: "\f3a7";
-}
-.fa-golf-ball:before {
- content: "\f450";
-}
-.fa-goodreads:before {
- content: "\f3a8";
-}
-.fa-goodreads-g:before {
- content: "\f3a9";
-}
-.fa-google:before {
- content: "\f1a0";
-}
-.fa-google-drive:before {
- content: "\f3aa";
-}
-.fa-google-play:before {
- content: "\f3ab";
-}
-.fa-google-plus:before {
- content: "\f2b3";
-}
-.fa-google-plus-g:before {
- content: "\f0d5";
-}
-.fa-google-plus-square:before {
- content: "\f0d4";
-}
-.fa-google-wallet:before {
- content: "\f1ee";
-}
-.fa-gopuram:before {
- content: "\f664";
-}
-.fa-graduation-cap:before {
- content: "\f19d";
-}
-.fa-gratipay:before {
- content: "\f184";
-}
-.fa-grav:before {
- content: "\f2d6";
-}
-.fa-greater-than:before {
- content: "\f531";
-}
-.fa-greater-than-equal:before {
- content: "\f532";
-}
-.fa-grimace:before {
- content: "\f57f";
-}
-.fa-grin:before {
- content: "\f580";
-}
-.fa-grin-alt:before {
- content: "\f581";
-}
-.fa-grin-beam:before {
- content: "\f582";
-}
-.fa-grin-beam-sweat:before {
- content: "\f583";
-}
-.fa-grin-hearts:before {
- content: "\f584";
-}
-.fa-grin-squint:before {
- content: "\f585";
-}
-.fa-grin-squint-tears:before {
- content: "\f586";
-}
-.fa-grin-stars:before {
- content: "\f587";
-}
-.fa-grin-tears:before {
- content: "\f588";
-}
-.fa-grin-tongue:before {
- content: "\f589";
-}
-.fa-grin-tongue-squint:before {
- content: "\f58a";
-}
-.fa-grin-tongue-wink:before {
- content: "\f58b";
-}
-.fa-grin-wink:before {
- content: "\f58c";
-}
-.fa-grip-horizontal:before {
- content: "\f58d";
-}
-.fa-grip-lines:before {
- content: "\f7a4";
-}
-.fa-grip-lines-vertical:before {
- content: "\f7a5";
-}
-.fa-grip-vertical:before {
- content: "\f58e";
-}
-.fa-gripfire:before {
- content: "\f3ac";
-}
-.fa-grunt:before {
- content: "\f3ad";
-}
-.fa-guitar:before {
- content: "\f7a6";
-}
-.fa-gulp:before {
- content: "\f3ae";
-}
-.fa-h-square:before {
- content: "\f0fd";
-}
-.fa-hacker-news:before {
- content: "\f1d4";
-}
-.fa-hacker-news-square:before {
- content: "\f3af";
-}
-.fa-hackerrank:before {
- content: "\f5f7";
-}
-.fa-hamburger:before {
- content: "\f805";
-}
-.fa-hammer:before {
- content: "\f6e3";
-}
-.fa-hamsa:before {
- content: "\f665";
-}
-.fa-hand-holding:before {
- content: "\f4bd";
-}
-.fa-hand-holding-heart:before {
- content: "\f4be";
-}
-.fa-hand-holding-usd:before {
- content: "\f4c0";
-}
-.fa-hand-lizard:before {
- content: "\f258";
-}
-.fa-hand-middle-finger:before {
- content: "\f806";
-}
-.fa-hand-paper:before {
- content: "\f256";
-}
-.fa-hand-peace:before {
- content: "\f25b";
-}
-.fa-hand-point-down:before {
- content: "\f0a7";
-}
-.fa-hand-point-left:before {
- content: "\f0a5";
-}
-.fa-hand-point-right:before {
- content: "\f0a4";
-}
-.fa-hand-point-up:before {
- content: "\f0a6";
-}
-.fa-hand-pointer:before {
- content: "\f25a";
-}
-.fa-hand-rock:before {
- content: "\f255";
-}
-.fa-hand-scissors:before {
- content: "\f257";
-}
-.fa-hand-spock:before {
- content: "\f259";
-}
-.fa-hands:before {
- content: "\f4c2";
-}
-.fa-hands-helping:before {
- content: "\f4c4";
-}
-.fa-handshake:before {
- content: "\f2b5";
-}
-.fa-hanukiah:before {
- content: "\f6e6";
-}
-.fa-hard-hat:before {
- content: "\f807";
-}
-.fa-hashtag:before {
- content: "\f292";
-}
-.fa-hat-wizard:before {
- content: "\f6e8";
-}
-.fa-haykal:before {
- content: "\f666";
-}
-.fa-hdd:before {
- content: "\f0a0";
-}
-.fa-heading:before {
- content: "\f1dc";
-}
-.fa-headphones:before {
- content: "\f025";
-}
-.fa-headphones-alt:before {
- content: "\f58f";
-}
-.fa-headset:before {
- content: "\f590";
-}
-.fa-heart:before {
- content: "\f004";
-}
-.fa-heart-broken:before {
- content: "\f7a9";
-}
-.fa-heartbeat:before {
- content: "\f21e";
-}
-.fa-helicopter:before {
- content: "\f533";
-}
-.fa-highlighter:before {
- content: "\f591";
-}
-.fa-hiking:before {
- content: "\f6ec";
-}
-.fa-hippo:before {
- content: "\f6ed";
-}
-.fa-hips:before {
- content: "\f452";
-}
-.fa-hire-a-helper:before {
- content: "\f3b0";
-}
-.fa-history:before {
- content: "\f1da";
-}
-.fa-hockey-puck:before {
- content: "\f453";
-}
-.fa-holly-berry:before {
- content: "\f7aa";
-}
-.fa-home:before {
- content: "\f015";
-}
-.fa-hooli:before {
- content: "\f427";
-}
-.fa-hornbill:before {
- content: "\f592";
-}
-.fa-horse:before {
- content: "\f6f0";
-}
-.fa-horse-head:before {
- content: "\f7ab";
-}
-.fa-hospital:before {
- content: "\f0f8";
-}
-.fa-hospital-alt:before {
- content: "\f47d";
-}
-.fa-hospital-symbol:before {
- content: "\f47e";
-}
-.fa-hot-tub:before {
- content: "\f593";
-}
-.fa-hotdog:before {
- content: "\f80f";
-}
-.fa-hotel:before {
- content: "\f594";
-}
-.fa-hotjar:before {
- content: "\f3b1";
-}
-.fa-hourglass:before {
- content: "\f254";
-}
-.fa-hourglass-end:before {
- content: "\f253";
-}
-.fa-hourglass-half:before {
- content: "\f252";
-}
-.fa-hourglass-start:before {
- content: "\f251";
-}
-.fa-house-damage:before {
- content: "\f6f1";
-}
-.fa-houzz:before {
- content: "\f27c";
-}
-.fa-hryvnia:before {
- content: "\f6f2";
-}
-.fa-html5:before {
- content: "\f13b";
-}
-.fa-hubspot:before {
- content: "\f3b2";
-}
-.fa-i-cursor:before {
- content: "\f246";
-}
-.fa-ice-cream:before {
- content: "\f810";
-}
-.fa-icicles:before {
- content: "\f7ad";
-}
-.fa-icons:before {
- content: "\f86d";
-}
-.fa-id-badge:before {
- content: "\f2c1";
-}
-.fa-id-card:before {
- content: "\f2c2";
-}
-.fa-id-card-alt:before {
- content: "\f47f";
-}
-.fa-igloo:before {
- content: "\f7ae";
-}
-.fa-image:before {
- content: "\f03e";
-}
-.fa-images:before {
- content: "\f302";
-}
-.fa-imdb:before {
- content: "\f2d8";
-}
-.fa-inbox:before {
- content: "\f01c";
-}
-.fa-indent:before {
- content: "\f03c";
-}
-.fa-industry:before {
- content: "\f275";
-}
-.fa-infinity:before {
- content: "\f534";
-}
-.fa-info:before {
- content: "\f129";
-}
-.fa-info-circle:before {
- content: "\f05a";
-}
-.fa-instagram:before {
- content: "\f16d";
-}
-.fa-intercom:before {
- content: "\f7af";
-}
-.fa-internet-explorer:before {
- content: "\f26b";
-}
-.fa-invision:before {
- content: "\f7b0";
-}
-.fa-ioxhost:before {
- content: "\f208";
-}
-.fa-italic:before {
- content: "\f033";
-}
-.fa-itch-io:before {
- content: "\f83a";
-}
-.fa-itunes:before {
- content: "\f3b4";
-}
-.fa-itunes-note:before {
- content: "\f3b5";
-}
-.fa-java:before {
- content: "\f4e4";
-}
-.fa-jedi:before {
- content: "\f669";
-}
-.fa-jedi-order:before {
- content: "\f50e";
-}
-.fa-jenkins:before {
- content: "\f3b6";
-}
-.fa-jira:before {
- content: "\f7b1";
-}
-.fa-joget:before {
- content: "\f3b7";
-}
-.fa-joint:before {
- content: "\f595";
-}
-.fa-joomla:before {
- content: "\f1aa";
-}
-.fa-journal-whills:before {
- content: "\f66a";
-}
-.fa-js:before {
- content: "\f3b8";
-}
-.fa-js-square:before {
- content: "\f3b9";
-}
-.fa-jsfiddle:before {
- content: "\f1cc";
-}
-.fa-kaaba:before {
- content: "\f66b";
-}
-.fa-kaggle:before {
- content: "\f5fa";
-}
-.fa-key:before {
- content: "\f084";
-}
-.fa-keybase:before {
- content: "\f4f5";
-}
-.fa-keyboard:before {
- content: "\f11c";
-}
-.fa-keycdn:before {
- content: "\f3ba";
-}
-.fa-khanda:before {
- content: "\f66d";
-}
-.fa-kickstarter:before {
- content: "\f3bb";
-}
-.fa-kickstarter-k:before {
- content: "\f3bc";
-}
-.fa-kiss:before {
- content: "\f596";
-}
-.fa-kiss-beam:before {
- content: "\f597";
-}
-.fa-kiss-wink-heart:before {
- content: "\f598";
-}
-.fa-kiwi-bird:before {
- content: "\f535";
-}
-.fa-korvue:before {
- content: "\f42f";
-}
-.fa-landmark:before {
- content: "\f66f";
-}
-.fa-language:before {
- content: "\f1ab";
-}
-.fa-laptop:before {
- content: "\f109";
-}
-.fa-laptop-code:before {
- content: "\f5fc";
-}
-.fa-laptop-medical:before {
- content: "\f812";
-}
-.fa-laravel:before {
- content: "\f3bd";
-}
-.fa-lastfm:before {
- content: "\f202";
-}
-.fa-lastfm-square:before {
- content: "\f203";
-}
-.fa-laugh:before {
- content: "\f599";
-}
-.fa-laugh-beam:before {
- content: "\f59a";
-}
-.fa-laugh-squint:before {
- content: "\f59b";
-}
-.fa-laugh-wink:before {
- content: "\f59c";
-}
-.fa-layer-group:before {
- content: "\f5fd";
-}
-.fa-leaf:before {
- content: "\f06c";
-}
-.fa-leanpub:before {
- content: "\f212";
-}
-.fa-lemon:before {
- content: "\f094";
-}
-.fa-less:before {
- content: "\f41d";
-}
-.fa-less-than:before {
- content: "\f536";
-}
-.fa-less-than-equal:before {
- content: "\f537";
-}
-.fa-level-down-alt:before {
- content: "\f3be";
-}
-.fa-level-up-alt:before {
- content: "\f3bf";
-}
-.fa-life-ring:before {
- content: "\f1cd";
-}
-.fa-lightbulb:before {
- content: "\f0eb";
-}
-.fa-line:before {
- content: "\f3c0";
-}
-.fa-link:before {
- content: "\f0c1";
-}
-.fa-linkedin:before {
- content: "\f08c";
-}
-.fa-linkedin-in:before {
- content: "\f0e1";
-}
-.fa-linode:before {
- content: "\f2b8";
-}
-.fa-linux:before {
- content: "\f17c";
-}
-.fa-lira-sign:before {
- content: "\f195";
-}
-.fa-list:before {
- content: "\f03a";
-}
-.fa-list-alt:before {
- content: "\f022";
-}
-.fa-list-ol:before {
- content: "\f0cb";
-}
-.fa-list-ul:before {
- content: "\f0ca";
-}
-.fa-location-arrow:before {
- content: "\f124";
-}
-.fa-lock:before {
- content: "\f023";
-}
-.fa-lock-open:before {
- content: "\f3c1";
-}
-.fa-long-arrow-alt-down:before {
- content: "\f309";
-}
-.fa-long-arrow-alt-left:before {
- content: "\f30a";
-}
-.fa-long-arrow-alt-right:before {
- content: "\f30b";
-}
-.fa-long-arrow-alt-up:before {
- content: "\f30c";
-}
-.fa-low-vision:before {
- content: "\f2a8";
-}
-.fa-luggage-cart:before {
- content: "\f59d";
-}
-.fa-lyft:before {
- content: "\f3c3";
-}
-.fa-magento:before {
- content: "\f3c4";
-}
-.fa-magic:before {
- content: "\f0d0";
-}
-.fa-magnet:before {
- content: "\f076";
-}
-.fa-mail-bulk:before {
- content: "\f674";
-}
-.fa-mailchimp:before {
- content: "\f59e";
-}
-.fa-male:before {
- content: "\f183";
-}
-.fa-mandalorian:before {
- content: "\f50f";
-}
-.fa-map:before {
- content: "\f279";
-}
-.fa-map-marked:before {
- content: "\f59f";
-}
-.fa-map-marked-alt:before {
- content: "\f5a0";
-}
-.fa-map-marker:before {
- content: "\f041";
-}
-.fa-map-marker-alt:before {
- content: "\f3c5";
-}
-.fa-map-pin:before {
- content: "\f276";
-}
-.fa-map-signs:before {
- content: "\f277";
-}
-.fa-markdown:before {
- content: "\f60f";
-}
-.fa-marker:before {
- content: "\f5a1";
-}
-.fa-mars:before {
- content: "\f222";
-}
-.fa-mars-double:before {
- content: "\f227";
-}
-.fa-mars-stroke:before {
- content: "\f229";
-}
-.fa-mars-stroke-h:before {
- content: "\f22b";
-}
-.fa-mars-stroke-v:before {
- content: "\f22a";
-}
-.fa-mask:before {
- content: "\f6fa";
-}
-.fa-mastodon:before {
- content: "\f4f6";
-}
-.fa-maxcdn:before {
- content: "\f136";
-}
-.fa-medal:before {
- content: "\f5a2";
-}
-.fa-medapps:before {
- content: "\f3c6";
-}
-.fa-medium:before {
- content: "\f23a";
-}
-.fa-medium-m:before {
- content: "\f3c7";
-}
-.fa-medkit:before {
- content: "\f0fa";
-}
-.fa-medrt:before {
- content: "\f3c8";
-}
-.fa-meetup:before {
- content: "\f2e0";
-}
-.fa-megaport:before {
- content: "\f5a3";
-}
-.fa-meh:before {
- content: "\f11a";
-}
-.fa-meh-blank:before {
- content: "\f5a4";
-}
-.fa-meh-rolling-eyes:before {
- content: "\f5a5";
-}
-.fa-memory:before {
- content: "\f538";
-}
-.fa-mendeley:before {
- content: "\f7b3";
-}
-.fa-menorah:before {
- content: "\f676";
-}
-.fa-mercury:before {
- content: "\f223";
-}
-.fa-meteor:before {
- content: "\f753";
-}
-.fa-microchip:before {
- content: "\f2db";
-}
-.fa-microphone:before {
- content: "\f130";
-}
-.fa-microphone-alt:before {
- content: "\f3c9";
-}
-.fa-microphone-alt-slash:before {
- content: "\f539";
-}
-.fa-microphone-slash:before {
- content: "\f131";
-}
-.fa-microscope:before {
- content: "\f610";
-}
-.fa-microsoft:before {
- content: "\f3ca";
-}
-.fa-minus:before {
- content: "\f068";
-}
-.fa-minus-circle:before {
- content: "\f056";
-}
-.fa-minus-square:before {
- content: "\f146";
-}
-.fa-mitten:before {
- content: "\f7b5";
-}
-.fa-mix:before {
- content: "\f3cb";
-}
-.fa-mixcloud:before {
- content: "\f289";
-}
-.fa-mizuni:before {
- content: "\f3cc";
-}
-.fa-mobile:before {
- content: "\f10b";
-}
-.fa-mobile-alt:before {
- content: "\f3cd";
-}
-.fa-modx:before {
- content: "\f285";
-}
-.fa-monero:before {
- content: "\f3d0";
-}
-.fa-money-bill:before {
- content: "\f0d6";
-}
-.fa-money-bill-alt:before {
- content: "\f3d1";
-}
-.fa-money-bill-wave:before {
- content: "\f53a";
-}
-.fa-money-bill-wave-alt:before {
- content: "\f53b";
-}
-.fa-money-check:before {
- content: "\f53c";
-}
-.fa-money-check-alt:before {
- content: "\f53d";
-}
-.fa-monument:before {
- content: "\f5a6";
-}
-.fa-moon:before {
- content: "\f186";
-}
-.fa-mortar-pestle:before {
- content: "\f5a7";
-}
-.fa-mosque:before {
- content: "\f678";
-}
-.fa-motorcycle:before {
- content: "\f21c";
-}
-.fa-mountain:before {
- content: "\f6fc";
-}
-.fa-mouse-pointer:before {
- content: "\f245";
-}
-.fa-mug-hot:before {
- content: "\f7b6";
-}
-.fa-music:before {
- content: "\f001";
-}
-.fa-napster:before {
- content: "\f3d2";
-}
-.fa-neos:before {
- content: "\f612";
-}
-.fa-network-wired:before {
- content: "\f6ff";
-}
-.fa-neuter:before {
- content: "\f22c";
-}
-.fa-newspaper:before {
- content: "\f1ea";
-}
-.fa-nimblr:before {
- content: "\f5a8";
-}
-.fa-node:before {
- content: "\f419";
-}
-.fa-node-js:before {
- content: "\f3d3";
-}
-.fa-not-equal:before {
- content: "\f53e";
-}
-.fa-notes-medical:before {
- content: "\f481";
-}
-.fa-npm:before {
- content: "\f3d4";
-}
-.fa-ns8:before {
- content: "\f3d5";
-}
-.fa-nutritionix:before {
- content: "\f3d6";
-}
-.fa-object-group:before {
- content: "\f247";
-}
-.fa-object-ungroup:before {
- content: "\f248";
-}
-.fa-odnoklassniki:before {
- content: "\f263";
-}
-.fa-odnoklassniki-square:before {
- content: "\f264";
-}
-.fa-oil-can:before {
- content: "\f613";
-}
-.fa-old-republic:before {
- content: "\f510";
-}
-.fa-om:before {
- content: "\f679";
-}
-.fa-opencart:before {
- content: "\f23d";
-}
-.fa-openid:before {
- content: "\f19b";
-}
-.fa-opera:before {
- content: "\f26a";
-}
-.fa-optin-monster:before {
- content: "\f23c";
-}
-.fa-osi:before {
- content: "\f41a";
-}
-.fa-otter:before {
- content: "\f700";
-}
-.fa-outdent:before {
- content: "\f03b";
-}
-.fa-page4:before {
- content: "\f3d7";
-}
-.fa-pagelines:before {
- content: "\f18c";
-}
-.fa-pager:before {
- content: "\f815";
-}
-.fa-paint-brush:before {
- content: "\f1fc";
-}
-.fa-paint-roller:before {
- content: "\f5aa";
-}
-.fa-palette:before {
- content: "\f53f";
-}
-.fa-palfed:before {
- content: "\f3d8";
-}
-.fa-pallet:before {
- content: "\f482";
-}
-.fa-paper-plane:before {
- content: "\f1d8";
-}
-.fa-paperclip:before {
- content: "\f0c6";
-}
-.fa-parachute-box:before {
- content: "\f4cd";
-}
-.fa-paragraph:before {
- content: "\f1dd";
-}
-.fa-parking:before {
- content: "\f540";
-}
-.fa-passport:before {
- content: "\f5ab";
-}
-.fa-pastafarianism:before {
- content: "\f67b";
-}
-.fa-paste:before {
- content: "\f0ea";
-}
-.fa-patreon:before {
- content: "\f3d9";
-}
-.fa-pause:before {
- content: "\f04c";
-}
-.fa-pause-circle:before {
- content: "\f28b";
-}
-.fa-paw:before {
- content: "\f1b0";
-}
-.fa-paypal:before {
- content: "\f1ed";
-}
-.fa-peace:before {
- content: "\f67c";
-}
-.fa-pen:before {
- content: "\f304";
-}
-.fa-pen-alt:before {
- content: "\f305";
-}
-.fa-pen-fancy:before {
- content: "\f5ac";
-}
-.fa-pen-nib:before {
- content: "\f5ad";
-}
-.fa-pen-square:before {
- content: "\f14b";
-}
-.fa-pencil-alt:before {
- content: "\f303";
-}
-.fa-pencil-ruler:before {
- content: "\f5ae";
-}
-.fa-penny-arcade:before {
- content: "\f704";
-}
-.fa-people-carry:before {
- content: "\f4ce";
-}
-.fa-pepper-hot:before {
- content: "\f816";
-}
-.fa-percent:before {
- content: "\f295";
-}
-.fa-percentage:before {
- content: "\f541";
-}
-.fa-periscope:before {
- content: "\f3da";
-}
-.fa-person-booth:before {
- content: "\f756";
-}
-.fa-phabricator:before {
- content: "\f3db";
-}
-.fa-phoenix-framework:before {
- content: "\f3dc";
-}
-.fa-phoenix-squadron:before {
- content: "\f511";
-}
-.fa-phone:before {
- content: "\f095";
-}
-.fa-phone-alt:before {
- content: "\f879";
-}
-.fa-phone-slash:before {
- content: "\f3dd";
-}
-.fa-phone-square:before {
- content: "\f098";
-}
-.fa-phone-square-alt:before {
- content: "\f87b";
-}
-.fa-phone-volume:before {
- content: "\f2a0";
-}
-.fa-photo-video:before {
- content: "\f87c";
-}
-.fa-php:before {
- content: "\f457";
-}
-.fa-pied-piper:before {
- content: "\f2ae";
-}
-.fa-pied-piper-alt:before {
- content: "\f1a8";
-}
-.fa-pied-piper-hat:before {
- content: "\f4e5";
-}
-.fa-pied-piper-pp:before {
- content: "\f1a7";
-}
-.fa-piggy-bank:before {
- content: "\f4d3";
-}
-.fa-pills:before {
- content: "\f484";
-}
-.fa-pinterest:before {
- content: "\f0d2";
-}
-.fa-pinterest-p:before {
- content: "\f231";
-}
-.fa-pinterest-square:before {
- content: "\f0d3";
-}
-.fa-pizza-slice:before {
- content: "\f818";
-}
-.fa-place-of-worship:before {
- content: "\f67f";
-}
-.fa-plane:before {
- content: "\f072";
-}
-.fa-plane-arrival:before {
- content: "\f5af";
-}
-.fa-plane-departure:before {
- content: "\f5b0";
-}
-.fa-play:before {
- content: "\f04b";
-}
-.fa-play-circle:before {
- content: "\f144";
-}
-.fa-playstation:before {
- content: "\f3df";
-}
-.fa-plug:before {
- content: "\f1e6";
-}
-.fa-plus:before {
- content: "\f067";
-}
-.fa-plus-circle:before {
- content: "\f055";
-}
-.fa-plus-square:before {
- content: "\f0fe";
-}
-.fa-podcast:before {
- content: "\f2ce";
-}
-.fa-poll:before {
- content: "\f681";
-}
-.fa-poll-h:before {
- content: "\f682";
-}
-.fa-poo:before {
- content: "\f2fe";
-}
-.fa-poo-storm:before {
- content: "\f75a";
-}
-.fa-poop:before {
- content: "\f619";
-}
-.fa-portrait:before {
- content: "\f3e0";
-}
-.fa-pound-sign:before {
- content: "\f154";
-}
-.fa-power-off:before {
- content: "\f011";
-}
-.fa-pray:before {
- content: "\f683";
-}
-.fa-praying-hands:before {
- content: "\f684";
-}
-.fa-prescription:before {
- content: "\f5b1";
-}
-.fa-prescription-bottle:before {
- content: "\f485";
-}
-.fa-prescription-bottle-alt:before {
- content: "\f486";
-}
-.fa-print:before {
- content: "\f02f";
-}
-.fa-procedures:before {
- content: "\f487";
-}
-.fa-product-hunt:before {
- content: "\f288";
-}
-.fa-project-diagram:before {
- content: "\f542";
-}
-.fa-pushed:before {
- content: "\f3e1";
-}
-.fa-puzzle-piece:before {
- content: "\f12e";
-}
-.fa-python:before {
- content: "\f3e2";
-}
-.fa-qq:before {
- content: "\f1d6";
-}
-.fa-qrcode:before {
- content: "\f029";
-}
-.fa-question:before {
- content: "\f128";
-}
-.fa-question-circle:before {
- content: "\f059";
-}
-.fa-quidditch:before {
- content: "\f458";
-}
-.fa-quinscape:before {
- content: "\f459";
-}
-.fa-quora:before {
- content: "\f2c4";
-}
-.fa-quote-left:before {
- content: "\f10d";
-}
-.fa-quote-right:before {
- content: "\f10e";
-}
-.fa-quran:before {
- content: "\f687";
-}
-.fa-r-project:before {
- content: "\f4f7";
-}
-.fa-radiation:before {
- content: "\f7b9";
-}
-.fa-radiation-alt:before {
- content: "\f7ba";
-}
-.fa-rainbow:before {
- content: "\f75b";
-}
-.fa-random:before {
- content: "\f074";
-}
-.fa-raspberry-pi:before {
- content: "\f7bb";
-}
-.fa-ravelry:before {
- content: "\f2d9";
-}
-.fa-react:before {
- content: "\f41b";
-}
-.fa-reacteurope:before {
- content: "\f75d";
-}
-.fa-readme:before {
- content: "\f4d5";
-}
-.fa-rebel:before {
- content: "\f1d0";
-}
-.fa-receipt:before {
- content: "\f543";
-}
-.fa-recycle:before {
- content: "\f1b8";
-}
-.fa-red-river:before {
- content: "\f3e3";
-}
-.fa-reddit:before {
- content: "\f1a1";
-}
-.fa-reddit-alien:before {
- content: "\f281";
-}
-.fa-reddit-square:before {
- content: "\f1a2";
-}
-.fa-redhat:before {
- content: "\f7bc";
-}
-.fa-redo:before {
- content: "\f01e";
-}
-.fa-redo-alt:before {
- content: "\f2f9";
-}
-.fa-registered:before {
- content: "\f25d";
-}
-.fa-remove-format:before {
- content: "\f87d";
-}
-.fa-renren:before {
- content: "\f18b";
-}
-.fa-reply:before {
- content: "\f3e5";
-}
-.fa-reply-all:before {
- content: "\f122";
-}
-.fa-replyd:before {
- content: "\f3e6";
-}
-.fa-republican:before {
- content: "\f75e";
-}
-.fa-researchgate:before {
- content: "\f4f8";
-}
-.fa-resolving:before {
- content: "\f3e7";
-}
-.fa-restroom:before {
- content: "\f7bd";
-}
-.fa-retweet:before {
- content: "\f079";
-}
-.fa-rev:before {
- content: "\f5b2";
-}
-.fa-ribbon:before {
- content: "\f4d6";
-}
-.fa-ring:before {
- content: "\f70b";
-}
-.fa-road:before {
- content: "\f018";
-}
-.fa-robot:before {
- content: "\f544";
-}
-.fa-rocket:before {
- content: "\f135";
-}
-.fa-rocketchat:before {
- content: "\f3e8";
-}
-.fa-rockrms:before {
- content: "\f3e9";
-}
-.fa-route:before {
- content: "\f4d7";
-}
-.fa-rss:before {
- content: "\f09e";
-}
-.fa-rss-square:before {
- content: "\f143";
-}
-.fa-ruble-sign:before {
- content: "\f158";
-}
-.fa-ruler:before {
- content: "\f545";
-}
-.fa-ruler-combined:before {
- content: "\f546";
-}
-.fa-ruler-horizontal:before {
- content: "\f547";
-}
-.fa-ruler-vertical:before {
- content: "\f548";
-}
-.fa-running:before {
- content: "\f70c";
-}
-.fa-rupee-sign:before {
- content: "\f156";
-}
-.fa-sad-cry:before {
- content: "\f5b3";
-}
-.fa-sad-tear:before {
- content: "\f5b4";
-}
-.fa-safari:before {
- content: "\f267";
-}
-.fa-salesforce:before {
- content: "\f83b";
-}
-.fa-sass:before {
- content: "\f41e";
-}
-.fa-satellite:before {
- content: "\f7bf";
-}
-.fa-satellite-dish:before {
- content: "\f7c0";
-}
-.fa-save:before {
- content: "\f0c7";
-}
-.fa-schlix:before {
- content: "\f3ea";
-}
-.fa-school:before {
- content: "\f549";
-}
-.fa-screwdriver:before {
- content: "\f54a";
-}
-.fa-scribd:before {
- content: "\f28a";
-}
-.fa-scroll:before {
- content: "\f70e";
-}
-.fa-sd-card:before {
- content: "\f7c2";
-}
-.fa-search:before {
- content: "\f002";
-}
-.fa-search-dollar:before {
- content: "\f688";
-}
-.fa-search-location:before {
- content: "\f689";
-}
-.fa-search-minus:before {
- content: "\f010";
-}
-.fa-search-plus:before {
- content: "\f00e";
-}
-.fa-searchengin:before {
- content: "\f3eb";
-}
-.fa-seedling:before {
- content: "\f4d8";
-}
-.fa-sellcast:before {
- content: "\f2da";
-}
-.fa-sellsy:before {
- content: "\f213";
-}
-.fa-server:before {
- content: "\f233";
-}
-.fa-servicestack:before {
- content: "\f3ec";
-}
-.fa-shapes:before {
- content: "\f61f";
-}
-.fa-share:before {
- content: "\f064";
-}
-.fa-share-alt:before {
- content: "\f1e0";
-}
-.fa-share-alt-square:before {
- content: "\f1e1";
-}
-.fa-share-square:before {
- content: "\f14d";
-}
-.fa-shekel-sign:before {
- content: "\f20b";
-}
-.fa-shield-alt:before {
- content: "\f3ed";
-}
-.fa-ship:before {
- content: "\f21a";
-}
-.fa-shipping-fast:before {
- content: "\f48b";
-}
-.fa-shirtsinbulk:before {
- content: "\f214";
-}
-.fa-shoe-prints:before {
- content: "\f54b";
-}
-.fa-shopping-bag:before {
- content: "\f290";
-}
-.fa-shopping-basket:before {
- content: "\f291";
-}
-.fa-shopping-cart:before {
- content: "\f07a";
-}
-.fa-shopware:before {
- content: "\f5b5";
-}
-.fa-shower:before {
- content: "\f2cc";
-}
-.fa-shuttle-van:before {
- content: "\f5b6";
-}
-.fa-sign:before {
- content: "\f4d9";
-}
-.fa-sign-in-alt:before {
- content: "\f2f6";
-}
-.fa-sign-language:before {
- content: "\f2a7";
-}
-.fa-sign-out-alt:before {
- content: "\f2f5";
-}
-.fa-signal:before {
- content: "\f012";
-}
-.fa-signature:before {
- content: "\f5b7";
-}
-.fa-sim-card:before {
- content: "\f7c4";
-}
-.fa-simplybuilt:before {
- content: "\f215";
-}
-.fa-sistrix:before {
- content: "\f3ee";
-}
-.fa-sitemap:before {
- content: "\f0e8";
-}
-.fa-sith:before {
- content: "\f512";
-}
-.fa-skating:before {
- content: "\f7c5";
-}
-.fa-sketch:before {
- content: "\f7c6";
-}
-.fa-skiing:before {
- content: "\f7c9";
-}
-.fa-skiing-nordic:before {
- content: "\f7ca";
-}
-.fa-skull:before {
- content: "\f54c";
-}
-.fa-skull-crossbones:before {
- content: "\f714";
-}
-.fa-skyatlas:before {
- content: "\f216";
-}
-.fa-skype:before {
- content: "\f17e";
-}
-.fa-slack:before {
- content: "\f198";
-}
-.fa-slack-hash:before {
- content: "\f3ef";
-}
-.fa-slash:before {
- content: "\f715";
-}
-.fa-sleigh:before {
- content: "\f7cc";
-}
-.fa-sliders-h:before {
- content: "\f1de";
-}
-.fa-slideshare:before {
- content: "\f1e7";
-}
-.fa-smile:before {
- content: "\f118";
-}
-.fa-smile-beam:before {
- content: "\f5b8";
-}
-.fa-smile-wink:before {
- content: "\f4da";
-}
-.fa-smog:before {
- content: "\f75f";
-}
-.fa-smoking:before {
- content: "\f48d";
-}
-.fa-smoking-ban:before {
- content: "\f54d";
-}
-.fa-sms:before {
- content: "\f7cd";
-}
-.fa-snapchat:before {
- content: "\f2ab";
-}
-.fa-snapchat-ghost:before {
- content: "\f2ac";
-}
-.fa-snapchat-square:before {
- content: "\f2ad";
-}
-.fa-snowboarding:before {
- content: "\f7ce";
-}
-.fa-snowflake:before {
- content: "\f2dc";
-}
-.fa-snowman:before {
- content: "\f7d0";
-}
-.fa-snowplow:before {
- content: "\f7d2";
-}
-.fa-socks:before {
- content: "\f696";
-}
-.fa-solar-panel:before {
- content: "\f5ba";
-}
-.fa-sort:before {
- content: "\f0dc";
-}
-.fa-sort-alpha-down:before {
- content: "\f15d";
-}
-.fa-sort-alpha-down-alt:before {
- content: "\f881";
-}
-.fa-sort-alpha-up:before {
- content: "\f15e";
-}
-.fa-sort-alpha-up-alt:before {
- content: "\f882";
-}
-.fa-sort-amount-down:before {
- content: "\f160";
-}
-.fa-sort-amount-down-alt:before {
- content: "\f884";
-}
-.fa-sort-amount-up:before {
- content: "\f161";
-}
-.fa-sort-amount-up-alt:before {
- content: "\f885";
-}
-.fa-sort-down:before {
- content: "\f0dd";
-}
-.fa-sort-numeric-down:before {
- content: "\f162";
-}
-.fa-sort-numeric-down-alt:before {
- content: "\f886";
-}
-.fa-sort-numeric-up:before {
- content: "\f163";
-}
-.fa-sort-numeric-up-alt:before {
- content: "\f887";
-}
-.fa-sort-up:before {
- content: "\f0de";
-}
-.fa-soundcloud:before {
- content: "\f1be";
-}
-.fa-sourcetree:before {
- content: "\f7d3";
-}
-.fa-spa:before {
- content: "\f5bb";
-}
-.fa-space-shuttle:before {
- content: "\f197";
-}
-.fa-speakap:before {
- content: "\f3f3";
-}
-.fa-speaker-deck:before {
- content: "\f83c";
-}
-.fa-spell-check:before {
- content: "\f891";
-}
-.fa-spider:before {
- content: "\f717";
-}
-.fa-spinner:before {
- content: "\f110";
-}
-.fa-splotch:before {
- content: "\f5bc";
-}
-.fa-spotify:before {
- content: "\f1bc";
-}
-.fa-spray-can:before {
- content: "\f5bd";
-}
-.fa-square:before {
- content: "\f0c8";
-}
-.fa-square-full:before {
- content: "\f45c";
-}
-.fa-square-root-alt:before {
- content: "\f698";
-}
-.fa-squarespace:before {
- content: "\f5be";
-}
-.fa-stack-exchange:before {
- content: "\f18d";
-}
-.fa-stack-overflow:before {
- content: "\f16c";
-}
-.fa-stackpath:before {
- content: "\f842";
-}
-.fa-stamp:before {
- content: "\f5bf";
-}
-.fa-star:before {
- content: "\f005";
-}
-.fa-star-and-crescent:before {
- content: "\f699";
-}
-.fa-star-half:before {
- content: "\f089";
-}
-.fa-star-half-alt:before {
- content: "\f5c0";
-}
-.fa-star-of-david:before {
- content: "\f69a";
-}
-.fa-star-of-life:before {
- content: "\f621";
-}
-.fa-staylinked:before {
- content: "\f3f5";
-}
-.fa-steam:before {
- content: "\f1b6";
-}
-.fa-steam-square:before {
- content: "\f1b7";
-}
-.fa-steam-symbol:before {
- content: "\f3f6";
-}
-.fa-step-backward:before {
- content: "\f048";
-}
-.fa-step-forward:before {
- content: "\f051";
-}
-.fa-stethoscope:before {
- content: "\f0f1";
-}
-.fa-sticker-mule:before {
- content: "\f3f7";
-}
-.fa-sticky-note:before {
- content: "\f249";
-}
-.fa-stop:before {
- content: "\f04d";
-}
-.fa-stop-circle:before {
- content: "\f28d";
-}
-.fa-stopwatch:before {
- content: "\f2f2";
-}
-.fa-store:before {
- content: "\f54e";
-}
-.fa-store-alt:before {
- content: "\f54f";
-}
-.fa-strava:before {
- content: "\f428";
-}
-.fa-stream:before {
- content: "\f550";
-}
-.fa-street-view:before {
- content: "\f21d";
-}
-.fa-strikethrough:before {
- content: "\f0cc";
-}
-.fa-stripe:before {
- content: "\f429";
-}
-.fa-stripe-s:before {
- content: "\f42a";
-}
-.fa-stroopwafel:before {
- content: "\f551";
-}
-.fa-studiovinari:before {
- content: "\f3f8";
-}
-.fa-stumbleupon:before {
- content: "\f1a4";
-}
-.fa-stumbleupon-circle:before {
- content: "\f1a3";
-}
-.fa-subscript:before {
- content: "\f12c";
-}
-.fa-subway:before {
- content: "\f239";
-}
-.fa-suitcase:before {
- content: "\f0f2";
-}
-.fa-suitcase-rolling:before {
- content: "\f5c1";
-}
-.fa-sun:before {
- content: "\f185";
-}
-.fa-superpowers:before {
- content: "\f2dd";
-}
-.fa-superscript:before {
- content: "\f12b";
-}
-.fa-supple:before {
- content: "\f3f9";
-}
-.fa-surprise:before {
- content: "\f5c2";
-}
-.fa-suse:before {
- content: "\f7d6";
-}
-.fa-swatchbook:before {
- content: "\f5c3";
-}
-.fa-swimmer:before {
- content: "\f5c4";
-}
-.fa-swimming-pool:before {
- content: "\f5c5";
-}
-.fa-symfony:before {
- content: "\f83d";
-}
-.fa-synagogue:before {
- content: "\f69b";
-}
-.fa-sync:before {
- content: "\f021";
-}
-.fa-sync-alt:before {
- content: "\f2f1";
-}
-.fa-syringe:before {
- content: "\f48e";
-}
-.fa-table:before {
- content: "\f0ce";
-}
-.fa-table-tennis:before {
- content: "\f45d";
-}
-.fa-tablet:before {
- content: "\f10a";
-}
-.fa-tablet-alt:before {
- content: "\f3fa";
-}
-.fa-tablets:before {
- content: "\f490";
-}
-.fa-tachometer-alt:before {
- content: "\f3fd";
-}
-.fa-tag:before {
- content: "\f02b";
-}
-.fa-tags:before {
- content: "\f02c";
-}
-.fa-tape:before {
- content: "\f4db";
-}
-.fa-tasks:before {
- content: "\f0ae";
-}
-.fa-taxi:before {
- content: "\f1ba";
-}
-.fa-teamspeak:before {
- content: "\f4f9";
-}
-.fa-teeth:before {
- content: "\f62e";
-}
-.fa-teeth-open:before {
- content: "\f62f";
-}
-.fa-telegram:before {
- content: "\f2c6";
-}
-.fa-telegram-plane:before {
- content: "\f3fe";
-}
-.fa-temperature-high:before {
- content: "\f769";
-}
-.fa-temperature-low:before {
- content: "\f76b";
-}
-.fa-tencent-weibo:before {
- content: "\f1d5";
-}
-.fa-tenge:before {
- content: "\f7d7";
-}
-.fa-terminal:before {
- content: "\f120";
-}
-.fa-text-height:before {
- content: "\f034";
-}
-.fa-text-width:before {
- content: "\f035";
-}
-.fa-th:before {
- content: "\f00a";
-}
-.fa-th-large:before {
- content: "\f009";
-}
-.fa-th-list:before {
- content: "\f00b";
-}
-.fa-the-red-yeti:before {
- content: "\f69d";
-}
-.fa-theater-masks:before {
- content: "\f630";
-}
-.fa-themeco:before {
- content: "\f5c6";
-}
-.fa-themeisle:before {
- content: "\f2b2";
-}
-.fa-thermometer:before {
- content: "\f491";
-}
-.fa-thermometer-empty:before {
- content: "\f2cb";
-}
-.fa-thermometer-full:before {
- content: "\f2c7";
-}
-.fa-thermometer-half:before {
- content: "\f2c9";
-}
-.fa-thermometer-quarter:before {
- content: "\f2ca";
-}
-.fa-thermometer-three-quarters:before {
- content: "\f2c8";
-}
-.fa-think-peaks:before {
- content: "\f731";
-}
-.fa-thumbs-down:before {
- content: "\f165";
-}
-.fa-thumbs-up:before {
- content: "\f164";
-}
-.fa-thumbtack:before {
- content: "\f08d";
-}
-.fa-ticket-alt:before {
- content: "\f3ff";
-}
-.fa-times:before {
- content: "\f00d";
-}
-.fa-times-circle:before {
- content: "\f057";
-}
-.fa-tint:before {
- content: "\f043";
-}
-.fa-tint-slash:before {
- content: "\f5c7";
-}
-.fa-tired:before {
- content: "\f5c8";
-}
-.fa-toggle-off:before {
- content: "\f204";
-}
-.fa-toggle-on:before {
- content: "\f205";
-}
-.fa-toilet:before {
- content: "\f7d8";
-}
-.fa-toilet-paper:before {
- content: "\f71e";
-}
-.fa-toolbox:before {
- content: "\f552";
-}
-.fa-tools:before {
- content: "\f7d9";
-}
-.fa-tooth:before {
- content: "\f5c9";
-}
-.fa-torah:before {
- content: "\f6a0";
-}
-.fa-torii-gate:before {
- content: "\f6a1";
-}
-.fa-tractor:before {
- content: "\f722";
-}
-.fa-trade-federation:before {
- content: "\f513";
-}
-.fa-trademark:before {
- content: "\f25c";
-}
-.fa-traffic-light:before {
- content: "\f637";
-}
-.fa-train:before {
- content: "\f238";
-}
-.fa-tram:before {
- content: "\f7da";
-}
-.fa-transgender:before {
- content: "\f224";
-}
-.fa-transgender-alt:before {
- content: "\f225";
-}
-.fa-trash:before {
- content: "\f1f8";
-}
-.fa-trash-alt:before {
- content: "\f2ed";
-}
-.fa-trash-restore:before {
- content: "\f829";
-}
-.fa-trash-restore-alt:before {
- content: "\f82a";
-}
-.fa-tree:before {
- content: "\f1bb";
-}
-.fa-trello:before {
- content: "\f181";
-}
-.fa-tripadvisor:before {
- content: "\f262";
-}
-.fa-trophy:before {
- content: "\f091";
-}
-.fa-truck:before {
- content: "\f0d1";
-}
-.fa-truck-loading:before {
- content: "\f4de";
-}
-.fa-truck-monster:before {
- content: "\f63b";
-}
-.fa-truck-moving:before {
- content: "\f4df";
-}
-.fa-truck-pickup:before {
- content: "\f63c";
-}
-.fa-tshirt:before {
- content: "\f553";
-}
-.fa-tty:before {
- content: "\f1e4";
-}
-.fa-tumblr:before {
- content: "\f173";
-}
-.fa-tumblr-square:before {
- content: "\f174";
-}
-.fa-tv:before {
- content: "\f26c";
-}
-.fa-twitch:before {
- content: "\f1e8";
-}
-.fa-twitter:before {
- content: "\f099";
-}
-.fa-twitter-square:before {
- content: "\f081";
-}
-.fa-typo3:before {
- content: "\f42b";
-}
-.fa-uber:before {
- content: "\f402";
-}
-.fa-ubuntu:before {
- content: "\f7df";
-}
-.fa-uikit:before {
- content: "\f403";
-}
-.fa-umbrella:before {
- content: "\f0e9";
-}
-.fa-umbrella-beach:before {
- content: "\f5ca";
-}
-.fa-underline:before {
- content: "\f0cd";
-}
-.fa-undo:before {
- content: "\f0e2";
-}
-.fa-undo-alt:before {
- content: "\f2ea";
-}
-.fa-uniregistry:before {
- content: "\f404";
-}
-.fa-universal-access:before {
- content: "\f29a";
-}
-.fa-university:before {
- content: "\f19c";
-}
-.fa-unlink:before {
- content: "\f127";
-}
-.fa-unlock:before {
- content: "\f09c";
-}
-.fa-unlock-alt:before {
- content: "\f13e";
-}
-.fa-untappd:before {
- content: "\f405";
-}
-.fa-upload:before {
- content: "\f093";
-}
-.fa-ups:before {
- content: "\f7e0";
-}
-.fa-usb:before {
- content: "\f287";
-}
-.fa-user:before {
- content: "\f007";
-}
-.fa-user-alt:before {
- content: "\f406";
-}
-.fa-user-alt-slash:before {
- content: "\f4fa";
-}
-.fa-user-astronaut:before {
- content: "\f4fb";
-}
-.fa-user-check:before {
- content: "\f4fc";
-}
-.fa-user-circle:before {
- content: "\f2bd";
-}
-.fa-user-clock:before {
- content: "\f4fd";
-}
-.fa-user-cog:before {
- content: "\f4fe";
-}
-.fa-user-edit:before {
- content: "\f4ff";
-}
-.fa-user-friends:before {
- content: "\f500";
-}
-.fa-user-graduate:before {
- content: "\f501";
-}
-.fa-user-injured:before {
- content: "\f728";
-}
-.fa-user-lock:before {
- content: "\f502";
-}
-.fa-user-md:before {
- content: "\f0f0";
-}
-.fa-user-minus:before {
- content: "\f503";
-}
-.fa-user-ninja:before {
- content: "\f504";
-}
-.fa-user-nurse:before {
- content: "\f82f";
-}
-.fa-user-plus:before {
- content: "\f234";
-}
-.fa-user-secret:before {
- content: "\f21b";
-}
-.fa-user-shield:before {
- content: "\f505";
-}
-.fa-user-slash:before {
- content: "\f506";
-}
-.fa-user-tag:before {
- content: "\f507";
-}
-.fa-user-tie:before {
- content: "\f508";
-}
-.fa-user-times:before {
- content: "\f235";
-}
-.fa-users:before {
- content: "\f0c0";
-}
-.fa-users-cog:before {
- content: "\f509";
-}
-.fa-usps:before {
- content: "\f7e1";
-}
-.fa-ussunnah:before {
- content: "\f407";
-}
-.fa-utensil-spoon:before {
- content: "\f2e5";
-}
-.fa-utensils:before {
- content: "\f2e7";
-}
-.fa-vaadin:before {
- content: "\f408";
-}
-.fa-vector-square:before {
- content: "\f5cb";
-}
-.fa-venus:before {
- content: "\f221";
-}
-.fa-venus-double:before {
- content: "\f226";
-}
-.fa-venus-mars:before {
- content: "\f228";
-}
-.fa-viacoin:before {
- content: "\f237";
-}
-.fa-viadeo:before {
- content: "\f2a9";
-}
-.fa-viadeo-square:before {
- content: "\f2aa";
-}
-.fa-vial:before {
- content: "\f492";
-}
-.fa-vials:before {
- content: "\f493";
-}
-.fa-viber:before {
- content: "\f409";
-}
-.fa-video:before {
- content: "\f03d";
-}
-.fa-video-slash:before {
- content: "\f4e2";
-}
-.fa-vihara:before {
- content: "\f6a7";
-}
-.fa-vimeo:before {
- content: "\f40a";
-}
-.fa-vimeo-square:before {
- content: "\f194";
-}
-.fa-vimeo-v:before {
- content: "\f27d";
-}
-.fa-vine:before {
- content: "\f1ca";
-}
-.fa-vk:before {
- content: "\f189";
-}
-.fa-vnv:before {
- content: "\f40b";
-}
-.fa-voicemail:before {
- content: "\f897";
-}
-.fa-volleyball-ball:before {
- content: "\f45f";
-}
-.fa-volume-down:before {
- content: "\f027";
-}
-.fa-volume-mute:before {
- content: "\f6a9";
-}
-.fa-volume-off:before {
- content: "\f026";
-}
-.fa-volume-up:before {
- content: "\f028";
-}
-.fa-vote-yea:before {
- content: "\f772";
-}
-.fa-vr-cardboard:before {
- content: "\f729";
-}
-.fa-vuejs:before {
- content: "\f41f";
-}
-.fa-walking:before {
- content: "\f554";
-}
-.fa-wallet:before {
- content: "\f555";
-}
-.fa-warehouse:before {
- content: "\f494";
-}
-.fa-water:before {
- content: "\f773";
-}
-.fa-wave-square:before {
- content: "\f83e";
-}
-.fa-waze:before {
- content: "\f83f";
-}
-.fa-weebly:before {
- content: "\f5cc";
-}
-.fa-weibo:before {
- content: "\f18a";
-}
-.fa-weight:before {
- content: "\f496";
-}
-.fa-weight-hanging:before {
- content: "\f5cd";
-}
-.fa-weixin:before {
- content: "\f1d7";
-}
-.fa-whatsapp:before {
- content: "\f232";
-}
-.fa-whatsapp-square:before {
- content: "\f40c";
-}
-.fa-wheelchair:before {
- content: "\f193";
-}
-.fa-whmcs:before {
- content: "\f40d";
-}
-.fa-wifi:before {
- content: "\f1eb";
-}
-.fa-wikipedia-w:before {
- content: "\f266";
-}
-.fa-wind:before {
- content: "\f72e";
-}
-.fa-window-close:before {
- content: "\f410";
-}
-.fa-window-maximize:before {
- content: "\f2d0";
-}
-.fa-window-minimize:before {
- content: "\f2d1";
-}
-.fa-window-restore:before {
- content: "\f2d2";
-}
-.fa-windows:before {
- content: "\f17a";
-}
-.fa-wine-bottle:before {
- content: "\f72f";
-}
-.fa-wine-glass:before {
- content: "\f4e3";
-}
-.fa-wine-glass-alt:before {
- content: "\f5ce";
-}
-.fa-wix:before {
- content: "\f5cf";
-}
-.fa-wizards-of-the-coast:before {
- content: "\f730";
-}
-.fa-wolf-pack-battalion:before {
- content: "\f514";
-}
-.fa-won-sign:before {
- content: "\f159";
-}
-.fa-wordpress:before {
- content: "\f19a";
-}
-.fa-wordpress-simple:before {
- content: "\f411";
-}
-.fa-wpbeginner:before {
- content: "\f297";
-}
-.fa-wpexplorer:before {
- content: "\f2de";
-}
-.fa-wpforms:before {
- content: "\f298";
-}
-.fa-wpressr:before {
- content: "\f3e4";
-}
-.fa-wrench:before {
- content: "\f0ad";
-}
-.fa-x-ray:before {
- content: "\f497";
-}
-.fa-xbox:before {
- content: "\f412";
-}
-.fa-xing:before {
- content: "\f168";
-}
-.fa-xing-square:before {
- content: "\f169";
-}
-.fa-y-combinator:before {
- content: "\f23b";
-}
-.fa-yahoo:before {
- content: "\f19e";
-}
-.fa-yammer:before {
- content: "\f840";
-}
-.fa-yandex:before {
- content: "\f413";
-}
-.fa-yandex-international:before {
- content: "\f414";
-}
-.fa-yarn:before {
- content: "\f7e3";
-}
-.fa-yelp:before {
- content: "\f1e9";
-}
-.fa-yen-sign:before {
- content: "\f157";
-}
-.fa-yin-yang:before {
- content: "\f6ad";
-}
-.fa-yoast:before {
- content: "\f2b1";
-}
-.fa-youtube:before {
- content: "\f167";
-}
-.fa-youtube-square:before {
- content: "\f431";
-}
-.fa-zhihu:before {
- content: "\f63f";
-}
-.sr-only {
- border: 0;
- clip: rect(0, 0, 0, 0);
- height: 1px;
- margin: -1px;
- overflow: hidden;
- padding: 0;
- position: absolute;
- width: 1px;
-}
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
- clip: auto;
- height: auto;
- margin: 0;
- overflow: visible;
- position: static;
- width: auto;
-}
-@font-face {
- font-family: "Font Awesome 5 Free";
- font-style: normal;
- font-weight: 400;
- font-display: auto;
- src: url(fa-regular-400.eot);
- src: url(fa-regular-400.eot?#iefix) format("embedded-opentype"),
- url(fa-regular-400.woff) format("woff");
-}
-.far {
- font-weight: 400;
-}
-@font-face {
- font-family: "Font Awesome 5 Free";
- font-style: normal;
- font-weight: 900;
- font-display: auto;
- src: url(fa-solid-900.eot);
- src: url(fa-solid-900.eot?#iefix) format("embedded-opentype"),
- url(fa-solid-900.woff) format("woff");
-}
-.fa,
-.far,
-.fas {
- font-family: "Font Awesome 5 Free";
-}
-.fa,
-.fas {
- font-weight: 900;
-}
+.fa{font-family:"Font Awesome 6 Free";font-weight:900}.fa,.fa-brands,.fa-duotone,.fa-light,.fa-regular,.fa-solid,.fa-thin,.fab,.fad,.fal,.far,.fas,.fat{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;line-height:1;text-rendering:auto}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-2xs{font-size:.625em;line-height:.1em;vertical-align:.225em}.fa-xs{font-size:.75em;line-height:.08333em;vertical-align:.125em}.fa-sm{font-size:.875em;line-height:.07143em;vertical-align:.05357em}.fa-lg{font-size:1.25em;line-height:.05em;vertical-align:-.075em}.fa-xl{font-size:1.5em;line-height:.04167em;vertical-align:-.125em}.fa-2xl{font-size:2em;line-height:.03125em;vertical-align:-.1875em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:calc( 2em*-1);position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border-radius:.1em;border:.08em solid #eee;padding:.2em .25em .15em}.fa-pull-left{float:left;margin-right:.3em}.fa-pull-right{float:right;margin-left:.3em}.fa-beat{-webkit-animation-name:fa-beat;animation-name:fa-beat;-webkit-animation-delay:0;animation-delay:0;-webkit-animation-direction:normal;animation-direction:normal;-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}.fa-bounce{-webkit-animation-name:fa-bounce;animation-name:fa-bounce;-webkit-animation-delay:0;animation-delay:0;-webkit-animation-direction:normal;animation-direction:normal;-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:cubic-bezier(.28,.84,.42,1);animation-timing-function:cubic-bezier(.28,.84,.42,1)}.fa-fade{-webkit-animation-name:fa-fade;animation-name:fa-fade;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:cubic-bezier(.4,0,.6,1);animation-timing-function:cubic-bezier(.4,0,.6,1)}.fa-beat-fade,.fa-fade{-webkit-animation-delay:0;animation-delay:0;-webkit-animation-direction:normal;animation-direction:normal;-webkit-animation-duration:1s;animation-duration:1s}.fa-beat-fade{-webkit-animation-name:fa-beat-fade;animation-name:fa-beat-fade;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:cubic-bezier(.4,0,.6,1);animation-timing-function:cubic-bezier(.4,0,.6,1)}.fa-flip{-webkit-animation-name:fa-flip;animation-name:fa-flip;-webkit-animation-delay:0;animation-delay:0;-webkit-animation-direction:normal;animation-direction:normal;-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}.fa-shake{-webkit-animation-name:fa-shake;animation-name:fa-shake;-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:linear;animation-timing-function:linear}.fa-shake,.fa-spin{-webkit-animation-delay:0;animation-delay:0;-webkit-animation-direction:normal;animation-direction:normal}.fa-spin{-webkit-animation-name:fa-spin;animation-name:fa-spin;-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:linear;animation-timing-function:linear}.fa-spin-reverse{--fa-animation-direction:reverse}.fa-pulse,.fa-spin-pulse{-webkit-animation-name:fa-spin;animation-name:fa-spin;-webkit-animation-direction:normal;animation-direction:normal;-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:steps(8);animation-timing-function:steps(8)}@media (prefers-reduced-motion:reduce){.fa-beat,.fa-beat-fade,.fa-bounce,.fa-fade,.fa-flip,.fa-pulse,.fa-shake,.fa-spin,.fa-spin-pulse{-webkit-animation-delay:-1ms;animation-delay:-1ms;-webkit-animation-duration:1ms;animation-duration:1ms;-webkit-animation-iteration-count:1;animation-iteration-count:1;transition-delay:0s;transition-duration:0s}}@-webkit-keyframes fa-beat{0%,90%{-webkit-transform:scale(1);transform:scale(1)}45%{-webkit-transform:scale(1.25);transform:scale(1.25)}}@keyframes fa-beat{0%,90%{-webkit-transform:scale(1);transform:scale(1)}45%{-webkit-transform:scale(1.25);transform:scale(1.25)}}@-webkit-keyframes fa-bounce{0%{-webkit-transform:scale(1) translateY(0);transform:scale(1) translateY(0)}10%{-webkit-transform:scale(1.1,.9) translateY(0);transform:scale(1.1,.9) translateY(0)}30%{-webkit-transform:scale(.9,1.1) translateY(-.5em);transform:scale(.9,1.1) translateY(-.5em)}50%{-webkit-transform:scale(1.05,.95) translateY(0);transform:scale(1.05,.95) translateY(0)}57%{-webkit-transform:scale(1) translateY(-.125em);transform:scale(1) translateY(-.125em)}64%{-webkit-transform:scale(1) translateY(0);transform:scale(1) translateY(0)}to{-webkit-transform:scale(1) translateY(0);transform:scale(1) translateY(0)}}@keyframes fa-bounce{0%{-webkit-transform:scale(1) translateY(0);transform:scale(1) translateY(0)}10%{-webkit-transform:scale(1.1,.9) translateY(0);transform:scale(1.1,.9) translateY(0)}30%{-webkit-transform:scale(.9,1.1) translateY(-.5em);transform:scale(.9,1.1) translateY(-.5em)}50%{-webkit-transform:scale(1.05,.95) translateY(0);transform:scale(1.05,.95) translateY(0)}57%{-webkit-transform:scale(1) translateY(-.125em);transform:scale(1) translateY(-.125em)}64%{-webkit-transform:scale(1) translateY(0);transform:scale(1) translateY(0)}to{-webkit-transform:scale(1) translateY(0);transform:scale(1) translateY(0)}}@-webkit-keyframes fa-fade{50%{opacity:.4}}@keyframes fa-fade{50%{opacity:.4}}@-webkit-keyframes fa-beat-fade{0%,to{opacity:.4;-webkit-transform:scale(1);transform:scale(1)}50%{opacity:1;-webkit-transform:scale(1.125);transform:scale(1.125)}}@keyframes fa-beat-fade{0%,to{opacity:.4;-webkit-transform:scale(1);transform:scale(1)}50%{opacity:1;-webkit-transform:scale(1.125);transform:scale(1.125)}}@-webkit-keyframes fa-flip{50%{-webkit-transform:rotate3d(0,1,0,-180deg);transform:rotate3d(0,1,0,-180deg)}}@keyframes fa-flip{50%{-webkit-transform:rotate3d(0,1,0,-180deg);transform:rotate3d(0,1,0,-180deg)}}@-webkit-keyframes fa-shake{0%{-webkit-transform:rotate(-15deg);transform:rotate(-15deg)}4%{-webkit-transform:rotate(15deg);transform:rotate(15deg)}8%,24%{-webkit-transform:rotate(-18deg);transform:rotate(-18deg)}12%,28%{-webkit-transform:rotate(18deg);transform:rotate(18deg)}16%{-webkit-transform:rotate(-22deg);transform:rotate(-22deg)}20%{-webkit-transform:rotate(22deg);transform:rotate(22deg)}32%{-webkit-transform:rotate(-12deg);transform:rotate(-12deg)}36%{-webkit-transform:rotate(12deg);transform:rotate(12deg)}40%,to{-webkit-transform:rotate(0deg);transform:rotate(0deg)}}@keyframes fa-shake{0%{-webkit-transform:rotate(-15deg);transform:rotate(-15deg)}4%{-webkit-transform:rotate(15deg);transform:rotate(15deg)}8%,24%{-webkit-transform:rotate(-18deg);transform:rotate(-18deg)}12%,28%{-webkit-transform:rotate(18deg);transform:rotate(18deg)}16%{-webkit-transform:rotate(-22deg);transform:rotate(-22deg)}20%{-webkit-transform:rotate(22deg);transform:rotate(22deg)}32%{-webkit-transform:rotate(-12deg);transform:rotate(-12deg)}36%{-webkit-transform:rotate(12deg);transform:rotate(12deg)}40%,to{-webkit-transform:rotate(0deg);transform:rotate(0deg)}}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.fa-rotate-90{-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-webkit-transform:scaleX(-1);transform:scaleX(-1)}.fa-flip-vertical{-webkit-transform:scaleY(-1);transform:scaleY(-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{-webkit-transform:scale(-1);transform:scale(-1)}.fa-rotate-by{-webkit-transform:rotate(none);transform:rotate(none)}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%;z-index:auto}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-0:before{content:"\30"}.fa-1:before{content:"\31"}.fa-2:before{content:"\32"}.fa-3:before{content:"\33"}.fa-4:before{content:"\34"}.fa-5:before{content:"\35"}.fa-6:before{content:"\36"}.fa-7:before{content:"\37"}.fa-8:before{content:"\38"}.fa-9:before{content:"\39"}.fa-a:before{content:"\41"}.fa-address-book:before,.fa-contact-book:before{content:"\f2b9"}.fa-address-card:before,.fa-contact-card:before,.fa-vcard:before{content:"\f2bb"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-anchor:before{content:"\f13d"}.fa-anchor-circle-check:before{content:"\e4aa"}.fa-anchor-circle-exclamation:before{content:"\e4ab"}.fa-anchor-circle-xmark:before{content:"\e4ac"}.fa-anchor-lock:before{content:"\e4ad"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-double-down:before,.fa-angles-down:before{content:"\f103"}.fa-angle-double-left:before,.fa-angles-left:before{content:"\f100"}.fa-angle-double-right:before,.fa-angles-right:before{content:"\f101"}.fa-angle-double-up:before,.fa-angles-up:before{content:"\f102"}.fa-ankh:before{content:"\f644"}.fa-apple-alt:before,.fa-apple-whole:before{content:"\f5d1"}.fa-archway:before{content:"\f557"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-down-1-9:before,.fa-sort-numeric-asc:before,.fa-sort-numeric-down:before{content:"\f162"}.fa-arrow-down-9-1:before,.fa-sort-numeric-desc:before,.fa-sort-numeric-down-alt:before{content:"\f886"}.fa-arrow-down-a-z:before,.fa-sort-alpha-asc:before,.fa-sort-alpha-down:before{content:"\f15d"}.fa-arrow-down-long:before,.fa-long-arrow-down:before{content:"\f175"}.fa-arrow-down-short-wide:before,.fa-sort-amount-desc:before,.fa-sort-amount-down-alt:before{content:"\f884"}.fa-arrow-down-up-across-line:before{content:"\e4af"}.fa-arrow-down-up-lock:before{content:"\e4b0"}.fa-arrow-down-wide-short:before,.fa-sort-amount-asc:before,.fa-sort-amount-down:before{content:"\f160"}.fa-arrow-down-z-a:before,.fa-sort-alpha-desc:before,.fa-sort-alpha-down-alt:before{content:"\f881"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-left-long:before,.fa-long-arrow-left:before{content:"\f177"}.fa-arrow-pointer:before,.fa-mouse-pointer:before{content:"\f245"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-right-arrow-left:before,.fa-exchange:before{content:"\f0ec"}.fa-arrow-right-from-bracket:before,.fa-sign-out:before{content:"\f08b"}.fa-arrow-right-long:before,.fa-long-arrow-right:before{content:"\f178"}.fa-arrow-right-to-bracket:before,.fa-sign-in:before{content:"\f090"}.fa-arrow-right-to-city:before{content:"\e4b3"}.fa-arrow-left-rotate:before,.fa-arrow-rotate-back:before,.fa-arrow-rotate-backward:before,.fa-arrow-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-arrow-right-rotate:before,.fa-arrow-rotate-forward:before,.fa-arrow-rotate-right:before,.fa-redo:before{content:"\f01e"}.fa-arrow-trend-down:before{content:"\e097"}.fa-arrow-trend-up:before{content:"\e098"}.fa-arrow-turn-down:before,.fa-level-down:before{content:"\f149"}.fa-arrow-turn-up:before,.fa-level-up:before{content:"\f148"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-up-1-9:before,.fa-sort-numeric-up:before{content:"\f163"}.fa-arrow-up-9-1:before,.fa-sort-numeric-up-alt:before{content:"\f887"}.fa-arrow-up-a-z:before,.fa-sort-alpha-up:before{content:"\f15e"}.fa-arrow-up-from-bracket:before{content:"\e09a"}.fa-arrow-up-from-ground-water:before{content:"\e4b5"}.fa-arrow-up-from-water-pump:before{content:"\e4b6"}.fa-arrow-up-long:before,.fa-long-arrow-up:before{content:"\f176"}.fa-arrow-up-right-dots:before{content:"\e4b7"}.fa-arrow-up-right-from-square:before,.fa-external-link:before{content:"\f08e"}.fa-arrow-up-short-wide:before,.fa-sort-amount-up-alt:before{content:"\f885"}.fa-arrow-up-wide-short:before,.fa-sort-amount-up:before{content:"\f161"}.fa-arrow-up-z-a:before,.fa-sort-alpha-up-alt:before{content:"\f882"}.fa-arrows-down-to-line:before{content:"\e4b8"}.fa-arrows-down-to-people:before{content:"\e4b9"}.fa-arrows-h:before,.fa-arrows-left-right:before{content:"\f07e"}.fa-arrows-left-right-to-line:before{content:"\e4ba"}.fa-arrows-rotate:before,.fa-refresh:before,.fa-sync:before{content:"\f021"}.fa-arrows-spin:before{content:"\e4bb"}.fa-arrows-split-up-and-left:before{content:"\e4bc"}.fa-arrows-to-circle:before{content:"\e4bd"}.fa-arrows-to-dot:before{content:"\e4be"}.fa-arrows-to-eye:before{content:"\e4bf"}.fa-arrows-turn-right:before{content:"\e4c0"}.fa-arrows-turn-to-dots:before{content:"\e4c1"}.fa-arrows-up-down:before,.fa-arrows-v:before{content:"\f07d"}.fa-arrows-up-down-left-right:before,.fa-arrows:before{content:"\f047"}.fa-arrows-up-to-line:before{content:"\e4c2"}.fa-asterisk:before{content:"\2a"}.fa-at:before{content:"\40"}.fa-atom:before{content:"\f5d2"}.fa-audio-description:before{content:"\f29e"}.fa-austral-sign:before{content:"\e0a9"}.fa-award:before{content:"\f559"}.fa-b:before{content:"\42"}.fa-baby:before{content:"\f77c"}.fa-baby-carriage:before,.fa-carriage-baby:before{content:"\f77d"}.fa-backward:before{content:"\f04a"}.fa-backward-fast:before,.fa-fast-backward:before{content:"\f049"}.fa-backward-step:before,.fa-step-backward:before{content:"\f048"}.fa-bacon:before{content:"\f7e5"}.fa-bacteria:before{content:"\e059"}.fa-bacterium:before{content:"\e05a"}.fa-bag-shopping:before,.fa-shopping-bag:before{content:"\f290"}.fa-bahai:before,.fa-haykal:before{content:"\f666"}.fa-baht-sign:before{content:"\e0ac"}.fa-ban:before,.fa-cancel:before{content:"\f05e"}.fa-ban-smoking:before,.fa-smoking-ban:before{content:"\f54d"}.fa-band-aid:before,.fa-bandage:before{content:"\f462"}.fa-barcode:before{content:"\f02a"}.fa-bars:before,.fa-navicon:before{content:"\f0c9"}.fa-bars-progress:before,.fa-tasks-alt:before{content:"\f828"}.fa-bars-staggered:before,.fa-reorder:before,.fa-stream:before{content:"\f550"}.fa-baseball-ball:before,.fa-baseball:before{content:"\f433"}.fa-baseball-bat-ball:before{content:"\f432"}.fa-basket-shopping:before,.fa-shopping-basket:before{content:"\f291"}.fa-basketball-ball:before,.fa-basketball:before{content:"\f434"}.fa-bath:before,.fa-bathtub:before{content:"\f2cd"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-battery-5:before,.fa-battery-full:before,.fa-battery:before{content:"\f240"}.fa-battery-3:before,.fa-battery-half:before{content:"\f242"}.fa-battery-2:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-4:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-bed:before{content:"\f236"}.fa-bed-pulse:before,.fa-procedures:before{content:"\f487"}.fa-beer-mug-empty:before,.fa-beer:before{content:"\f0fc"}.fa-bell:before{content:"\f0f3"}.fa-bell-concierge:before,.fa-concierge-bell:before{content:"\f562"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bicycle:before{content:"\f206"}.fa-binoculars:before{content:"\f1e5"}.fa-biohazard:before{content:"\f780"}.fa-bitcoin-sign:before{content:"\e0b4"}.fa-blender:before{content:"\f517"}.fa-blender-phone:before{content:"\f6b6"}.fa-blog:before{content:"\f781"}.fa-bold:before{content:"\f032"}.fa-bolt:before,.fa-zap:before{content:"\f0e7"}.fa-bolt-lightning:before{content:"\e0b7"}.fa-bomb:before{content:"\f1e2"}.fa-bone:before{content:"\f5d7"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-atlas:before,.fa-book-atlas:before{content:"\f558"}.fa-bible:before,.fa-book-bible:before{content:"\f647"}.fa-book-bookmark:before{content:"\e0bb"}.fa-book-journal-whills:before,.fa-journal-whills:before{content:"\f66a"}.fa-book-medical:before{content:"\f7e6"}.fa-book-open:before{content:"\f518"}.fa-book-open-reader:before,.fa-book-reader:before{content:"\f5da"}.fa-book-quran:before,.fa-quran:before{content:"\f687"}.fa-book-dead:before,.fa-book-skull:before{content:"\f6b7"}.fa-book-tanakh:before,.fa-tanakh:before{content:"\f827"}.fa-bookmark:before{content:"\f02e"}.fa-border-all:before{content:"\f84c"}.fa-border-none:before{content:"\f850"}.fa-border-style:before,.fa-border-top-left:before{content:"\f853"}.fa-bore-hole:before{content:"\e4c3"}.fa-bottle-droplet:before{content:"\e4c4"}.fa-bottle-water:before{content:"\e4c5"}.fa-bowl-food:before{content:"\e4c6"}.fa-bowl-rice:before{content:"\e2eb"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-archive:before,.fa-box-archive:before{content:"\f187"}.fa-box-open:before{content:"\f49e"}.fa-box-tissue:before{content:"\e05b"}.fa-boxes-packing:before{content:"\e4c7"}.fa-boxes-alt:before,.fa-boxes-stacked:before,.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-brain:before{content:"\f5dc"}.fa-brazilian-real-sign:before{content:"\e46c"}.fa-bread-slice:before{content:"\f7ec"}.fa-bridge:before{content:"\e4c8"}.fa-bridge-circle-check:before{content:"\e4c9"}.fa-bridge-circle-exclamation:before{content:"\e4ca"}.fa-bridge-circle-xmark:before{content:"\e4cb"}.fa-bridge-lock:before{content:"\e4cc"}.fa-bridge-water:before{content:"\e4ce"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broom:before{content:"\f51a"}.fa-broom-ball:before,.fa-quidditch-broom-ball:before,.fa-quidditch:before{content:"\f458"}.fa-brush:before{content:"\f55d"}.fa-bucket:before{content:"\e4cf"}.fa-bug:before{content:"\f188"}.fa-bug-slash:before{content:"\e490"}.fa-bugs:before{content:"\e4d0"}.fa-building:before{content:"\f1ad"}.fa-building-circle-arrow-right:before{content:"\e4d1"}.fa-building-circle-check:before{content:"\e4d2"}.fa-building-circle-exclamation:before{content:"\e4d3"}.fa-building-circle-xmark:before{content:"\e4d4"}.fa-bank:before,.fa-building-columns:before,.fa-institution:before,.fa-museum:before,.fa-university:before{content:"\f19c"}.fa-building-flag:before{content:"\e4d5"}.fa-building-lock:before{content:"\e4d6"}.fa-building-ngo:before{content:"\e4d7"}.fa-building-shield:before{content:"\e4d8"}.fa-building-un:before{content:"\e4d9"}.fa-building-user:before{content:"\e4da"}.fa-building-wheat:before{content:"\e4db"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burger:before,.fa-hamburger:before{content:"\f805"}.fa-burst:before{content:"\e4dc"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before,.fa-bus-simple:before{content:"\f55e"}.fa-briefcase-clock:before,.fa-business-time:before{content:"\f64a"}.fa-c:before{content:"\43"}.fa-cable-car:before,.fa-tram:before{content:"\f7da"}.fa-birthday-cake:before,.fa-cake-candles:before,.fa-cake:before{content:"\f1fd"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-day:before{content:"\f783"}.fa-calendar-alt:before,.fa-calendar-days:before{content:"\f073"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-week:before{content:"\f784"}.fa-calendar-times:before,.fa-calendar-xmark:before{content:"\f273"}.fa-camera-alt:before,.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-camera-rotate:before{content:"\e0d8"}.fa-campground:before{content:"\f6bb"}.fa-candy-cane:before{content:"\f786"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-battery-car:before,.fa-car-battery:before{content:"\f5df"}.fa-car-burst:before,.fa-car-crash:before{content:"\f5e1"}.fa-car-on:before{content:"\e4dd"}.fa-car-alt:before,.fa-car-rear:before{content:"\f5de"}.fa-car-side:before{content:"\f5e4"}.fa-car-tunnel:before{content:"\e4de"}.fa-caravan:before{content:"\f8ff"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-up:before{content:"\f0d8"}.fa-carrot:before{content:"\f787"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-flatbed:before,.fa-dolly-flatbed:before{content:"\f474"}.fa-cart-flatbed-suitcase:before,.fa-luggage-cart:before{content:"\f59d"}.fa-cart-plus:before{content:"\f217"}.fa-cart-shopping:before,.fa-shopping-cart:before{content:"\f07a"}.fa-cash-register:before{content:"\f788"}.fa-cat:before{content:"\f6be"}.fa-cedi-sign:before{content:"\e0df"}.fa-cent-sign:before{content:"\e3f5"}.fa-certificate:before{content:"\f0a3"}.fa-chair:before{content:"\f6c0"}.fa-blackboard:before,.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before,.fa-chalkboard-user:before{content:"\f51c"}.fa-champagne-glasses:before,.fa-glass-cheers:before{content:"\f79f"}.fa-charging-station:before{content:"\f5e7"}.fa-area-chart:before,.fa-chart-area:before{content:"\f1fe"}.fa-bar-chart:before,.fa-chart-bar:before{content:"\f080"}.fa-chart-column:before{content:"\e0e3"}.fa-chart-gantt:before{content:"\e0e4"}.fa-chart-line:before,.fa-line-chart:before{content:"\f201"}.fa-chart-pie:before,.fa-pie-chart:before{content:"\f200"}.fa-chart-simple:before{content:"\e473"}.fa-check:before{content:"\f00c"}.fa-check-double:before{content:"\f560"}.fa-check-to-slot:before,.fa-vote-yea:before{content:"\f772"}.fa-cheese:before{content:"\f7ef"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-child-dress:before{content:"\e59c"}.fa-child-reaching:before{content:"\e59d"}.fa-child-rifle:before{content:"\e4e0"}.fa-children:before{content:"\e4e1"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-arrow-circle-down:before,.fa-circle-arrow-down:before{content:"\f0ab"}.fa-arrow-circle-left:before,.fa-circle-arrow-left:before{content:"\f0a8"}.fa-arrow-circle-right:before,.fa-circle-arrow-right:before{content:"\f0a9"}.fa-arrow-circle-up:before,.fa-circle-arrow-up:before{content:"\f0aa"}.fa-check-circle:before,.fa-circle-check:before{content:"\f058"}.fa-chevron-circle-down:before,.fa-circle-chevron-down:before{content:"\f13a"}.fa-chevron-circle-left:before,.fa-circle-chevron-left:before{content:"\f137"}.fa-chevron-circle-right:before,.fa-circle-chevron-right:before{content:"\f138"}.fa-chevron-circle-up:before,.fa-circle-chevron-up:before{content:"\f139"}.fa-circle-dollar-to-slot:before,.fa-donate:before{content:"\f4b9"}.fa-circle-dot:before,.fa-dot-circle:before{content:"\f192"}.fa-arrow-alt-circle-down:before,.fa-circle-down:before{content:"\f358"}.fa-circle-exclamation:before,.fa-exclamation-circle:before{content:"\f06a"}.fa-circle-h:before,.fa-hospital-symbol:before{content:"\f47e"}.fa-adjust:before,.fa-circle-half-stroke:before{content:"\f042"}.fa-circle-info:before,.fa-info-circle:before{content:"\f05a"}.fa-arrow-alt-circle-left:before,.fa-circle-left:before{content:"\f359"}.fa-circle-minus:before,.fa-minus-circle:before{content:"\f056"}.fa-circle-nodes:before{content:"\e4e2"}.fa-circle-notch:before{content:"\f1ce"}.fa-circle-pause:before,.fa-pause-circle:before{content:"\f28b"}.fa-circle-play:before,.fa-play-circle:before{content:"\f144"}.fa-circle-plus:before,.fa-plus-circle:before{content:"\f055"}.fa-circle-question:before,.fa-question-circle:before{content:"\f059"}.fa-circle-radiation:before,.fa-radiation-alt:before{content:"\f7ba"}.fa-arrow-alt-circle-right:before,.fa-circle-right:before{content:"\f35a"}.fa-circle-stop:before,.fa-stop-circle:before{content:"\f28d"}.fa-arrow-alt-circle-up:before,.fa-circle-up:before{content:"\f35b"}.fa-circle-user:before,.fa-user-circle:before{content:"\f2bd"}.fa-circle-xmark:before,.fa-times-circle:before,.fa-xmark-circle:before{content:"\f057"}.fa-city:before{content:"\f64f"}.fa-clapperboard:before{content:"\e131"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clipboard-question:before{content:"\e4e3"}.fa-clipboard-user:before{content:"\f7f3"}.fa-clock-four:before,.fa-clock:before{content:"\f017"}.fa-clock-rotate-left:before,.fa-history:before{content:"\f1da"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-arrow-down:before,.fa-cloud-download-alt:before,.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-arrow-up:before,.fa-cloud-upload-alt:before,.fa-cloud-upload:before{content:"\f0ee"}.fa-cloud-bolt:before,.fa-thunderstorm:before{content:"\f76c"}.fa-cloud-meatball:before{content:"\f73b"}.fa-cloud-moon:before{content:"\f6c3"}.fa-cloud-moon-rain:before{content:"\f73c"}.fa-cloud-rain:before{content:"\f73d"}.fa-cloud-showers-heavy:before{content:"\f740"}.fa-cloud-showers-water:before{content:"\e4e4"}.fa-cloud-sun:before{content:"\f6c4"}.fa-cloud-sun-rain:before{content:"\f743"}.fa-clover:before{content:"\e139"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-code-commit:before{content:"\f386"}.fa-code-compare:before{content:"\e13a"}.fa-code-fork:before{content:"\e13b"}.fa-code-merge:before{content:"\f387"}.fa-code-pull-request:before{content:"\e13c"}.fa-coins:before{content:"\f51e"}.fa-colon-sign:before{content:"\e140"}.fa-comment:before{content:"\f075"}.fa-comment-dollar:before{content:"\f651"}.fa-comment-dots:before,.fa-commenting:before{content:"\f4ad"}.fa-comment-medical:before{content:"\f7f5"}.fa-comment-slash:before{content:"\f4b3"}.fa-comment-sms:before,.fa-sms:before{content:"\f7cd"}.fa-comments:before{content:"\f086"}.fa-comments-dollar:before{content:"\f653"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compass-drafting:before,.fa-drafting-compass:before{content:"\f568"}.fa-compress:before{content:"\f066"}.fa-computer:before{content:"\e4e5"}.fa-computer-mouse:before,.fa-mouse:before{content:"\f8cc"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cow:before{content:"\f6c8"}.fa-credit-card-alt:before,.fa-credit-card:before{content:"\f09d"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before,.fa-crop-simple:before{content:"\f565"}.fa-cross:before{content:"\f654"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-crutch:before{content:"\f7f7"}.fa-cruzeiro-sign:before{content:"\e152"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cubes-stacked:before{content:"\e4e6"}.fa-d:before{content:"\44"}.fa-database:before{content:"\f1c0"}.fa-backspace:before,.fa-delete-left:before{content:"\f55a"}.fa-democrat:before{content:"\f747"}.fa-desktop-alt:before,.fa-desktop:before{content:"\f390"}.fa-dharmachakra:before{content:"\f655"}.fa-diagram-next:before{content:"\e476"}.fa-diagram-predecessor:before{content:"\e477"}.fa-diagram-project:before,.fa-project-diagram:before{content:"\f542"}.fa-diagram-successor:before{content:"\e47a"}.fa-diamond:before{content:"\f219"}.fa-diamond-turn-right:before,.fa-directions:before{content:"\f5eb"}.fa-dice:before{content:"\f522"}.fa-dice-d20:before{content:"\f6cf"}.fa-dice-d6:before{content:"\f6d1"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-disease:before{content:"\f7fa"}.fa-display:before{content:"\e163"}.fa-divide:before{content:"\f529"}.fa-dna:before{content:"\f471"}.fa-dog:before{content:"\f6d3"}.fa-dollar-sign:before,.fa-dollar:before,.fa-usd:before{content:"\24"}.fa-dolly-box:before,.fa-dolly:before{content:"\f472"}.fa-dong-sign:before{content:"\e169"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dove:before{content:"\f4ba"}.fa-compress-alt:before,.fa-down-left-and-up-right-to-center:before{content:"\f422"}.fa-down-long:before,.fa-long-arrow-alt-down:before{content:"\f309"}.fa-download:before{content:"\f019"}.fa-dragon:before{content:"\f6d5"}.fa-draw-polygon:before{content:"\f5ee"}.fa-droplet:before,.fa-tint:before{content:"\f043"}.fa-droplet-slash:before,.fa-tint-slash:before{content:"\f5c7"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drumstick-bite:before{content:"\f6d7"}.fa-dumbbell:before{content:"\f44b"}.fa-dumpster:before{content:"\f793"}.fa-dumpster-fire:before{content:"\f794"}.fa-dungeon:before{content:"\f6d9"}.fa-e:before{content:"\45"}.fa-deaf:before,.fa-deafness:before,.fa-ear-deaf:before,.fa-hard-of-hearing:before{content:"\f2a4"}.fa-assistive-listening-systems:before,.fa-ear-listen:before{content:"\f2a2"}.fa-earth-africa:before,.fa-globe-africa:before{content:"\f57c"}.fa-earth-america:before,.fa-earth-americas:before,.fa-earth:before,.fa-globe-americas:before{content:"\f57d"}.fa-earth-asia:before,.fa-globe-asia:before{content:"\f57e"}.fa-earth-europe:before,.fa-globe-europe:before{content:"\f7a2"}.fa-earth-oceania:before,.fa-globe-oceania:before{content:"\e47b"}.fa-egg:before{content:"\f7fb"}.fa-eject:before{content:"\f052"}.fa-elevator:before{content:"\e16d"}.fa-ellipsis-h:before,.fa-ellipsis:before{content:"\f141"}.fa-ellipsis-v:before,.fa-ellipsis-vertical:before{content:"\f142"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-circle-check:before{content:"\e4e8"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-text:before{content:"\f658"}.fa-envelopes-bulk:before,.fa-mail-bulk:before{content:"\f674"}.fa-equals:before{content:"\3d"}.fa-eraser:before{content:"\f12d"}.fa-ethernet:before{content:"\f796"}.fa-eur:before,.fa-euro-sign:before,.fa-euro:before{content:"\f153"}.fa-exclamation:before{content:"\21"}.fa-expand:before{content:"\f065"}.fa-explosion:before{content:"\e4e9"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper-empty:before,.fa-eye-dropper:before,.fa-eyedropper:before{content:"\f1fb"}.fa-eye-low-vision:before,.fa-low-vision:before{content:"\f2a8"}.fa-eye-slash:before{content:"\f070"}.fa-f:before{content:"\46"}.fa-angry:before,.fa-face-angry:before{content:"\f556"}.fa-dizzy:before,.fa-face-dizzy:before{content:"\f567"}.fa-face-flushed:before,.fa-flushed:before{content:"\f579"}.fa-face-frown:before,.fa-frown:before{content:"\f119"}.fa-face-frown-open:before,.fa-frown-open:before{content:"\f57a"}.fa-face-grimace:before,.fa-grimace:before{content:"\f57f"}.fa-face-grin:before,.fa-grin:before{content:"\f580"}.fa-face-grin-beam:before,.fa-grin-beam:before{content:"\f582"}.fa-face-grin-beam-sweat:before,.fa-grin-beam-sweat:before{content:"\f583"}.fa-face-grin-hearts:before,.fa-grin-hearts:before{content:"\f584"}.fa-face-grin-squint:before,.fa-grin-squint:before{content:"\f585"}.fa-face-grin-squint-tears:before,.fa-grin-squint-tears:before{content:"\f586"}.fa-face-grin-stars:before,.fa-grin-stars:before{content:"\f587"}.fa-face-grin-tears:before,.fa-grin-tears:before{content:"\f588"}.fa-face-grin-tongue:before,.fa-grin-tongue:before{content:"\f589"}.fa-face-grin-tongue-squint:before,.fa-grin-tongue-squint:before{content:"\f58a"}.fa-face-grin-tongue-wink:before,.fa-grin-tongue-wink:before{content:"\f58b"}.fa-face-grin-wide:before,.fa-grin-alt:before{content:"\f581"}.fa-face-grin-wink:before,.fa-grin-wink:before{content:"\f58c"}.fa-face-kiss:before,.fa-kiss:before{content:"\f596"}.fa-face-kiss-beam:before,.fa-kiss-beam:before{content:"\f597"}.fa-face-kiss-wink-heart:before,.fa-kiss-wink-heart:before{content:"\f598"}.fa-face-laugh:before,.fa-laugh:before{content:"\f599"}.fa-face-laugh-beam:before,.fa-laugh-beam:before{content:"\f59a"}.fa-face-laugh-squint:before,.fa-laugh-squint:before{content:"\f59b"}.fa-face-laugh-wink:before,.fa-laugh-wink:before{content:"\f59c"}.fa-face-meh:before,.fa-meh:before{content:"\f11a"}.fa-face-meh-blank:before,.fa-meh-blank:before{content:"\f5a4"}.fa-face-rolling-eyes:before,.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-face-sad-cry:before,.fa-sad-cry:before{content:"\f5b3"}.fa-face-sad-tear:before,.fa-sad-tear:before{content:"\f5b4"}.fa-face-smile:before,.fa-smile:before{content:"\f118"}.fa-face-smile-beam:before,.fa-smile-beam:before{content:"\f5b8"}.fa-face-smile-wink:before,.fa-smile-wink:before{content:"\f4da"}.fa-face-surprise:before,.fa-surprise:before{content:"\f5c2"}.fa-face-tired:before,.fa-tired:before{content:"\f5c8"}.fa-fan:before{content:"\f863"}.fa-faucet:before{content:"\e005"}.fa-faucet-drip:before{content:"\e006"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before,.fa-feather-pointed:before{content:"\f56b"}.fa-ferry:before{content:"\e4ea"}.fa-file:before{content:"\f15b"}.fa-file-arrow-down:before,.fa-file-download:before{content:"\f56d"}.fa-file-arrow-up:before,.fa-file-upload:before{content:"\f574"}.fa-file-audio:before{content:"\f1c7"}.fa-file-circle-check:before{content:"\e5a0"}.fa-file-circle-exclamation:before{content:"\e4eb"}.fa-file-circle-minus:before{content:"\e4ed"}.fa-file-circle-plus:before{content:"\e494"}.fa-file-circle-question:before{content:"\e4ef"}.fa-file-circle-xmark:before{content:"\e5a1"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-csv:before{content:"\f6dd"}.fa-file-excel:before{content:"\f1c3"}.fa-arrow-right-from-file:before,.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-arrow-right-to-file:before,.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-alt:before,.fa-file-lines:before,.fa-file-text:before{content:"\f15c"}.fa-file-medical:before{content:"\f477"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-edit:before,.fa-file-pen:before{content:"\f31c"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-shield:before{content:"\e4f0"}.fa-file-signature:before{content:"\f573"}.fa-file-video:before{content:"\f1c8"}.fa-file-medical-alt:before,.fa-file-waveform:before{content:"\f478"}.fa-file-word:before{content:"\f1c2"}.fa-file-archive:before,.fa-file-zipper:before{content:"\f1c6"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-filter-circle-dollar:before,.fa-funnel-dollar:before{content:"\f662"}.fa-filter-circle-xmark:before{content:"\e17b"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-burner:before{content:"\e4f1"}.fa-fire-extinguisher:before{content:"\f134"}.fa-fire-alt:before,.fa-fire-flame-curved:before{content:"\f7e4"}.fa-burn:before,.fa-fire-flame-simple:before{content:"\f46a"}.fa-fish:before{content:"\f578"}.fa-fish-fins:before{content:"\e4f2"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flag-usa:before{content:"\f74d"}.fa-flask:before{content:"\f0c3"}.fa-flask-vial:before{content:"\e4f3"}.fa-floppy-disk:before,.fa-save:before{content:"\f0c7"}.fa-florin-sign:before{content:"\e184"}.fa-folder-blank:before,.fa-folder:before{content:"\f07b"}.fa-folder-closed:before{content:"\e185"}.fa-folder-minus:before{content:"\f65d"}.fa-folder-open:before{content:"\f07c"}.fa-folder-plus:before{content:"\f65e"}.fa-folder-tree:before{content:"\f802"}.fa-font:before{content:"\f031"}.fa-football-ball:before,.fa-football:before{content:"\f44e"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before,.fa-forward-fast:before{content:"\f050"}.fa-forward-step:before,.fa-step-forward:before{content:"\f051"}.fa-franc-sign:before{content:"\e18f"}.fa-frog:before{content:"\f52e"}.fa-futbol-ball:before,.fa-futbol:before,.fa-soccer-ball:before{content:"\f1e3"}.fa-g:before{content:"\47"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-dashboard:before,.fa-gauge-med:before,.fa-gauge:before,.fa-tachometer-alt-average:before{content:"\f624"}.fa-gauge-high:before,.fa-tachometer-alt-fast:before,.fa-tachometer-alt:before{content:"\f625"}.fa-gauge-simple-med:before,.fa-gauge-simple:before,.fa-tachometer-average:before{content:"\f629"}.fa-gauge-simple-high:before,.fa-tachometer-fast:before,.fa-tachometer:before{content:"\f62a"}.fa-gavel:before,.fa-legal:before{content:"\f0e3"}.fa-cog:before,.fa-gear:before{content:"\f013"}.fa-cogs:before,.fa-gears:before{content:"\f085"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-ghost:before{content:"\f6e2"}.fa-gift:before{content:"\f06b"}.fa-gifts:before{content:"\f79c"}.fa-glass-water:before{content:"\e4f4"}.fa-glass-water-droplet:before{content:"\e4f5"}.fa-glasses:before{content:"\f530"}.fa-globe:before{content:"\f0ac"}.fa-golf-ball-tee:before,.fa-golf-ball:before{content:"\f450"}.fa-gopuram:before{content:"\f664"}.fa-graduation-cap:before,.fa-mortar-board:before{content:"\f19d"}.fa-greater-than:before{content:"\3e"}.fa-greater-than-equal:before{content:"\f532"}.fa-grip-horizontal:before,.fa-grip:before{content:"\f58d"}.fa-grip-lines:before{content:"\f7a4"}.fa-grip-lines-vertical:before{content:"\f7a5"}.fa-grip-vertical:before{content:"\f58e"}.fa-group-arrows-rotate:before{content:"\e4f6"}.fa-guarani-sign:before{content:"\e19a"}.fa-guitar:before{content:"\f7a6"}.fa-gun:before{content:"\e19b"}.fa-h:before{content:"\48"}.fa-hammer:before{content:"\f6e3"}.fa-hamsa:before{content:"\f665"}.fa-hand-paper:before,.fa-hand:before{content:"\f256"}.fa-hand-back-fist:before,.fa-hand-rock:before{content:"\f255"}.fa-allergies:before,.fa-hand-dots:before{content:"\f461"}.fa-fist-raised:before,.fa-hand-fist:before{content:"\f6de"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-dollar:before,.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-holding-droplet:before,.fa-hand-holding-water:before{content:"\f4c1"}.fa-hand-holding-hand:before{content:"\e4f7"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-medical:before{content:"\e05c"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-middle-finger:before{content:"\f806"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-sparkles:before{content:"\e05d"}.fa-hand-spock:before{content:"\f259"}.fa-handcuffs:before{content:"\e4f8"}.fa-hands:before,.fa-sign-language:before,.fa-signing:before{content:"\f2a7"}.fa-american-sign-language-interpreting:before,.fa-asl-interpreting:before,.fa-hands-american-sign-language-interpreting:before,.fa-hands-asl-interpreting:before{content:"\f2a3"}.fa-hands-bound:before{content:"\e4f9"}.fa-hands-bubbles:before,.fa-hands-wash:before{content:"\e05e"}.fa-hands-clapping:before{content:"\e1a8"}.fa-hands-holding:before{content:"\f4c2"}.fa-hands-holding-child:before{content:"\e4fa"}.fa-hands-holding-circle:before{content:"\e4fb"}.fa-hands-praying:before,.fa-praying-hands:before{content:"\f684"}.fa-handshake:before{content:"\f2b5"}.fa-hands-helping:before,.fa-handshake-angle:before{content:"\f4c4"}.fa-handshake-alt:before,.fa-handshake-simple:before{content:"\f4c6"}.fa-handshake-alt-slash:before,.fa-handshake-simple-slash:before{content:"\e05f"}.fa-handshake-slash:before{content:"\e060"}.fa-hanukiah:before{content:"\f6e6"}.fa-hard-drive:before,.fa-hdd:before{content:"\f0a0"}.fa-hashtag:before{content:"\23"}.fa-hat-cowboy:before{content:"\f8c0"}.fa-hat-cowboy-side:before{content:"\f8c1"}.fa-hat-wizard:before{content:"\f6e8"}.fa-head-side-cough:before{content:"\e061"}.fa-head-side-cough-slash:before{content:"\e062"}.fa-head-side-mask:before{content:"\e063"}.fa-head-side-virus:before{content:"\e064"}.fa-header:before,.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before,.fa-headphones-simple:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heart-circle-bolt:before{content:"\e4fc"}.fa-heart-circle-check:before{content:"\e4fd"}.fa-heart-circle-exclamation:before{content:"\e4fe"}.fa-heart-circle-minus:before{content:"\e4ff"}.fa-heart-circle-plus:before{content:"\e500"}.fa-heart-circle-xmark:before{content:"\e501"}.fa-heart-broken:before,.fa-heart-crack:before{content:"\f7a9"}.fa-heart-pulse:before,.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-helicopter-symbol:before{content:"\e502"}.fa-hard-hat:before,.fa-hat-hard:before,.fa-helmet-safety:before{content:"\f807"}.fa-helmet-un:before{content:"\e503"}.fa-highlighter:before{content:"\f591"}.fa-hill-avalanche:before{content:"\e507"}.fa-hill-rockslide:before{content:"\e508"}.fa-hippo:before{content:"\f6ed"}.fa-hockey-puck:before{content:"\f453"}.fa-holly-berry:before{content:"\f7aa"}.fa-horse:before{content:"\f6f0"}.fa-horse-head:before{content:"\f7ab"}.fa-hospital-alt:before,.fa-hospital-wide:before,.fa-hospital:before{content:"\f0f8"}.fa-hospital-user:before{content:"\f80d"}.fa-hot-tub-person:before,.fa-hot-tub:before{content:"\f593"}.fa-hotdog:before{content:"\f80f"}.fa-hotel:before{content:"\f594"}.fa-hourglass-empty:before,.fa-hourglass:before{content:"\f254"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-home-alt:before,.fa-home-lg-alt:before,.fa-home:before,.fa-house:before{content:"\f015"}.fa-home-lg:before,.fa-house-chimney:before{content:"\e3af"}.fa-house-chimney-crack:before,.fa-house-damage:before{content:"\f6f1"}.fa-clinic-medical:before,.fa-house-chimney-medical:before{content:"\f7f2"}.fa-house-chimney-user:before{content:"\e065"}.fa-house-chimney-window:before{content:"\e00d"}.fa-house-circle-check:before{content:"\e509"}.fa-house-circle-exclamation:before{content:"\e50a"}.fa-house-circle-xmark:before{content:"\e50b"}.fa-house-crack:before{content:"\e3b1"}.fa-house-fire:before{content:"\e50c"}.fa-house-flag:before{content:"\e50d"}.fa-house-flood-water:before{content:"\e50e"}.fa-house-flood-water-circle-arrow-right:before{content:"\e50f"}.fa-house-laptop:before,.fa-laptop-house:before{content:"\e066"}.fa-house-lock:before{content:"\e510"}.fa-house-medical:before{content:"\e3b2"}.fa-house-medical-circle-check:before{content:"\e511"}.fa-house-medical-circle-exclamation:before{content:"\e512"}.fa-house-medical-circle-xmark:before{content:"\e513"}.fa-house-medical-flag:before{content:"\e514"}.fa-house-signal:before{content:"\e012"}.fa-house-tsunami:before{content:"\e515"}.fa-home-user:before,.fa-house-user:before{content:"\e1b0"}.fa-hryvnia-sign:before,.fa-hryvnia:before{content:"\f6f2"}.fa-hurricane:before{content:"\f751"}.fa-i:before{content:"\49"}.fa-i-cursor:before{content:"\f246"}.fa-ice-cream:before{content:"\f810"}.fa-icicles:before{content:"\f7ad"}.fa-heart-music-camera-bolt:before,.fa-icons:before{content:"\f86d"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before,.fa-id-card-clip:before{content:"\f47f"}.fa-igloo:before{content:"\f7ae"}.fa-image:before{content:"\f03e"}.fa-image-portrait:before,.fa-portrait:before{content:"\f3e0"}.fa-images:before{content:"\f302"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-indian-rupee-sign:before,.fa-indian-rupee:before,.fa-inr:before{content:"\e1bc"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-italic:before{content:"\f033"}.fa-j:before{content:"\4a"}.fa-jar:before{content:"\e516"}.fa-jar-wheat:before{content:"\e517"}.fa-jedi:before{content:"\f669"}.fa-fighter-jet:before,.fa-jet-fighter:before{content:"\f0fb"}.fa-jet-fighter-up:before{content:"\e518"}.fa-joint:before{content:"\f595"}.fa-jug-detergent:before{content:"\e519"}.fa-k:before{content:"\4b"}.fa-kaaba:before{content:"\f66b"}.fa-key:before{content:"\f084"}.fa-keyboard:before{content:"\f11c"}.fa-khanda:before{content:"\f66d"}.fa-kip-sign:before{content:"\e1c4"}.fa-first-aid:before,.fa-kit-medical:before{content:"\f479"}.fa-kitchen-set:before{content:"\e51a"}.fa-kiwi-bird:before{content:"\f535"}.fa-l:before{content:"\4c"}.fa-land-mine-on:before{content:"\e51b"}.fa-landmark:before{content:"\f66f"}.fa-landmark-alt:before,.fa-landmark-dome:before{content:"\f752"}.fa-landmark-flag:before{content:"\e51c"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laptop-code:before{content:"\f5fc"}.fa-laptop-file:before{content:"\e51d"}.fa-laptop-medical:before{content:"\f812"}.fa-lari-sign:before{content:"\e1c8"}.fa-layer-group:before{content:"\f5fd"}.fa-leaf:before{content:"\f06c"}.fa-left-long:before,.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-arrows-alt-h:before,.fa-left-right:before{content:"\f337"}.fa-lemon:before{content:"\f094"}.fa-less-than:before{content:"\3c"}.fa-less-than-equal:before{content:"\f537"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-lines-leaning:before{content:"\e51e"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-chain-broken:before,.fa-chain-slash:before,.fa-link-slash:before,.fa-unlink:before{content:"\f127"}.fa-lira-sign:before{content:"\f195"}.fa-list-squares:before,.fa-list:before{content:"\f03a"}.fa-list-check:before,.fa-tasks:before{content:"\f0ae"}.fa-list-1-2:before,.fa-list-numeric:before,.fa-list-ol:before{content:"\f0cb"}.fa-list-dots:before,.fa-list-ul:before{content:"\f0ca"}.fa-litecoin-sign:before{content:"\e1d3"}.fa-location-arrow:before{content:"\f124"}.fa-location-crosshairs:before,.fa-location:before{content:"\f601"}.fa-location-dot:before,.fa-map-marker-alt:before{content:"\f3c5"}.fa-location-pin:before,.fa-map-marker:before{content:"\f041"}.fa-location-pin-lock:before{content:"\e51f"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-locust:before{content:"\e520"}.fa-lungs:before{content:"\f604"}.fa-lungs-virus:before{content:"\e067"}.fa-m:before{content:"\4d"}.fa-magnet:before{content:"\f076"}.fa-magnifying-glass:before,.fa-search:before{content:"\f002"}.fa-magnifying-glass-arrow-right:before{content:"\e521"}.fa-magnifying-glass-chart:before{content:"\e522"}.fa-magnifying-glass-dollar:before,.fa-search-dollar:before{content:"\f688"}.fa-magnifying-glass-location:before,.fa-search-location:before{content:"\f689"}.fa-magnifying-glass-minus:before,.fa-search-minus:before{content:"\f010"}.fa-magnifying-glass-plus:before,.fa-search-plus:before{content:"\f00e"}.fa-manat-sign:before{content:"\e1d5"}.fa-map:before{content:"\f279"}.fa-map-location:before,.fa-map-marked:before{content:"\f59f"}.fa-map-location-dot:before,.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-pin:before{content:"\f276"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-and-venus:before{content:"\f224"}.fa-mars-and-venus-burst:before{content:"\e523"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before,.fa-mars-stroke-right:before{content:"\f22b"}.fa-mars-stroke-up:before,.fa-mars-stroke-v:before{content:"\f22a"}.fa-glass-martini-alt:before,.fa-martini-glass:before{content:"\f57b"}.fa-cocktail:before,.fa-martini-glass-citrus:before{content:"\f561"}.fa-glass-martini:before,.fa-martini-glass-empty:before{content:"\f000"}.fa-mask:before{content:"\f6fa"}.fa-mask-face:before{content:"\e1d7"}.fa-mask-ventilator:before{content:"\e524"}.fa-masks-theater:before,.fa-theater-masks:before{content:"\f630"}.fa-mattress-pillow:before{content:"\e525"}.fa-expand-arrows-alt:before,.fa-maximize:before{content:"\f31e"}.fa-medal:before{content:"\f5a2"}.fa-memory:before{content:"\f538"}.fa-menorah:before{content:"\f676"}.fa-mercury:before{content:"\f223"}.fa-comment-alt:before,.fa-message:before{content:"\f27a"}.fa-meteor:before{content:"\f753"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before,.fa-microphone-lines:before{content:"\f3c9"}.fa-microphone-alt-slash:before,.fa-microphone-lines-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microscope:before{content:"\f610"}.fa-mill-sign:before{content:"\e1ed"}.fa-compress-arrows-alt:before,.fa-minimize:before{content:"\f78c"}.fa-minus:before,.fa-subtract:before{content:"\f068"}.fa-mitten:before{content:"\f7b5"}.fa-mobile-android:before,.fa-mobile-phone:before,.fa-mobile:before{content:"\f3ce"}.fa-mobile-button:before{content:"\f10b"}.fa-mobile-retro:before{content:"\e527"}.fa-mobile-android-alt:before,.fa-mobile-screen:before{content:"\f3cf"}.fa-mobile-alt:before,.fa-mobile-screen-button:before{content:"\f3cd"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-1:before,.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-1-wave:before,.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-bill-transfer:before{content:"\e528"}.fa-money-bill-trend-up:before{content:"\e529"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wheat:before{content:"\e52a"}.fa-money-bills:before{content:"\e1f3"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before,.fa-money-check-dollar:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-mosque:before{content:"\f678"}.fa-mosquito:before{content:"\e52b"}.fa-mosquito-net:before{content:"\e52c"}.fa-motorcycle:before{content:"\f21c"}.fa-mound:before{content:"\e52d"}.fa-mountain:before{content:"\f6fc"}.fa-mountain-city:before{content:"\e52e"}.fa-mountain-sun:before{content:"\e52f"}.fa-mug-hot:before{content:"\f7b6"}.fa-coffee:before,.fa-mug-saucer:before{content:"\f0f4"}.fa-music:before{content:"\f001"}.fa-n:before{content:"\4e"}.fa-naira-sign:before{content:"\e1f6"}.fa-network-wired:before{content:"\f6ff"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-not-equal:before{content:"\f53e"}.fa-notdef:before{content:"\e1fe"}.fa-note-sticky:before,.fa-sticky-note:before{content:"\f249"}.fa-notes-medical:before{content:"\f481"}.fa-o:before{content:"\4f"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-oil-can:before{content:"\f613"}.fa-oil-well:before{content:"\e532"}.fa-om:before{content:"\f679"}.fa-otter:before{content:"\f700"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-p:before{content:"\50"}.fa-pager:before{content:"\f815"}.fa-paint-roller:before{content:"\f5aa"}.fa-paint-brush:before,.fa-paintbrush:before{content:"\f1fc"}.fa-palette:before{content:"\f53f"}.fa-pallet:before{content:"\f482"}.fa-panorama:before{content:"\e209"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-passport:before{content:"\f5ab"}.fa-file-clipboard:before,.fa-paste:before{content:"\f0ea"}.fa-pause:before{content:"\f04c"}.fa-paw:before{content:"\f1b0"}.fa-peace:before{content:"\f67c"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before,.fa-pen-clip:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-ruler:before,.fa-pencil-ruler:before{content:"\f5ae"}.fa-edit:before,.fa-pen-to-square:before{content:"\f044"}.fa-pencil-alt:before,.fa-pencil:before{content:"\f303"}.fa-people-arrows-left-right:before,.fa-people-arrows:before{content:"\e068"}.fa-people-carry-box:before,.fa-people-carry:before{content:"\f4ce"}.fa-people-group:before{content:"\e533"}.fa-people-line:before{content:"\e534"}.fa-people-pulling:before{content:"\e535"}.fa-people-robbery:before{content:"\e536"}.fa-people-roof:before{content:"\e537"}.fa-pepper-hot:before{content:"\f816"}.fa-percent:before,.fa-percentage:before{content:"\25"}.fa-male:before,.fa-person:before{content:"\f183"}.fa-person-arrow-down-to-line:before{content:"\e538"}.fa-person-arrow-up-from-line:before{content:"\e539"}.fa-biking:before,.fa-person-biking:before{content:"\f84a"}.fa-person-booth:before{content:"\f756"}.fa-person-breastfeeding:before{content:"\e53a"}.fa-person-burst:before{content:"\e53b"}.fa-person-cane:before{content:"\e53c"}.fa-person-chalkboard:before{content:"\e53d"}.fa-person-circle-check:before{content:"\e53e"}.fa-person-circle-exclamation:before{content:"\e53f"}.fa-person-circle-minus:before{content:"\e540"}.fa-person-circle-plus:before{content:"\e541"}.fa-person-circle-question:before{content:"\e542"}.fa-person-circle-xmark:before{content:"\e543"}.fa-digging:before,.fa-person-digging:before{content:"\f85e"}.fa-diagnoses:before,.fa-person-dots-from-line:before{content:"\f470"}.fa-female:before,.fa-person-dress:before{content:"\f182"}.fa-person-dress-burst:before{content:"\e544"}.fa-person-drowning:before{content:"\e545"}.fa-person-falling:before{content:"\e546"}.fa-person-falling-burst:before{content:"\e547"}.fa-person-half-dress:before{content:"\e548"}.fa-person-harassing:before{content:"\e549"}.fa-hiking:before,.fa-person-hiking:before{content:"\f6ec"}.fa-person-military-pointing:before{content:"\e54a"}.fa-person-military-rifle:before{content:"\e54b"}.fa-person-military-to-person:before{content:"\e54c"}.fa-person-praying:before,.fa-pray:before{content:"\f683"}.fa-person-pregnant:before{content:"\e31e"}.fa-person-rays:before{content:"\e54d"}.fa-person-rifle:before{content:"\e54e"}.fa-person-running:before,.fa-running:before{content:"\f70c"}.fa-person-shelter:before{content:"\e54f"}.fa-person-skating:before,.fa-skating:before{content:"\f7c5"}.fa-person-skiing:before,.fa-skiing:before{content:"\f7c9"}.fa-person-skiing-nordic:before,.fa-skiing-nordic:before{content:"\f7ca"}.fa-person-snowboarding:before,.fa-snowboarding:before{content:"\f7ce"}.fa-person-swimming:before,.fa-swimmer:before{content:"\f5c4"}.fa-person-through-window:before{content:"\e5a9"}.fa-person-walking:before,.fa-walking:before{content:"\f554"}.fa-person-walking-arrow-loop-left:before{content:"\e551"}.fa-person-walking-arrow-right:before{content:"\e552"}.fa-person-walking-dashed-line-arrow-right:before{content:"\e553"}.fa-person-walking-luggage:before{content:"\e554"}.fa-blind:before,.fa-person-walking-with-cane:before{content:"\f29d"}.fa-peseta-sign:before{content:"\e221"}.fa-peso-sign:before{content:"\e222"}.fa-phone:before{content:"\f095"}.fa-phone-alt:before,.fa-phone-flip:before{content:"\f879"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-volume:before,.fa-volume-control-phone:before{content:"\f2a0"}.fa-photo-film:before,.fa-photo-video:before{content:"\f87c"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pizza-slice:before{content:"\f818"}.fa-place-of-worship:before{content:"\f67f"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-circle-check:before{content:"\e555"}.fa-plane-circle-exclamation:before{content:"\e556"}.fa-plane-circle-xmark:before{content:"\e557"}.fa-plane-departure:before{content:"\f5b0"}.fa-plane-lock:before{content:"\e558"}.fa-plane-slash:before{content:"\e069"}.fa-plane-up:before{content:"\e22d"}.fa-plant-wilt:before{content:"\e5aa"}.fa-plate-wheat:before{content:"\e55a"}.fa-play:before{content:"\f04b"}.fa-plug:before{content:"\f1e6"}.fa-plug-circle-bolt:before{content:"\e55b"}.fa-plug-circle-check:before{content:"\e55c"}.fa-plug-circle-exclamation:before{content:"\e55d"}.fa-plug-circle-minus:before{content:"\e55e"}.fa-plug-circle-plus:before{content:"\e55f"}.fa-plug-circle-xmark:before{content:"\e560"}.fa-add:before,.fa-plus:before{content:"\2b"}.fa-plus-minus:before{content:"\e43c"}.fa-podcast:before{content:"\f2ce"}.fa-poo:before{content:"\f2fe"}.fa-poo-bolt:before,.fa-poo-storm:before{content:"\f75a"}.fa-poop:before{content:"\f619"}.fa-power-off:before{content:"\f011"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before,.fa-prescription-bottle-medical:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-pump-medical:before{content:"\e06a"}.fa-pump-soap:before{content:"\e06b"}.fa-puzzle-piece:before{content:"\f12e"}.fa-q:before{content:"\51"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\3f"}.fa-quote-left-alt:before,.fa-quote-left:before{content:"\f10d"}.fa-quote-right-alt:before,.fa-quote-right:before{content:"\f10e"}.fa-r:before{content:"\52"}.fa-radiation:before{content:"\f7b9"}.fa-radio:before{content:"\f8d7"}.fa-rainbow:before{content:"\f75b"}.fa-ranking-star:before{content:"\e561"}.fa-receipt:before{content:"\f543"}.fa-record-vinyl:before{content:"\f8d9"}.fa-ad:before,.fa-rectangle-ad:before{content:"\f641"}.fa-list-alt:before,.fa-rectangle-list:before{content:"\f022"}.fa-rectangle-times:before,.fa-rectangle-xmark:before,.fa-times-rectangle:before,.fa-window-close:before{content:"\f410"}.fa-recycle:before{content:"\f1b8"}.fa-registered:before{content:"\f25d"}.fa-repeat:before{content:"\f363"}.fa-mail-reply:before,.fa-reply:before{content:"\f3e5"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-republican:before{content:"\f75e"}.fa-restroom:before{content:"\f7bd"}.fa-retweet:before{content:"\f079"}.fa-ribbon:before{content:"\f4d6"}.fa-right-from-bracket:before,.fa-sign-out-alt:before{content:"\f2f5"}.fa-exchange-alt:before,.fa-right-left:before{content:"\f362"}.fa-long-arrow-alt-right:before,.fa-right-long:before{content:"\f30b"}.fa-right-to-bracket:before,.fa-sign-in-alt:before{content:"\f2f6"}.fa-ring:before{content:"\f70b"}.fa-road:before{content:"\f018"}.fa-road-barrier:before{content:"\e562"}.fa-road-bridge:before{content:"\e563"}.fa-road-circle-check:before{content:"\e564"}.fa-road-circle-exclamation:before{content:"\e565"}.fa-road-circle-xmark:before{content:"\e566"}.fa-road-lock:before{content:"\e567"}.fa-road-spikes:before{content:"\e568"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rotate:before,.fa-sync-alt:before{content:"\f2f1"}.fa-rotate-back:before,.fa-rotate-backward:before,.fa-rotate-left:before,.fa-undo-alt:before{content:"\f2ea"}.fa-redo-alt:before,.fa-rotate-forward:before,.fa-rotate-right:before{content:"\f2f9"}.fa-route:before{content:"\f4d7"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-rouble:before,.fa-rub:before,.fa-ruble-sign:before,.fa-ruble:before{content:"\f158"}.fa-rug:before{content:"\e569"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-rupee-sign:before,.fa-rupee:before{content:"\f156"}.fa-rupiah-sign:before{content:"\e23d"}.fa-s:before{content:"\53"}.fa-sack-dollar:before{content:"\f81d"}.fa-sack-xmark:before{content:"\e56a"}.fa-sailboat:before{content:"\e445"}.fa-satellite:before{content:"\f7bf"}.fa-satellite-dish:before{content:"\f7c0"}.fa-balance-scale:before,.fa-scale-balanced:before{content:"\f24e"}.fa-balance-scale-left:before,.fa-scale-unbalanced:before{content:"\f515"}.fa-balance-scale-right:before,.fa-scale-unbalanced-flip:before{content:"\f516"}.fa-school:before{content:"\f549"}.fa-school-circle-check:before{content:"\e56b"}.fa-school-circle-exclamation:before{content:"\e56c"}.fa-school-circle-xmark:before{content:"\e56d"}.fa-school-flag:before{content:"\e56e"}.fa-school-lock:before{content:"\e56f"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-screwdriver:before{content:"\f54a"}.fa-screwdriver-wrench:before,.fa-tools:before{content:"\f7d9"}.fa-scroll:before{content:"\f70e"}.fa-scroll-torah:before,.fa-torah:before{content:"\f6a0"}.fa-sd-card:before{content:"\f7c2"}.fa-section:before{content:"\e447"}.fa-seedling:before,.fa-sprout:before{content:"\f4d8"}.fa-server:before{content:"\f233"}.fa-shapes:before,.fa-triangle-circle-square:before{content:"\f61f"}.fa-arrow-turn-right:before,.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-share-from-square:before,.fa-share-square:before{content:"\f14d"}.fa-share-alt:before,.fa-share-nodes:before{content:"\f1e0"}.fa-sheet-plastic:before{content:"\e571"}.fa-ils:before,.fa-shekel-sign:before,.fa-shekel:before,.fa-sheqel-sign:before,.fa-sheqel:before{content:"\f20b"}.fa-shield-blank:before,.fa-shield:before{content:"\f132"}.fa-shield-cat:before{content:"\e572"}.fa-shield-dog:before{content:"\e573"}.fa-shield-alt:before,.fa-shield-halved:before{content:"\f3ed"}.fa-shield-heart:before{content:"\e574"}.fa-shield-virus:before{content:"\e06c"}.fa-ship:before{content:"\f21a"}.fa-shirt:before,.fa-t-shirt:before,.fa-tshirt:before{content:"\f553"}.fa-shoe-prints:before{content:"\f54b"}.fa-shop:before,.fa-store-alt:before{content:"\f54f"}.fa-shop-lock:before{content:"\e4a5"}.fa-shop-slash:before,.fa-store-alt-slash:before{content:"\e070"}.fa-shower:before{content:"\f2cc"}.fa-shrimp:before{content:"\e448"}.fa-random:before,.fa-shuffle:before{content:"\f074"}.fa-shuttle-space:before,.fa-space-shuttle:before{content:"\f197"}.fa-sign-hanging:before,.fa-sign:before{content:"\f4d9"}.fa-signal-5:before,.fa-signal-perfect:before,.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-map-signs:before,.fa-signs-post:before{content:"\f277"}.fa-sim-card:before{content:"\f7c4"}.fa-sink:before{content:"\e06d"}.fa-sitemap:before{content:"\f0e8"}.fa-skull:before{content:"\f54c"}.fa-skull-crossbones:before{content:"\f714"}.fa-slash:before{content:"\f715"}.fa-sleigh:before{content:"\f7cc"}.fa-sliders-h:before,.fa-sliders:before{content:"\f1de"}.fa-smog:before{content:"\f75f"}.fa-smoking:before{content:"\f48d"}.fa-snowflake:before{content:"\f2dc"}.fa-snowman:before{content:"\f7d0"}.fa-snowplow:before{content:"\f7d2"}.fa-soap:before{content:"\e06e"}.fa-socks:before{content:"\f696"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before,.fa-unsorted:before{content:"\f0dc"}.fa-sort-desc:before,.fa-sort-down:before{content:"\f0dd"}.fa-sort-asc:before,.fa-sort-up:before{content:"\f0de"}.fa-spa:before{content:"\f5bb"}.fa-pastafarianism:before,.fa-spaghetti-monster-flying:before{content:"\f67b"}.fa-spell-check:before{content:"\f891"}.fa-spider:before{content:"\f717"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spoon:before,.fa-utensil-spoon:before{content:"\f2e5"}.fa-spray-can:before{content:"\f5bd"}.fa-air-freshener:before,.fa-spray-can-sparkles:before{content:"\f5d0"}.fa-square:before{content:"\f0c8"}.fa-external-link-square:before,.fa-square-arrow-up-right:before{content:"\f14c"}.fa-caret-square-down:before,.fa-square-caret-down:before{content:"\f150"}.fa-caret-square-left:before,.fa-square-caret-left:before{content:"\f191"}.fa-caret-square-right:before,.fa-square-caret-right:before{content:"\f152"}.fa-caret-square-up:before,.fa-square-caret-up:before{content:"\f151"}.fa-check-square:before,.fa-square-check:before{content:"\f14a"}.fa-envelope-square:before,.fa-square-envelope:before{content:"\f199"}.fa-square-full:before{content:"\f45c"}.fa-h-square:before,.fa-square-h:before{content:"\f0fd"}.fa-minus-square:before,.fa-square-minus:before{content:"\f146"}.fa-square-nfi:before{content:"\e576"}.fa-parking:before,.fa-square-parking:before{content:"\f540"}.fa-pen-square:before,.fa-pencil-square:before,.fa-square-pen:before{content:"\f14b"}.fa-square-person-confined:before{content:"\e577"}.fa-phone-square:before,.fa-square-phone:before{content:"\f098"}.fa-phone-square-alt:before,.fa-square-phone-flip:before{content:"\f87b"}.fa-plus-square:before,.fa-square-plus:before{content:"\f0fe"}.fa-poll-h:before,.fa-square-poll-horizontal:before{content:"\f682"}.fa-poll:before,.fa-square-poll-vertical:before{content:"\f681"}.fa-square-root-alt:before,.fa-square-root-variable:before{content:"\f698"}.fa-rss-square:before,.fa-square-rss:before{content:"\f143"}.fa-share-alt-square:before,.fa-square-share-nodes:before{content:"\f1e1"}.fa-external-link-square-alt:before,.fa-square-up-right:before{content:"\f360"}.fa-square-virus:before{content:"\e578"}.fa-square-xmark:before,.fa-times-square:before,.fa-xmark-square:before{content:"\f2d3"}.fa-rod-asclepius:before,.fa-rod-snake:before,.fa-staff-aesculapius:before,.fa-staff-snake:before{content:"\e579"}.fa-stairs:before{content:"\e289"}.fa-stamp:before{content:"\f5bf"}.fa-stapler:before{content:"\e5af"}.fa-star:before{content:"\f005"}.fa-star-and-crescent:before{content:"\f699"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before,.fa-star-half-stroke:before{content:"\f5c0"}.fa-star-of-david:before{content:"\f69a"}.fa-star-of-life:before{content:"\f621"}.fa-gbp:before,.fa-pound-sign:before,.fa-sterling-sign:before{content:"\f154"}.fa-stethoscope:before{content:"\f0f1"}.fa-stop:before{content:"\f04d"}.fa-stopwatch:before{content:"\f2f2"}.fa-stopwatch-20:before{content:"\e06f"}.fa-store:before{content:"\f54e"}.fa-store-slash:before{content:"\e071"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stroopwafel:before{content:"\f551"}.fa-subscript:before{content:"\f12c"}.fa-suitcase:before{content:"\f0f2"}.fa-medkit:before,.fa-suitcase-medical:before{content:"\f0fa"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-sun-plant-wilt:before{content:"\e57a"}.fa-superscript:before{content:"\f12b"}.fa-swatchbook:before{content:"\f5c3"}.fa-synagogue:before{content:"\f69b"}.fa-syringe:before{content:"\f48e"}.fa-t:before{content:"\54"}.fa-table:before{content:"\f0ce"}.fa-table-cells:before,.fa-th:before{content:"\f00a"}.fa-table-cells-large:before,.fa-th-large:before{content:"\f009"}.fa-columns:before,.fa-table-columns:before{content:"\f0db"}.fa-table-list:before,.fa-th-list:before{content:"\f00b"}.fa-ping-pong-paddle-ball:before,.fa-table-tennis-paddle-ball:before,.fa-table-tennis:before{content:"\f45d"}.fa-tablet-android:before,.fa-tablet:before{content:"\f3fb"}.fa-tablet-button:before{content:"\f10a"}.fa-tablet-alt:before,.fa-tablet-screen-button:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-digital-tachograph:before,.fa-tachograph-digital:before{content:"\f566"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tarp:before{content:"\e57b"}.fa-tarp-droplet:before{content:"\e57c"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-teeth:before{content:"\f62e"}.fa-teeth-open:before{content:"\f62f"}.fa-temperature-arrow-down:before,.fa-temperature-down:before{content:"\e03f"}.fa-temperature-arrow-up:before,.fa-temperature-up:before{content:"\e040"}.fa-temperature-0:before,.fa-temperature-empty:before,.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-temperature-4:before,.fa-temperature-full:before,.fa-thermometer-4:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-temperature-2:before,.fa-temperature-half:before,.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-temperature-high:before{content:"\f769"}.fa-temperature-low:before{content:"\f76b"}.fa-temperature-1:before,.fa-temperature-quarter:before,.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-temperature-3:before,.fa-temperature-three-quarters:before,.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-tenge-sign:before,.fa-tenge:before{content:"\f7d7"}.fa-tent:before{content:"\e57d"}.fa-tent-arrow-down-to-line:before{content:"\e57e"}.fa-tent-arrow-left-right:before{content:"\e57f"}.fa-tent-arrow-turn-left:before{content:"\e580"}.fa-tent-arrows-down:before{content:"\e581"}.fa-tents:before{content:"\e582"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-remove-format:before,.fa-text-slash:before{content:"\f87d"}.fa-text-width:before{content:"\f035"}.fa-thermometer:before{content:"\f491"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumb-tack:before,.fa-thumbtack:before{content:"\f08d"}.fa-ticket:before{content:"\f145"}.fa-ticket-alt:before,.fa-ticket-simple:before{content:"\f3ff"}.fa-timeline:before{content:"\e29c"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toilet:before{content:"\f7d8"}.fa-toilet-paper:before{content:"\f71e"}.fa-toilet-paper-slash:before{content:"\e072"}.fa-toilet-portable:before{content:"\e583"}.fa-toilets-portable:before{content:"\e584"}.fa-toolbox:before{content:"\f552"}.fa-tooth:before{content:"\f5c9"}.fa-torii-gate:before{content:"\f6a1"}.fa-tornado:before{content:"\f76f"}.fa-broadcast-tower:before,.fa-tower-broadcast:before{content:"\f519"}.fa-tower-cell:before{content:"\e585"}.fa-tower-observation:before{content:"\e586"}.fa-tractor:before{content:"\f722"}.fa-trademark:before{content:"\f25c"}.fa-traffic-light:before{content:"\f637"}.fa-trailer:before{content:"\e041"}.fa-train:before{content:"\f238"}.fa-subway:before,.fa-train-subway:before{content:"\f239"}.fa-train-tram:before{content:"\e5b4"}.fa-transgender-alt:before,.fa-transgender:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-arrow-up:before,.fa-trash-restore:before{content:"\f829"}.fa-trash-alt:before,.fa-trash-can:before{content:"\f2ed"}.fa-trash-can-arrow-up:before,.fa-trash-restore-alt:before{content:"\f82a"}.fa-tree:before{content:"\f1bb"}.fa-tree-city:before{content:"\e587"}.fa-exclamation-triangle:before,.fa-triangle-exclamation:before,.fa-warning:before{content:"\f071"}.fa-trophy:before{content:"\f091"}.fa-trowel:before{content:"\e589"}.fa-trowel-bricks:before{content:"\e58a"}.fa-truck:before{content:"\f0d1"}.fa-truck-arrow-right:before{content:"\e58b"}.fa-truck-droplet:before{content:"\e58c"}.fa-shipping-fast:before,.fa-truck-fast:before{content:"\f48b"}.fa-truck-field:before{content:"\e58d"}.fa-truck-field-un:before{content:"\e58e"}.fa-truck-front:before{content:"\e2b7"}.fa-ambulance:before,.fa-truck-medical:before{content:"\f0f9"}.fa-truck-monster:before{content:"\f63b"}.fa-truck-moving:before{content:"\f4df"}.fa-truck-pickup:before{content:"\f63c"}.fa-truck-plane:before{content:"\e58f"}.fa-truck-loading:before,.fa-truck-ramp-box:before{content:"\f4de"}.fa-teletype:before,.fa-tty:before{content:"\f1e4"}.fa-try:before,.fa-turkish-lira-sign:before,.fa-turkish-lira:before{content:"\e2bb"}.fa-level-down-alt:before,.fa-turn-down:before{content:"\f3be"}.fa-level-up-alt:before,.fa-turn-up:before{content:"\f3bf"}.fa-television:before,.fa-tv-alt:before,.fa-tv:before{content:"\f26c"}.fa-u:before{content:"\55"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-underline:before{content:"\f0cd"}.fa-universal-access:before{content:"\f29a"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before,.fa-unlock-keyhole:before{content:"\f13e"}.fa-arrows-alt-v:before,.fa-up-down:before{content:"\f338"}.fa-arrows-alt:before,.fa-up-down-left-right:before{content:"\f0b2"}.fa-long-arrow-alt-up:before,.fa-up-long:before{content:"\f30c"}.fa-expand-alt:before,.fa-up-right-and-down-left-from-center:before{content:"\f424"}.fa-external-link-alt:before,.fa-up-right-from-square:before{content:"\f35d"}.fa-upload:before{content:"\f093"}.fa-user:before{content:"\f007"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-clock:before{content:"\f4fd"}.fa-user-doctor:before,.fa-user-md:before{content:"\f0f0"}.fa-user-cog:before,.fa-user-gear:before{content:"\f4fe"}.fa-user-graduate:before{content:"\f501"}.fa-user-friends:before,.fa-user-group:before{content:"\f500"}.fa-user-injured:before{content:"\f728"}.fa-user-alt:before,.fa-user-large:before{content:"\f406"}.fa-user-alt-slash:before,.fa-user-large-slash:before{content:"\f4fa"}.fa-user-lock:before{content:"\f502"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-nurse:before{content:"\f82f"}.fa-user-edit:before,.fa-user-pen:before{content:"\f4ff"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before,.fa-user-xmark:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-between-lines:before{content:"\e591"}.fa-users-cog:before,.fa-users-gear:before{content:"\f509"}.fa-users-line:before{content:"\e592"}.fa-users-rays:before{content:"\e593"}.fa-users-rectangle:before{content:"\e594"}.fa-users-slash:before{content:"\e073"}.fa-users-viewfinder:before{content:"\e595"}.fa-cutlery:before,.fa-utensils:before{content:"\f2e7"}.fa-v:before{content:"\56"}.fa-shuttle-van:before,.fa-van-shuttle:before{content:"\f5b6"}.fa-vault:before{content:"\e2c5"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-vest:before{content:"\e085"}.fa-vest-patches:before{content:"\e086"}.fa-vial:before{content:"\f492"}.fa-vial-circle-check:before{content:"\e596"}.fa-vial-virus:before{content:"\e597"}.fa-vials:before{content:"\f493"}.fa-video-camera:before,.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vihara:before{content:"\f6a7"}.fa-virus:before{content:"\e074"}.fa-virus-covid:before{content:"\e4a8"}.fa-virus-covid-slash:before{content:"\e4a9"}.fa-virus-slash:before{content:"\e075"}.fa-viruses:before{content:"\e076"}.fa-voicemail:before{content:"\f897"}.fa-volcano:before{content:"\f770"}.fa-volleyball-ball:before,.fa-volleyball:before{content:"\f45f"}.fa-volume-high:before,.fa-volume-up:before{content:"\f028"}.fa-volume-down:before,.fa-volume-low:before{content:"\f027"}.fa-volume-off:before{content:"\f026"}.fa-volume-mute:before,.fa-volume-times:before,.fa-volume-xmark:before{content:"\f6a9"}.fa-vr-cardboard:before{content:"\f729"}.fa-w:before{content:"\57"}.fa-walkie-talkie:before{content:"\f8ef"}.fa-wallet:before{content:"\f555"}.fa-magic:before,.fa-wand-magic:before{content:"\f0d0"}.fa-magic-wand-sparkles:before,.fa-wand-magic-sparkles:before{content:"\e2ca"}.fa-wand-sparkles:before{content:"\f72b"}.fa-warehouse:before{content:"\f494"}.fa-water:before{content:"\f773"}.fa-ladder-water:before,.fa-swimming-pool:before,.fa-water-ladder:before{content:"\f5c5"}.fa-wave-square:before{content:"\f83e"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weight-scale:before,.fa-weight:before{content:"\f496"}.fa-wheat-alt:before,.fa-wheat-awn:before{content:"\e2cd"}.fa-wheat-awn-circle-exclamation:before{content:"\e598"}.fa-wheelchair:before{content:"\f193"}.fa-wheelchair-alt:before,.fa-wheelchair-move:before{content:"\e2ce"}.fa-glass-whiskey:before,.fa-whiskey-glass:before{content:"\f7a0"}.fa-wifi-3:before,.fa-wifi-strong:before,.fa-wifi:before{content:"\f1eb"}.fa-wind:before{content:"\f72e"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-wine-bottle:before{content:"\f72f"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before,.fa-wine-glass-empty:before{content:"\f5ce"}.fa-krw:before,.fa-won-sign:before,.fa-won:before{content:"\f159"}.fa-worm:before{content:"\e599"}.fa-wrench:before{content:"\f0ad"}.fa-x:before{content:"\58"}.fa-x-ray:before{content:"\f497"}.fa-close:before,.fa-multiply:before,.fa-remove:before,.fa-times:before,.fa-xmark:before{content:"\f00d"}.fa-xmarks-lines:before{content:"\e59a"}.fa-y:before{content:"\59"}.fa-cny:before,.fa-jpy:before,.fa-rmb:before,.fa-yen-sign:before,.fa-yen:before{content:"\f157"}.fa-yin-yang:before{content:"\f6ad"}.fa-z:before{content:"\5a"}.fa-sr-only,.fa-sr-only-focusable:not(:focus),.sr-only,.sr-only-focusable:not(:focus){position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border-width:0}:host,:root{--fa-font-brands:normal 400 1em/1 "Font Awesome 6 Brands"}.fa-brands,.fab{font-family:"Font Awesome 6 Brands";font-weight:400}.fa-42-group:before,.fa-innosoft:before{content:"\e080"}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-adn:before{content:"\f170"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-airbnb:before{content:"\f834"}.fa-algolia:before{content:"\f36c"}.fa-alipay:before{content:"\f642"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-amilia:before{content:"\f36d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-pay:before{content:"\f415"}.fa-artstation:before{content:"\f77a"}.fa-asymmetrik:before{content:"\f372"}.fa-atlassian:before{content:"\f77b"}.fa-audible:before{content:"\f373"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-aws:before{content:"\f375"}.fa-bandcamp:before{content:"\f2d5"}.fa-battle-net:before{content:"\f835"}.fa-behance:before{content:"\f1b4"}.fa-bilibili:before{content:"\e3d9"}.fa-bimobject:before{content:"\f378"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bootstrap:before{content:"\f836"}.fa-bots:before{content:"\e340"}.fa-btc:before{content:"\f15a"}.fa-buffer:before{content:"\f837"}.fa-buromobelexperte:before{content:"\f37f"}.fa-buy-n-large:before{content:"\f8a6"}.fa-buysellads:before{content:"\f20d"}.fa-canadian-maple-leaf:before{content:"\f785"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-centos:before{content:"\f789"}.fa-chrome:before{content:"\f268"}.fa-chromecast:before{content:"\f838"}.fa-cloudflare:before{content:"\e07d"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cmplid:before{content:"\e360"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-confluence:before{content:"\f78d"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cotton-bureau:before{content:"\f89e"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-creative-commons-zero:before{content:"\f4f3"}.fa-critical-role:before{content:"\f6c9"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-d-and-d-beyond:before{content:"\f6ca"}.fa-dailymotion:before{content:"\e052"}.fa-dashcube:before{content:"\f210"}.fa-deezer:before{content:"\e077"}.fa-delicious:before{content:"\f1a5"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-dev:before{content:"\f6cc"}.fa-deviantart:before{content:"\f1bd"}.fa-dhl:before{content:"\f790"}.fa-diaspora:before{content:"\f791"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-draft2digital:before{content:"\f396"}.fa-dribbble:before{content:"\f17d"}.fa-dropbox:before{content:"\f16b"}.fa-drupal:before{content:"\f1a9"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edge-legacy:before{content:"\e078"}.fa-elementor:before{content:"\f430"}.fa-ello:before{content:"\f5f1"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envira:before{content:"\f299"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-etsy:before{content:"\f2d7"}.fa-evernote:before{content:"\f839"}.fa-expeditedssl:before{content:"\f23e"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-fantasy-flight-games:before{content:"\f6dc"}.fa-fedex:before{content:"\f797"}.fa-fedora:before{content:"\f798"}.fa-figma:before{content:"\f799"}.fa-firefox:before{content:"\f269"}.fa-firefox-browser:before{content:"\e007"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-fly:before{content:"\f417"}.fa-font-awesome-flag:before,.fa-font-awesome-logo-full:before,.fa-font-awesome:before{content:"\f2b4"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-fulcrum:before{content:"\f50b"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-git:before{content:"\f1d3"}.fa-git-alt:before{content:"\f841"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-gofore:before{content:"\f3a7"}.fa-golang:before{content:"\e40f"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-pay:before{content:"\e079"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-wallet:before{content:"\f1ee"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-guilded:before{content:"\e07e"}.fa-gulp:before{content:"\f3ae"}.fa-hacker-news:before{content:"\f1d4"}.fa-hackerrank:before{content:"\f5f7"}.fa-hashnode:before{content:"\e499"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-hive:before{content:"\e07f"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-hotjar:before{content:"\f3b1"}.fa-houzz:before{content:"\f27c"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-ideal:before{content:"\e013"}.fa-imdb:before{content:"\f2d8"}.fa-instagram:before{content:"\f16d"}.fa-instalod:before{content:"\e081"}.fa-intercom:before{content:"\f7af"}.fa-internet-explorer:before{content:"\f26b"}.fa-invision:before{content:"\f7b0"}.fa-ioxhost:before{content:"\f208"}.fa-itch-io:before{content:"\f83a"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-jira:before{content:"\f7b1"}.fa-joget:before{content:"\f3b7"}.fa-joomla:before{content:"\f1aa"}.fa-js:before{content:"\f3b8"}.fa-jsfiddle:before{content:"\f1cc"}.fa-kaggle:before{content:"\f5fa"}.fa-keybase:before{content:"\f4f5"}.fa-keycdn:before{content:"\f3ba"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-korvue:before{content:"\f42f"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-leanpub:before{content:"\f212"}.fa-less:before{content:"\f41d"}.fa-line:before{content:"\f3c0"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-mailchimp:before{content:"\f59e"}.fa-mandalorian:before{content:"\f50f"}.fa-markdown:before{content:"\f60f"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-mdb:before{content:"\f8ca"}.fa-medapps:before{content:"\f3c6"}.fa-medium-m:before,.fa-medium:before{content:"\f23a"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-mendeley:before{content:"\f7b3"}.fa-meta:before{content:"\e49b"}.fa-microblog:before{content:"\e01a"}.fa-microsoft:before{content:"\f3ca"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mixer:before{content:"\e056"}.fa-mizuni:before{content:"\f3cc"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-napster:before{content:"\f3d2"}.fa-neos:before{content:"\f612"}.fa-nfc-directional:before{content:"\e530"}.fa-nfc-symbol:before{content:"\e531"}.fa-nimblr:before{content:"\f5a8"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-octopus-deploy:before{content:"\e082"}.fa-odnoklassniki:before{content:"\f263"}.fa-old-republic:before{content:"\f510"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-orcid:before{content:"\f8d2"}.fa-osi:before{content:"\f41a"}.fa-padlet:before{content:"\e4a0"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-palfed:before{content:"\f3d8"}.fa-patreon:before{content:"\f3d9"}.fa-paypal:before{content:"\f1ed"}.fa-perbyte:before{content:"\e083"}.fa-periscope:before{content:"\f3da"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pix:before{content:"\e43a"}.fa-playstation:before{content:"\f3df"}.fa-product-hunt:before{content:"\f288"}.fa-pushed:before{content:"\f3e1"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-r-project:before{content:"\f4f7"}.fa-raspberry-pi:before{content:"\f7bb"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-reacteurope:before{content:"\f75d"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-redhat:before{content:"\f7bc"}.fa-renren:before{content:"\f18b"}.fa-replyd:before{content:"\f3e6"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-rev:before{content:"\f5b2"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-rust:before{content:"\e07a"}.fa-safari:before{content:"\f267"}.fa-salesforce:before{content:"\f83b"}.fa-sass:before{content:"\f41e"}.fa-schlix:before{content:"\f3ea"}.fa-screenpal:before{content:"\e570"}.fa-scribd:before{content:"\f28a"}.fa-searchengin:before{content:"\f3eb"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-servicestack:before{content:"\f3ec"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shopify:before{content:"\e057"}.fa-shopware:before{content:"\f5b5"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sith:before{content:"\f512"}.fa-sitrox:before{content:"\e44a"}.fa-sketch:before{content:"\f7c6"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack-hash:before,.fa-slack:before{content:"\f198"}.fa-slideshare:before{content:"\f1e7"}.fa-snapchat-ghost:before,.fa-snapchat:before{content:"\f2ab"}.fa-soundcloud:before{content:"\f1be"}.fa-sourcetree:before{content:"\f7d3"}.fa-space-awesome:before{content:"\e5ac"}.fa-speakap:before{content:"\f3f3"}.fa-speaker-deck:before{content:"\f83c"}.fa-spotify:before{content:"\f1bc"}.fa-behance-square:before,.fa-square-behance:before{content:"\f1b5"}.fa-dribbble-square:before,.fa-square-dribbble:before{content:"\f397"}.fa-facebook-square:before,.fa-square-facebook:before{content:"\f082"}.fa-square-font-awesome:before{content:"\e5ad"}.fa-font-awesome-alt:before,.fa-square-font-awesome-stroke:before{content:"\f35c"}.fa-git-square:before,.fa-square-git:before{content:"\f1d2"}.fa-github-square:before,.fa-square-github:before{content:"\f092"}.fa-gitlab-square:before,.fa-square-gitlab:before{content:"\e5ae"}.fa-google-plus-square:before,.fa-square-google-plus:before{content:"\f0d4"}.fa-hacker-news-square:before,.fa-square-hacker-news:before{content:"\f3af"}.fa-instagram-square:before,.fa-square-instagram:before{content:"\e055"}.fa-js-square:before,.fa-square-js:before{content:"\f3b9"}.fa-lastfm-square:before,.fa-square-lastfm:before{content:"\f203"}.fa-odnoklassniki-square:before,.fa-square-odnoklassniki:before{content:"\f264"}.fa-pied-piper-square:before,.fa-square-pied-piper:before{content:"\e01e"}.fa-pinterest-square:before,.fa-square-pinterest:before{content:"\f0d3"}.fa-reddit-square:before,.fa-square-reddit:before{content:"\f1a2"}.fa-snapchat-square:before,.fa-square-snapchat:before{content:"\f2ad"}.fa-square-steam:before,.fa-steam-square:before{content:"\f1b7"}.fa-square-tumblr:before,.fa-tumblr-square:before{content:"\f174"}.fa-square-twitter:before,.fa-twitter-square:before{content:"\f081"}.fa-square-viadeo:before,.fa-viadeo-square:before{content:"\f2aa"}.fa-square-vimeo:before,.fa-vimeo-square:before{content:"\f194"}.fa-square-whatsapp:before,.fa-whatsapp-square:before{content:"\f40c"}.fa-square-xing:before,.fa-xing-square:before{content:"\f169"}.fa-square-youtube:before,.fa-youtube-square:before{content:"\f431"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stackpath:before{content:"\f842"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-symbol:before{content:"\f3f6"}.fa-sticker-mule:before{content:"\f3f7"}.fa-strava:before{content:"\f428"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-superpowers:before{content:"\f2dd"}.fa-supple:before{content:"\f3f9"}.fa-suse:before{content:"\f7d6"}.fa-swift:before{content:"\f8e1"}.fa-symfony:before{content:"\f83d"}.fa-teamspeak:before{content:"\f4f9"}.fa-telegram-plane:before,.fa-telegram:before{content:"\f2c6"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-the-red-yeti:before{content:"\f69d"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-think-peaks:before{content:"\f731"}.fa-tiktok:before{content:"\e07b"}.fa-trade-federation:before{content:"\f513"}.fa-trello:before{content:"\f181"}.fa-tumblr:before{content:"\f173"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-ubuntu:before{content:"\f7df"}.fa-uikit:before{content:"\f403"}.fa-umbraco:before{content:"\f8e8"}.fa-uncharted:before{content:"\e084"}.fa-uniregistry:before{content:"\f404"}.fa-unity:before{content:"\e049"}.fa-unsplash:before{content:"\e07c"}.fa-untappd:before{content:"\f405"}.fa-ups:before{content:"\f7e0"}.fa-usb:before{content:"\f287"}.fa-usps:before{content:"\f7e1"}.fa-ussunnah:before{content:"\f407"}.fa-vaadin:before{content:"\f408"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viber:before{content:"\f409"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-vuejs:before{content:"\f41f"}.fa-watchman-monitoring:before{content:"\e087"}.fa-waze:before{content:"\f83f"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whmcs:before{content:"\f40d"}.fa-wikipedia-w:before{content:"\f266"}.fa-windows:before{content:"\f17a"}.fa-wirsindhandwerk:before,.fa-wsh:before{content:"\e2d0"}.fa-wix:before{content:"\f5cf"}.fa-wizards-of-the-coast:before{content:"\f730"}.fa-wodu:before{content:"\e088"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-rendact:before,.fa-wpressr:before{content:"\f3e4"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yammer:before{content:"\f840"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yarn:before{content:"\f7e3"}.fa-yelp:before{content:"\f1e9"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-zhihu:before{content:"\f63f"}:host,:root{--fa-font-regular:normal 400 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:400;font-display:block;src:url(fa-regular-400.ttf) format("truetype")}.fa-regular,.far{font-family:"Font Awesome 6 Free";font-weight:400}:host,:root{--fa-font-solid:normal 900 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:900;font-display:block;src:url(fa-solid-900.ttf) format("truetype")}.fa-solid,.fas{font-family:"Font Awesome 6 Free";font-weight:900}@font-face{font-family:"Font Awesome 5 Free";font-display:block;font-weight:900;src:url(fa-solid-900.ttf) format("truetype")}@font-face{font-family:"Font Awesome 5 Free";font-display:block;font-weight:400;src:url(fa-regular-400.ttf) format("truetype")}@font-face{font-family:"FontAwesome";font-display:block;src:url(fa-solid-900.ttf) format("truetype")}@font-face{font-family:"FontAwesome";font-display:block;src:url(fa-regular-400.ttf) format("truetype");unicode-range:u+f003,u+f006,u+f014,u+f016-f017,u+f01a-f01b,u+f01d,u+f022,u+f03e,u+f044,u+f046,u+f05c-f05d,u+f06e,u+f070,u+f087-f088,u+f08a,u+f094,u+f096-f097,u+f09d,u+f0a0,u+f0a2,u+f0a4-f0a7,u+f0c5,u+f0c7,u+f0e5-f0e6,u+f0eb,u+f0f6-f0f8,u+f10c,u+f114-f115,u+f118-f11a,u+f11c-f11d,u+f133,u+f147,u+f14e,u+f150-f152,u+f185-f186,u+f18e,u+f190-f192,u+f196,u+f1c1-f1c9,u+f1d9,u+f1db,u+f1e3,u+f1ea,u+f1f7,u+f1f9,u+f20a,u+f247-f248,u+f24a,u+f24d,u+f255-f25b,u+f25d,u+f271-f274,u+f278,u+f27b,u+f28c,u+f28e,u+f29c,u+f2b5,u+f2b7,u+f2ba,u+f2bc,u+f2be,u+f2c0-f2c1,u+f2c3,u+f2d0,u+f2d2,u+f2d4,u+f2dc}@font-face{font-family:"FontAwesome";font-display:block;src:url(fa-v4compatibility.ttf) format("truetype");unicode-range:u+f041,u+f047,u+f065-f066,u+f07d-f07e,u+f080,u+f08b,u+f08e,u+f090,u+f09a,u+f0ac,u+f0ae,u+f0b2,u+f0d0,u+f0d6,u+f0e4,u+f0ec,u+f10a-f10b,u+f123,u+f13e,u+f148-f149,u+f14c,u+f156,u+f15e,u+f160-f161,u+f163,u+f175-f178,u+f195,u+f1f8,u+f219,u+f27a}
diff --git a/html/font-awesome/css/v4-shims.min.css b/html/font-awesome/css/v4-shims.min.css
index 9316727d18d..2f6252b52a1 100644
--- a/html/font-awesome/css/v4-shims.min.css
+++ b/html/font-awesome/css/v4-shims.min.css
@@ -1,1694 +1,6 @@
/*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.1.2 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
*/
-.fa.fa-glass:before {
- content: "\f000";
-}
-.fa.fa-meetup {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-star-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-star-o:before {
- content: "\f005";
-}
-.fa.fa-close:before,
-.fa.fa-remove:before {
- content: "\f00d";
-}
-.fa.fa-gear:before {
- content: "\f013";
-}
-.fa.fa-trash-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-trash-o:before {
- content: "\f2ed";
-}
-.fa.fa-file-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-o:before {
- content: "\f15b";
-}
-.fa.fa-clock-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-clock-o:before {
- content: "\f017";
-}
-.fa.fa-arrow-circle-o-down {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-arrow-circle-o-down:before {
- content: "\f358";
-}
-.fa.fa-arrow-circle-o-up {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-arrow-circle-o-up:before {
- content: "\f35b";
-}
-.fa.fa-play-circle-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-play-circle-o:before {
- content: "\f144";
-}
-.fa.fa-repeat:before,
-.fa.fa-rotate-right:before {
- content: "\f01e";
-}
-.fa.fa-refresh:before {
- content: "\f021";
-}
-.fa.fa-list-alt {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-dedent:before {
- content: "\f03b";
-}
-.fa.fa-video-camera:before {
- content: "\f03d";
-}
-.fa.fa-picture-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-picture-o:before {
- content: "\f03e";
-}
-.fa.fa-photo {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-photo:before {
- content: "\f03e";
-}
-.fa.fa-image {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-image:before {
- content: "\f03e";
-}
-.fa.fa-pencil:before {
- content: "\f303";
-}
-.fa.fa-map-marker:before {
- content: "\f3c5";
-}
-.fa.fa-pencil-square-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-pencil-square-o:before {
- content: "\f044";
-}
-.fa.fa-share-square-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-share-square-o:before {
- content: "\f14d";
-}
-.fa.fa-check-square-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-check-square-o:before {
- content: "\f14a";
-}
-.fa.fa-arrows:before {
- content: "\f0b2";
-}
-.fa.fa-times-circle-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-times-circle-o:before {
- content: "\f057";
-}
-.fa.fa-check-circle-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-check-circle-o:before {
- content: "\f058";
-}
-.fa.fa-mail-forward:before {
- content: "\f064";
-}
-.fa.fa-eye,
-.fa.fa-eye-slash {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-warning:before {
- content: "\f071";
-}
-.fa.fa-calendar:before {
- content: "\f073";
-}
-.fa.fa-arrows-v:before {
- content: "\f338";
-}
-.fa.fa-arrows-h:before {
- content: "\f337";
-}
-.fa.fa-bar-chart {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-bar-chart:before {
- content: "\f080";
-}
-.fa.fa-bar-chart-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-bar-chart-o:before {
- content: "\f080";
-}
-.fa.fa-facebook-square,
-.fa.fa-twitter-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-gears:before {
- content: "\f085";
-}
-.fa.fa-thumbs-o-up {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-thumbs-o-up:before {
- content: "\f164";
-}
-.fa.fa-thumbs-o-down {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-thumbs-o-down:before {
- content: "\f165";
-}
-.fa.fa-heart-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-heart-o:before {
- content: "\f004";
-}
-.fa.fa-sign-out:before {
- content: "\f2f5";
-}
-.fa.fa-linkedin-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-linkedin-square:before {
- content: "\f08c";
-}
-.fa.fa-thumb-tack:before {
- content: "\f08d";
-}
-.fa.fa-external-link:before {
- content: "\f35d";
-}
-.fa.fa-sign-in:before {
- content: "\f2f6";
-}
-.fa.fa-github-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-lemon-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-lemon-o:before {
- content: "\f094";
-}
-.fa.fa-square-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-square-o:before {
- content: "\f0c8";
-}
-.fa.fa-bookmark-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-bookmark-o:before {
- content: "\f02e";
-}
-.fa.fa-facebook,
-.fa.fa-twitter {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-facebook:before {
- content: "\f39e";
-}
-.fa.fa-facebook-f {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-facebook-f:before {
- content: "\f39e";
-}
-.fa.fa-github {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-credit-card {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-feed:before {
- content: "\f09e";
-}
-.fa.fa-hdd-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hdd-o:before {
- content: "\f0a0";
-}
-.fa.fa-hand-o-right {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-o-right:before {
- content: "\f0a4";
-}
-.fa.fa-hand-o-left {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-o-left:before {
- content: "\f0a5";
-}
-.fa.fa-hand-o-up {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-o-up:before {
- content: "\f0a6";
-}
-.fa.fa-hand-o-down {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-o-down:before {
- content: "\f0a7";
-}
-.fa.fa-arrows-alt:before {
- content: "\f31e";
-}
-.fa.fa-group:before {
- content: "\f0c0";
-}
-.fa.fa-chain:before {
- content: "\f0c1";
-}
-.fa.fa-scissors:before {
- content: "\f0c4";
-}
-.fa.fa-files-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-files-o:before {
- content: "\f0c5";
-}
-.fa.fa-floppy-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-floppy-o:before {
- content: "\f0c7";
-}
-.fa.fa-navicon:before,
-.fa.fa-reorder:before {
- content: "\f0c9";
-}
-.fa.fa-google-plus,
-.fa.fa-google-plus-square,
-.fa.fa-pinterest,
-.fa.fa-pinterest-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-google-plus:before {
- content: "\f0d5";
-}
-.fa.fa-money {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-money:before {
- content: "\f3d1";
-}
-.fa.fa-unsorted:before {
- content: "\f0dc";
-}
-.fa.fa-sort-desc:before {
- content: "\f0dd";
-}
-.fa.fa-sort-asc:before {
- content: "\f0de";
-}
-.fa.fa-linkedin {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-linkedin:before {
- content: "\f0e1";
-}
-.fa.fa-rotate-left:before {
- content: "\f0e2";
-}
-.fa.fa-legal:before {
- content: "\f0e3";
-}
-.fa.fa-dashboard:before,
-.fa.fa-tachometer:before {
- content: "\f3fd";
-}
-.fa.fa-comment-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-comment-o:before {
- content: "\f075";
-}
-.fa.fa-comments-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-comments-o:before {
- content: "\f086";
-}
-.fa.fa-flash:before {
- content: "\f0e7";
-}
-.fa.fa-clipboard,
-.fa.fa-paste {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-paste:before {
- content: "\f328";
-}
-.fa.fa-lightbulb-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-lightbulb-o:before {
- content: "\f0eb";
-}
-.fa.fa-exchange:before {
- content: "\f362";
-}
-.fa.fa-cloud-download:before {
- content: "\f381";
-}
-.fa.fa-cloud-upload:before {
- content: "\f382";
-}
-.fa.fa-bell-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-bell-o:before {
- content: "\f0f3";
-}
-.fa.fa-cutlery:before {
- content: "\f2e7";
-}
-.fa.fa-file-text-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-text-o:before {
- content: "\f15c";
-}
-.fa.fa-building-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-building-o:before {
- content: "\f1ad";
-}
-.fa.fa-hospital-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hospital-o:before {
- content: "\f0f8";
-}
-.fa.fa-tablet:before {
- content: "\f3fa";
-}
-.fa.fa-mobile-phone:before,
-.fa.fa-mobile:before {
- content: "\f3cd";
-}
-.fa.fa-circle-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-circle-o:before {
- content: "\f111";
-}
-.fa.fa-mail-reply:before {
- content: "\f3e5";
-}
-.fa.fa-github-alt {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-folder-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-folder-o:before {
- content: "\f07b";
-}
-.fa.fa-folder-open-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-folder-open-o:before {
- content: "\f07c";
-}
-.fa.fa-smile-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-smile-o:before {
- content: "\f118";
-}
-.fa.fa-frown-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-frown-o:before {
- content: "\f119";
-}
-.fa.fa-meh-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-meh-o:before {
- content: "\f11a";
-}
-.fa.fa-keyboard-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-keyboard-o:before {
- content: "\f11c";
-}
-.fa.fa-flag-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-flag-o:before {
- content: "\f024";
-}
-.fa.fa-mail-reply-all:before {
- content: "\f122";
-}
-.fa.fa-star-half-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-star-half-o:before {
- content: "\f089";
-}
-.fa.fa-star-half-empty {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-star-half-empty:before {
- content: "\f089";
-}
-.fa.fa-star-half-full {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-star-half-full:before {
- content: "\f089";
-}
-.fa.fa-code-fork:before {
- content: "\f126";
-}
-.fa.fa-chain-broken:before {
- content: "\f127";
-}
-.fa.fa-shield:before {
- content: "\f3ed";
-}
-.fa.fa-calendar-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-calendar-o:before {
- content: "\f133";
-}
-.fa.fa-css3,
-.fa.fa-html5,
-.fa.fa-maxcdn {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-ticket:before {
- content: "\f3ff";
-}
-.fa.fa-minus-square-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-minus-square-o:before {
- content: "\f146";
-}
-.fa.fa-level-up:before {
- content: "\f3bf";
-}
-.fa.fa-level-down:before {
- content: "\f3be";
-}
-.fa.fa-pencil-square:before {
- content: "\f14b";
-}
-.fa.fa-external-link-square:before {
- content: "\f360";
-}
-.fa.fa-compass {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-caret-square-o-down {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-caret-square-o-down:before {
- content: "\f150";
-}
-.fa.fa-toggle-down {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-toggle-down:before {
- content: "\f150";
-}
-.fa.fa-caret-square-o-up {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-caret-square-o-up:before {
- content: "\f151";
-}
-.fa.fa-toggle-up {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-toggle-up:before {
- content: "\f151";
-}
-.fa.fa-caret-square-o-right {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-caret-square-o-right:before {
- content: "\f152";
-}
-.fa.fa-toggle-right {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-toggle-right:before {
- content: "\f152";
-}
-.fa.fa-eur:before,
-.fa.fa-euro:before {
- content: "\f153";
-}
-.fa.fa-gbp:before {
- content: "\f154";
-}
-.fa.fa-dollar:before,
-.fa.fa-usd:before {
- content: "\f155";
-}
-.fa.fa-inr:before,
-.fa.fa-rupee:before {
- content: "\f156";
-}
-.fa.fa-cny:before,
-.fa.fa-jpy:before,
-.fa.fa-rmb:before,
-.fa.fa-yen:before {
- content: "\f157";
-}
-.fa.fa-rouble:before,
-.fa.fa-rub:before,
-.fa.fa-ruble:before {
- content: "\f158";
-}
-.fa.fa-krw:before,
-.fa.fa-won:before {
- content: "\f159";
-}
-.fa.fa-bitcoin,
-.fa.fa-btc {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-bitcoin:before {
- content: "\f15a";
-}
-.fa.fa-file-text:before {
- content: "\f15c";
-}
-.fa.fa-sort-alpha-asc:before {
- content: "\f15d";
-}
-.fa.fa-sort-alpha-desc:before {
- content: "\f15e";
-}
-.fa.fa-sort-amount-asc:before {
- content: "\f160";
-}
-.fa.fa-sort-amount-desc:before {
- content: "\f161";
-}
-.fa.fa-sort-numeric-asc:before {
- content: "\f162";
-}
-.fa.fa-sort-numeric-desc:before {
- content: "\f163";
-}
-.fa.fa-xing,
-.fa.fa-xing-square,
-.fa.fa-youtube,
-.fa.fa-youtube-play,
-.fa.fa-youtube-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-youtube-play:before {
- content: "\f167";
-}
-.fa.fa-adn,
-.fa.fa-bitbucket,
-.fa.fa-bitbucket-square,
-.fa.fa-dropbox,
-.fa.fa-flickr,
-.fa.fa-instagram,
-.fa.fa-stack-overflow {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-bitbucket-square:before {
- content: "\f171";
-}
-.fa.fa-tumblr,
-.fa.fa-tumblr-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-long-arrow-down:before {
- content: "\f309";
-}
-.fa.fa-long-arrow-up:before {
- content: "\f30c";
-}
-.fa.fa-long-arrow-left:before {
- content: "\f30a";
-}
-.fa.fa-long-arrow-right:before {
- content: "\f30b";
-}
-.fa.fa-android,
-.fa.fa-apple,
-.fa.fa-dribbble,
-.fa.fa-foursquare,
-.fa.fa-gittip,
-.fa.fa-gratipay,
-.fa.fa-linux,
-.fa.fa-skype,
-.fa.fa-trello,
-.fa.fa-windows {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-gittip:before {
- content: "\f184";
-}
-.fa.fa-sun-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-sun-o:before {
- content: "\f185";
-}
-.fa.fa-moon-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-moon-o:before {
- content: "\f186";
-}
-.fa.fa-pagelines,
-.fa.fa-renren,
-.fa.fa-stack-exchange,
-.fa.fa-vk,
-.fa.fa-weibo {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-arrow-circle-o-right {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-arrow-circle-o-right:before {
- content: "\f35a";
-}
-.fa.fa-arrow-circle-o-left {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-arrow-circle-o-left:before {
- content: "\f359";
-}
-.fa.fa-caret-square-o-left {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-caret-square-o-left:before {
- content: "\f191";
-}
-.fa.fa-toggle-left {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-toggle-left:before {
- content: "\f191";
-}
-.fa.fa-dot-circle-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-dot-circle-o:before {
- content: "\f192";
-}
-.fa.fa-vimeo-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-try:before,
-.fa.fa-turkish-lira:before {
- content: "\f195";
-}
-.fa.fa-plus-square-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-plus-square-o:before {
- content: "\f0fe";
-}
-.fa.fa-openid,
-.fa.fa-slack,
-.fa.fa-wordpress {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-bank:before,
-.fa.fa-institution:before {
- content: "\f19c";
-}
-.fa.fa-mortar-board:before {
- content: "\f19d";
-}
-.fa.fa-delicious,
-.fa.fa-digg,
-.fa.fa-drupal,
-.fa.fa-google,
-.fa.fa-joomla,
-.fa.fa-pied-piper-alt,
-.fa.fa-pied-piper-pp,
-.fa.fa-reddit,
-.fa.fa-reddit-square,
-.fa.fa-stumbleupon,
-.fa.fa-stumbleupon-circle,
-.fa.fa-yahoo {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-spoon:before {
- content: "\f2e5";
-}
-.fa.fa-behance,
-.fa.fa-behance-square,
-.fa.fa-steam,
-.fa.fa-steam-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-automobile:before {
- content: "\f1b9";
-}
-.fa.fa-cab:before {
- content: "\f1ba";
-}
-.fa.fa-envelope-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-envelope-o:before {
- content: "\f0e0";
-}
-.fa.fa-deviantart,
-.fa.fa-soundcloud {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-file-pdf-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-pdf-o:before {
- content: "\f1c1";
-}
-.fa.fa-file-word-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-word-o:before {
- content: "\f1c2";
-}
-.fa.fa-file-excel-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-excel-o:before {
- content: "\f1c3";
-}
-.fa.fa-file-powerpoint-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-powerpoint-o:before {
- content: "\f1c4";
-}
-.fa.fa-file-image-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-image-o:before {
- content: "\f1c5";
-}
-.fa.fa-file-photo-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-photo-o:before {
- content: "\f1c5";
-}
-.fa.fa-file-picture-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-picture-o:before {
- content: "\f1c5";
-}
-.fa.fa-file-archive-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-archive-o:before {
- content: "\f1c6";
-}
-.fa.fa-file-zip-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-zip-o:before {
- content: "\f1c6";
-}
-.fa.fa-file-audio-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-audio-o:before {
- content: "\f1c7";
-}
-.fa.fa-file-sound-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-sound-o:before {
- content: "\f1c7";
-}
-.fa.fa-file-video-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-video-o:before {
- content: "\f1c8";
-}
-.fa.fa-file-movie-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-movie-o:before {
- content: "\f1c8";
-}
-.fa.fa-file-code-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-file-code-o:before {
- content: "\f1c9";
-}
-.fa.fa-codepen,
-.fa.fa-jsfiddle,
-.fa.fa-vine {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-life-bouy,
-.fa.fa-life-ring {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-life-bouy:before {
- content: "\f1cd";
-}
-.fa.fa-life-buoy {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-life-buoy:before {
- content: "\f1cd";
-}
-.fa.fa-life-saver {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-life-saver:before {
- content: "\f1cd";
-}
-.fa.fa-support {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-support:before {
- content: "\f1cd";
-}
-.fa.fa-circle-o-notch:before {
- content: "\f1ce";
-}
-.fa.fa-ra,
-.fa.fa-rebel {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-ra:before {
- content: "\f1d0";
-}
-.fa.fa-resistance {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-resistance:before {
- content: "\f1d0";
-}
-.fa.fa-empire,
-.fa.fa-ge {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-ge:before {
- content: "\f1d1";
-}
-.fa.fa-git,
-.fa.fa-git-square,
-.fa.fa-hacker-news,
-.fa.fa-y-combinator-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-y-combinator-square:before {
- content: "\f1d4";
-}
-.fa.fa-yc-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-yc-square:before {
- content: "\f1d4";
-}
-.fa.fa-qq,
-.fa.fa-tencent-weibo,
-.fa.fa-wechat,
-.fa.fa-weixin {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-wechat:before {
- content: "\f1d7";
-}
-.fa.fa-send:before {
- content: "\f1d8";
-}
-.fa.fa-paper-plane-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-paper-plane-o:before {
- content: "\f1d8";
-}
-.fa.fa-send-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-send-o:before {
- content: "\f1d8";
-}
-.fa.fa-circle-thin {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-circle-thin:before {
- content: "\f111";
-}
-.fa.fa-header:before {
- content: "\f1dc";
-}
-.fa.fa-sliders:before {
- content: "\f1de";
-}
-.fa.fa-futbol-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-futbol-o:before {
- content: "\f1e3";
-}
-.fa.fa-soccer-ball-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-soccer-ball-o:before {
- content: "\f1e3";
-}
-.fa.fa-slideshare,
-.fa.fa-twitch,
-.fa.fa-yelp {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-newspaper-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-newspaper-o:before {
- content: "\f1ea";
-}
-.fa.fa-cc-amex,
-.fa.fa-cc-discover,
-.fa.fa-cc-mastercard,
-.fa.fa-cc-paypal,
-.fa.fa-cc-stripe,
-.fa.fa-cc-visa,
-.fa.fa-google-wallet,
-.fa.fa-paypal {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-bell-slash-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-bell-slash-o:before {
- content: "\f1f6";
-}
-.fa.fa-trash:before {
- content: "\f2ed";
-}
-.fa.fa-copyright {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-eyedropper:before {
- content: "\f1fb";
-}
-.fa.fa-area-chart:before {
- content: "\f1fe";
-}
-.fa.fa-pie-chart:before {
- content: "\f200";
-}
-.fa.fa-line-chart:before {
- content: "\f201";
-}
-.fa.fa-angellist,
-.fa.fa-ioxhost,
-.fa.fa-lastfm,
-.fa.fa-lastfm-square {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-cc {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-cc:before {
- content: "\f20a";
-}
-.fa.fa-ils:before,
-.fa.fa-shekel:before,
-.fa.fa-sheqel:before {
- content: "\f20b";
-}
-.fa.fa-meanpath {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-meanpath:before {
- content: "\f2b4";
-}
-.fa.fa-buysellads,
-.fa.fa-connectdevelop,
-.fa.fa-dashcube,
-.fa.fa-forumbee,
-.fa.fa-leanpub,
-.fa.fa-sellsy,
-.fa.fa-shirtsinbulk,
-.fa.fa-simplybuilt,
-.fa.fa-skyatlas {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-diamond {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-diamond:before {
- content: "\f3a5";
-}
-.fa.fa-intersex:before {
- content: "\f224";
-}
-.fa.fa-facebook-official {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-facebook-official:before {
- content: "\f09a";
-}
-.fa.fa-pinterest-p,
-.fa.fa-whatsapp {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-hotel:before {
- content: "\f236";
-}
-.fa.fa-medium,
-.fa.fa-viacoin,
-.fa.fa-y-combinator,
-.fa.fa-yc {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-yc:before {
- content: "\f23b";
-}
-.fa.fa-expeditedssl,
-.fa.fa-opencart,
-.fa.fa-optin-monster {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-battery-4:before,
-.fa.fa-battery:before {
- content: "\f240";
-}
-.fa.fa-battery-3:before {
- content: "\f241";
-}
-.fa.fa-battery-2:before {
- content: "\f242";
-}
-.fa.fa-battery-1:before {
- content: "\f243";
-}
-.fa.fa-battery-0:before {
- content: "\f244";
-}
-.fa.fa-object-group,
-.fa.fa-object-ungroup,
-.fa.fa-sticky-note-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-sticky-note-o:before {
- content: "\f249";
-}
-.fa.fa-cc-diners-club,
-.fa.fa-cc-jcb {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-clone,
-.fa.fa-hourglass-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hourglass-o:before {
- content: "\f254";
-}
-.fa.fa-hourglass-1:before {
- content: "\f251";
-}
-.fa.fa-hourglass-2:before {
- content: "\f252";
-}
-.fa.fa-hourglass-3:before {
- content: "\f253";
-}
-.fa.fa-hand-rock-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-rock-o:before {
- content: "\f255";
-}
-.fa.fa-hand-grab-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-grab-o:before {
- content: "\f255";
-}
-.fa.fa-hand-paper-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-paper-o:before {
- content: "\f256";
-}
-.fa.fa-hand-stop-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-stop-o:before {
- content: "\f256";
-}
-.fa.fa-hand-scissors-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-scissors-o:before {
- content: "\f257";
-}
-.fa.fa-hand-lizard-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-lizard-o:before {
- content: "\f258";
-}
-.fa.fa-hand-spock-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-spock-o:before {
- content: "\f259";
-}
-.fa.fa-hand-pointer-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-pointer-o:before {
- content: "\f25a";
-}
-.fa.fa-hand-peace-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-hand-peace-o:before {
- content: "\f25b";
-}
-.fa.fa-registered {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-chrome,
-.fa.fa-creative-commons,
-.fa.fa-firefox,
-.fa.fa-get-pocket,
-.fa.fa-gg,
-.fa.fa-gg-circle,
-.fa.fa-internet-explorer,
-.fa.fa-odnoklassniki,
-.fa.fa-odnoklassniki-square,
-.fa.fa-opera,
-.fa.fa-safari,
-.fa.fa-tripadvisor,
-.fa.fa-wikipedia-w {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-television:before {
- content: "\f26c";
-}
-.fa.fa-500px,
-.fa.fa-amazon,
-.fa.fa-contao {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-calendar-plus-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-calendar-plus-o:before {
- content: "\f271";
-}
-.fa.fa-calendar-minus-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-calendar-minus-o:before {
- content: "\f272";
-}
-.fa.fa-calendar-times-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-calendar-times-o:before {
- content: "\f273";
-}
-.fa.fa-calendar-check-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-calendar-check-o:before {
- content: "\f274";
-}
-.fa.fa-map-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-map-o:before {
- content: "\f279";
-}
-.fa.fa-commenting:before {
- content: "\f4ad";
-}
-.fa.fa-commenting-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-commenting-o:before {
- content: "\f4ad";
-}
-.fa.fa-houzz,
-.fa.fa-vimeo {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-vimeo:before {
- content: "\f27d";
-}
-.fa.fa-black-tie,
-.fa.fa-edge,
-.fa.fa-fonticons,
-.fa.fa-reddit-alien {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-credit-card-alt:before {
- content: "\f09d";
-}
-.fa.fa-codiepie,
-.fa.fa-fort-awesome,
-.fa.fa-mixcloud,
-.fa.fa-modx,
-.fa.fa-product-hunt,
-.fa.fa-scribd,
-.fa.fa-usb {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-pause-circle-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-pause-circle-o:before {
- content: "\f28b";
-}
-.fa.fa-stop-circle-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-stop-circle-o:before {
- content: "\f28d";
-}
-.fa.fa-bluetooth,
-.fa.fa-bluetooth-b,
-.fa.fa-envira,
-.fa.fa-gitlab,
-.fa.fa-wheelchair-alt,
-.fa.fa-wpbeginner,
-.fa.fa-wpforms {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-wheelchair-alt:before {
- content: "\f368";
-}
-.fa.fa-question-circle-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-question-circle-o:before {
- content: "\f059";
-}
-.fa.fa-volume-control-phone:before {
- content: "\f2a0";
-}
-.fa.fa-asl-interpreting:before {
- content: "\f2a3";
-}
-.fa.fa-deafness:before,
-.fa.fa-hard-of-hearing:before {
- content: "\f2a4";
-}
-.fa.fa-glide,
-.fa.fa-glide-g {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-signing:before {
- content: "\f2a7";
-}
-.fa.fa-first-order,
-.fa.fa-google-plus-official,
-.fa.fa-pied-piper,
-.fa.fa-snapchat,
-.fa.fa-snapchat-ghost,
-.fa.fa-snapchat-square,
-.fa.fa-themeisle,
-.fa.fa-viadeo,
-.fa.fa-viadeo-square,
-.fa.fa-yoast {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-google-plus-official:before {
- content: "\f2b3";
-}
-.fa.fa-google-plus-circle {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-google-plus-circle:before {
- content: "\f2b3";
-}
-.fa.fa-fa,
-.fa.fa-font-awesome {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-fa:before {
- content: "\f2b4";
-}
-.fa.fa-handshake-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-handshake-o:before {
- content: "\f2b5";
-}
-.fa.fa-envelope-open-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-envelope-open-o:before {
- content: "\f2b6";
-}
-.fa.fa-linode {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-address-book-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-address-book-o:before {
- content: "\f2b9";
-}
-.fa.fa-vcard:before {
- content: "\f2bb";
-}
-.fa.fa-address-card-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-address-card-o:before {
- content: "\f2bb";
-}
-.fa.fa-vcard-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-vcard-o:before {
- content: "\f2bb";
-}
-.fa.fa-user-circle-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-user-circle-o:before {
- content: "\f2bd";
-}
-.fa.fa-user-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-user-o:before {
- content: "\f007";
-}
-.fa.fa-id-badge {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-drivers-license:before {
- content: "\f2c2";
-}
-.fa.fa-id-card-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-id-card-o:before {
- content: "\f2c2";
-}
-.fa.fa-drivers-license-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-drivers-license-o:before {
- content: "\f2c2";
-}
-.fa.fa-free-code-camp,
-.fa.fa-quora,
-.fa.fa-telegram {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-thermometer-4:before,
-.fa.fa-thermometer:before {
- content: "\f2c7";
-}
-.fa.fa-thermometer-3:before {
- content: "\f2c8";
-}
-.fa.fa-thermometer-2:before {
- content: "\f2c9";
-}
-.fa.fa-thermometer-1:before {
- content: "\f2ca";
-}
-.fa.fa-thermometer-0:before {
- content: "\f2cb";
-}
-.fa.fa-bathtub:before,
-.fa.fa-s15:before {
- content: "\f2cd";
-}
-.fa.fa-window-maximize,
-.fa.fa-window-restore {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-times-rectangle:before {
- content: "\f410";
-}
-.fa.fa-window-close-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-window-close-o:before {
- content: "\f410";
-}
-.fa.fa-times-rectangle-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-times-rectangle-o:before {
- content: "\f410";
-}
-.fa.fa-bandcamp,
-.fa.fa-eercast,
-.fa.fa-etsy,
-.fa.fa-grav,
-.fa.fa-imdb,
-.fa.fa-ravelry {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
-.fa.fa-eercast:before {
- content: "\f2da";
-}
-.fa.fa-snowflake-o {
- font-family: "Font Awesome 5 Free";
- font-weight: 400;
-}
-.fa.fa-snowflake-o:before {
- content: "\f2dc";
-}
-.fa.fa-spotify,
-.fa.fa-superpowers,
-.fa.fa-wpexplorer {
- font-family: "Font Awesome 5 Brands";
- font-weight: 400;
-}
+.fa.fa-glass:before{content:"\f000"}.fa.fa-envelope-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-envelope-o:before{content:"\f0e0"}.fa.fa-star-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-star-o:before{content:"\f005"}.fa.fa-close:before,.fa.fa-remove:before{content:"\f00d"}.fa.fa-gear:before{content:"\f013"}.fa.fa-trash-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-trash-o:before{content:"\f2ed"}.fa.fa-home:before{content:"\f015"}.fa.fa-file-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-o:before{content:"\f15b"}.fa.fa-clock-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-clock-o:before{content:"\f017"}.fa.fa-arrow-circle-o-down{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-arrow-circle-o-down:before{content:"\f358"}.fa.fa-arrow-circle-o-up{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-arrow-circle-o-up:before{content:"\f35b"}.fa.fa-play-circle-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-play-circle-o:before{content:"\f144"}.fa.fa-repeat:before,.fa.fa-rotate-right:before{content:"\f01e"}.fa.fa-refresh:before{content:"\f021"}.fa.fa-list-alt{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-list-alt:before{content:"\f022"}.fa.fa-dedent:before{content:"\f03b"}.fa.fa-video-camera:before{content:"\f03d"}.fa.fa-picture-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-picture-o:before{content:"\f03e"}.fa.fa-photo{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-photo:before{content:"\f03e"}.fa.fa-image{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-image:before{content:"\f03e"}.fa.fa-map-marker:before{content:"\f3c5"}.fa.fa-pencil-square-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-pencil-square-o:before{content:"\f044"}.fa.fa-edit{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-edit:before{content:"\f044"}.fa.fa-share-square-o:before{content:"\f14d"}.fa.fa-check-square-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-check-square-o:before{content:"\f14a"}.fa.fa-arrows:before{content:"\f0b2"}.fa.fa-times-circle-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-times-circle-o:before{content:"\f057"}.fa.fa-check-circle-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-check-circle-o:before{content:"\f058"}.fa.fa-mail-forward:before{content:"\f064"}.fa.fa-expand:before{content:"\f424"}.fa.fa-compress:before{content:"\f422"}.fa.fa-eye,.fa.fa-eye-slash{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-warning:before{content:"\f071"}.fa.fa-calendar:before{content:"\f073"}.fa.fa-arrows-v:before{content:"\f338"}.fa.fa-arrows-h:before{content:"\f337"}.fa.fa-bar-chart-o:before,.fa.fa-bar-chart:before{content:"\e0e3"}.fa.fa-twitter-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-twitter-square:before{content:"\f081"}.fa.fa-facebook-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-facebook-square:before{content:"\f082"}.fa.fa-gears:before{content:"\f085"}.fa.fa-thumbs-o-up{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-thumbs-o-up:before{content:"\f164"}.fa.fa-thumbs-o-down{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-thumbs-o-down:before{content:"\f165"}.fa.fa-heart-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-heart-o:before{content:"\f004"}.fa.fa-sign-out:before{content:"\f2f5"}.fa.fa-linkedin-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-linkedin-square:before{content:"\f08c"}.fa.fa-thumb-tack:before{content:"\f08d"}.fa.fa-external-link:before{content:"\f35d"}.fa.fa-sign-in:before{content:"\f2f6"}.fa.fa-github-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-github-square:before{content:"\f092"}.fa.fa-lemon-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-lemon-o:before{content:"\f094"}.fa.fa-square-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-square-o:before{content:"\f0c8"}.fa.fa-bookmark-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-bookmark-o:before{content:"\f02e"}.fa.fa-facebook,.fa.fa-twitter{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-facebook:before{content:"\f39e"}.fa.fa-facebook-f{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-facebook-f:before{content:"\f39e"}.fa.fa-github{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-credit-card{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-feed:before{content:"\f09e"}.fa.fa-hdd-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hdd-o:before{content:"\f0a0"}.fa.fa-hand-o-right{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-o-right:before{content:"\f0a4"}.fa.fa-hand-o-left{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-o-left:before{content:"\f0a5"}.fa.fa-hand-o-up{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-o-up:before{content:"\f0a6"}.fa.fa-hand-o-down{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-o-down:before{content:"\f0a7"}.fa.fa-globe:before{content:"\f57d"}.fa.fa-tasks:before{content:"\f828"}.fa.fa-arrows-alt:before{content:"\f31e"}.fa.fa-group:before{content:"\f0c0"}.fa.fa-chain:before{content:"\f0c1"}.fa.fa-cut:before{content:"\f0c4"}.fa.fa-files-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-files-o:before{content:"\f0c5"}.fa.fa-floppy-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-floppy-o:before{content:"\f0c7"}.fa.fa-save{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-save:before{content:"\f0c7"}.fa.fa-navicon:before,.fa.fa-reorder:before{content:"\f0c9"}.fa.fa-magic:before{content:"\e2ca"}.fa.fa-pinterest,.fa.fa-pinterest-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-pinterest-square:before{content:"\f0d3"}.fa.fa-google-plus-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-google-plus-square:before{content:"\f0d4"}.fa.fa-google-plus{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-google-plus:before{content:"\f0d5"}.fa.fa-money:before{content:"\f3d1"}.fa.fa-unsorted:before{content:"\f0dc"}.fa.fa-sort-desc:before{content:"\f0dd"}.fa.fa-sort-asc:before{content:"\f0de"}.fa.fa-linkedin{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-linkedin:before{content:"\f0e1"}.fa.fa-rotate-left:before{content:"\f0e2"}.fa.fa-legal:before{content:"\f0e3"}.fa.fa-dashboard:before,.fa.fa-tachometer:before{content:"\f625"}.fa.fa-comment-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-comment-o:before{content:"\f075"}.fa.fa-comments-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-comments-o:before{content:"\f086"}.fa.fa-flash:before{content:"\f0e7"}.fa.fa-clipboard:before{content:"\f0ea"}.fa.fa-lightbulb-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-lightbulb-o:before{content:"\f0eb"}.fa.fa-exchange:before{content:"\f362"}.fa.fa-cloud-download:before{content:"\f0ed"}.fa.fa-cloud-upload:before{content:"\f0ee"}.fa.fa-bell-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-bell-o:before{content:"\f0f3"}.fa.fa-cutlery:before{content:"\f2e7"}.fa.fa-file-text-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-text-o:before{content:"\f15c"}.fa.fa-building-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-building-o:before{content:"\f1ad"}.fa.fa-hospital-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hospital-o:before{content:"\f0f8"}.fa.fa-tablet:before{content:"\f3fa"}.fa.fa-mobile-phone:before,.fa.fa-mobile:before{content:"\f3cd"}.fa.fa-circle-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-circle-o:before{content:"\f111"}.fa.fa-mail-reply:before{content:"\f3e5"}.fa.fa-github-alt{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-folder-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-folder-o:before{content:"\f07b"}.fa.fa-folder-open-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-folder-open-o:before{content:"\f07c"}.fa.fa-smile-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-smile-o:before{content:"\f118"}.fa.fa-frown-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-frown-o:before{content:"\f119"}.fa.fa-meh-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-meh-o:before{content:"\f11a"}.fa.fa-keyboard-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-keyboard-o:before{content:"\f11c"}.fa.fa-flag-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-flag-o:before{content:"\f024"}.fa.fa-mail-reply-all:before{content:"\f122"}.fa.fa-star-half-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-star-half-o:before{content:"\f5c0"}.fa.fa-star-half-empty{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-star-half-empty:before{content:"\f5c0"}.fa.fa-star-half-full{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-star-half-full:before{content:"\f5c0"}.fa.fa-code-fork:before{content:"\f126"}.fa.fa-chain-broken:before,.fa.fa-unlink:before{content:"\f127"}.fa.fa-calendar-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-calendar-o:before{content:"\f133"}.fa.fa-css3,.fa.fa-html5,.fa.fa-maxcdn{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-unlock-alt:before{content:"\f09c"}.fa.fa-minus-square-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-minus-square-o:before{content:"\f146"}.fa.fa-level-up:before{content:"\f3bf"}.fa.fa-level-down:before{content:"\f3be"}.fa.fa-pencil-square:before{content:"\f14b"}.fa.fa-external-link-square:before{content:"\f360"}.fa.fa-compass{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-caret-square-o-down{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-caret-square-o-down:before{content:"\f150"}.fa.fa-toggle-down{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-toggle-down:before{content:"\f150"}.fa.fa-caret-square-o-up{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-caret-square-o-up:before{content:"\f151"}.fa.fa-toggle-up{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-toggle-up:before{content:"\f151"}.fa.fa-caret-square-o-right{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-caret-square-o-right:before{content:"\f152"}.fa.fa-toggle-right{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-toggle-right:before{content:"\f152"}.fa.fa-eur:before,.fa.fa-euro:before{content:"\f153"}.fa.fa-gbp:before{content:"\f154"}.fa.fa-dollar:before,.fa.fa-usd:before{content:"\24"}.fa.fa-inr:before,.fa.fa-rupee:before{content:"\e1bc"}.fa.fa-cny:before,.fa.fa-jpy:before,.fa.fa-rmb:before,.fa.fa-yen:before{content:"\f157"}.fa.fa-rouble:before,.fa.fa-rub:before,.fa.fa-ruble:before{content:"\f158"}.fa.fa-krw:before,.fa.fa-won:before{content:"\f159"}.fa.fa-bitcoin,.fa.fa-btc{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-bitcoin:before{content:"\f15a"}.fa.fa-file-text:before{content:"\f15c"}.fa.fa-sort-alpha-asc:before{content:"\f15d"}.fa.fa-sort-alpha-desc:before{content:"\f881"}.fa.fa-sort-amount-asc:before{content:"\f884"}.fa.fa-sort-amount-desc:before{content:"\f160"}.fa.fa-sort-numeric-asc:before{content:"\f162"}.fa.fa-sort-numeric-desc:before{content:"\f886"}.fa.fa-youtube-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-youtube-square:before{content:"\f431"}.fa.fa-xing,.fa.fa-xing-square,.fa.fa-youtube{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-xing-square:before{content:"\f169"}.fa.fa-youtube-play{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-youtube-play:before{content:"\f167"}.fa.fa-adn,.fa.fa-bitbucket,.fa.fa-bitbucket-square,.fa.fa-dropbox,.fa.fa-flickr,.fa.fa-instagram,.fa.fa-stack-overflow{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-bitbucket-square:before{content:"\f171"}.fa.fa-tumblr,.fa.fa-tumblr-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-tumblr-square:before{content:"\f174"}.fa.fa-long-arrow-down:before{content:"\f309"}.fa.fa-long-arrow-up:before{content:"\f30c"}.fa.fa-long-arrow-left:before{content:"\f30a"}.fa.fa-long-arrow-right:before{content:"\f30b"}.fa.fa-android,.fa.fa-apple,.fa.fa-dribbble,.fa.fa-foursquare,.fa.fa-gittip,.fa.fa-gratipay,.fa.fa-linux,.fa.fa-skype,.fa.fa-trello,.fa.fa-windows{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-gittip:before{content:"\f184"}.fa.fa-sun-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-sun-o:before{content:"\f185"}.fa.fa-moon-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-moon-o:before{content:"\f186"}.fa.fa-pagelines,.fa.fa-renren,.fa.fa-stack-exchange,.fa.fa-vk,.fa.fa-weibo{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-arrow-circle-o-right{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-arrow-circle-o-right:before{content:"\f35a"}.fa.fa-arrow-circle-o-left{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-arrow-circle-o-left:before{content:"\f359"}.fa.fa-caret-square-o-left{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-caret-square-o-left:before{content:"\f191"}.fa.fa-toggle-left{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-toggle-left:before{content:"\f191"}.fa.fa-dot-circle-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-dot-circle-o:before{content:"\f192"}.fa.fa-vimeo-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-vimeo-square:before{content:"\f194"}.fa.fa-try:before,.fa.fa-turkish-lira:before{content:"\e2bb"}.fa.fa-plus-square-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-plus-square-o:before{content:"\f0fe"}.fa.fa-openid,.fa.fa-slack,.fa.fa-wordpress{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-bank:before,.fa.fa-institution:before{content:"\f19c"}.fa.fa-mortar-board:before{content:"\f19d"}.fa.fa-google,.fa.fa-reddit,.fa.fa-reddit-square,.fa.fa-yahoo{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-reddit-square:before{content:"\f1a2"}.fa.fa-behance,.fa.fa-behance-square,.fa.fa-delicious,.fa.fa-digg,.fa.fa-drupal,.fa.fa-joomla,.fa.fa-pied-piper-alt,.fa.fa-pied-piper-pp,.fa.fa-stumbleupon,.fa.fa-stumbleupon-circle{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-behance-square:before{content:"\f1b5"}.fa.fa-steam,.fa.fa-steam-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-steam-square:before{content:"\f1b7"}.fa.fa-automobile:before{content:"\f1b9"}.fa.fa-cab:before{content:"\f1ba"}.fa.fa-deviantart,.fa.fa-soundcloud,.fa.fa-spotify{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-file-pdf-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-pdf-o:before{content:"\f1c1"}.fa.fa-file-word-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-word-o:before{content:"\f1c2"}.fa.fa-file-excel-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-excel-o:before{content:"\f1c3"}.fa.fa-file-powerpoint-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-powerpoint-o:before{content:"\f1c4"}.fa.fa-file-image-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-image-o:before{content:"\f1c5"}.fa.fa-file-photo-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-photo-o:before{content:"\f1c5"}.fa.fa-file-picture-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-picture-o:before{content:"\f1c5"}.fa.fa-file-archive-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-archive-o:before{content:"\f1c6"}.fa.fa-file-zip-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-zip-o:before{content:"\f1c6"}.fa.fa-file-audio-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-audio-o:before{content:"\f1c7"}.fa.fa-file-sound-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-sound-o:before{content:"\f1c7"}.fa.fa-file-video-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-video-o:before{content:"\f1c8"}.fa.fa-file-movie-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-movie-o:before{content:"\f1c8"}.fa.fa-file-code-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-file-code-o:before{content:"\f1c9"}.fa.fa-codepen,.fa.fa-jsfiddle,.fa.fa-vine{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-life-bouy:before,.fa.fa-life-buoy:before,.fa.fa-life-saver:before,.fa.fa-support:before{content:"\f1cd"}.fa.fa-circle-o-notch:before{content:"\f1ce"}.fa.fa-ra,.fa.fa-rebel{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-ra:before{content:"\f1d0"}.fa.fa-resistance{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-resistance:before{content:"\f1d0"}.fa.fa-empire,.fa.fa-ge{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-ge:before{content:"\f1d1"}.fa.fa-git-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-git-square:before{content:"\f1d2"}.fa.fa-git,.fa.fa-hacker-news,.fa.fa-y-combinator-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-y-combinator-square:before{content:"\f1d4"}.fa.fa-yc-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-yc-square:before{content:"\f1d4"}.fa.fa-qq,.fa.fa-tencent-weibo,.fa.fa-wechat,.fa.fa-weixin{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-wechat:before{content:"\f1d7"}.fa.fa-send:before{content:"\f1d8"}.fa.fa-paper-plane-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-paper-plane-o:before{content:"\f1d8"}.fa.fa-send-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-send-o:before{content:"\f1d8"}.fa.fa-circle-thin{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-circle-thin:before{content:"\f111"}.fa.fa-header:before{content:"\f1dc"}.fa.fa-futbol-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-futbol-o:before{content:"\f1e3"}.fa.fa-soccer-ball-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-soccer-ball-o:before{content:"\f1e3"}.fa.fa-slideshare,.fa.fa-twitch,.fa.fa-yelp{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-newspaper-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-newspaper-o:before{content:"\f1ea"}.fa.fa-cc-amex,.fa.fa-cc-discover,.fa.fa-cc-mastercard,.fa.fa-cc-paypal,.fa.fa-cc-stripe,.fa.fa-cc-visa,.fa.fa-google-wallet,.fa.fa-paypal{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-bell-slash-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-bell-slash-o:before{content:"\f1f6"}.fa.fa-trash:before{content:"\f2ed"}.fa.fa-copyright{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-eyedropper:before{content:"\f1fb"}.fa.fa-area-chart:before{content:"\f1fe"}.fa.fa-pie-chart:before{content:"\f200"}.fa.fa-line-chart:before{content:"\f201"}.fa.fa-lastfm,.fa.fa-lastfm-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-lastfm-square:before{content:"\f203"}.fa.fa-angellist,.fa.fa-ioxhost{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-cc{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-cc:before{content:"\f20a"}.fa.fa-ils:before,.fa.fa-shekel:before,.fa.fa-sheqel:before{content:"\f20b"}.fa.fa-buysellads,.fa.fa-connectdevelop,.fa.fa-dashcube,.fa.fa-forumbee,.fa.fa-leanpub,.fa.fa-sellsy,.fa.fa-shirtsinbulk,.fa.fa-simplybuilt,.fa.fa-skyatlas{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-diamond{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-diamond:before{content:"\f3a5"}.fa.fa-intersex:before,.fa.fa-transgender:before{content:"\f224"}.fa.fa-transgender-alt:before{content:"\f225"}.fa.fa-facebook-official{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-facebook-official:before{content:"\f09a"}.fa.fa-pinterest-p,.fa.fa-whatsapp{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-hotel:before{content:"\f236"}.fa.fa-medium,.fa.fa-viacoin,.fa.fa-y-combinator,.fa.fa-yc{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-yc:before{content:"\f23b"}.fa.fa-expeditedssl,.fa.fa-opencart,.fa.fa-optin-monster{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-battery-4:before,.fa.fa-battery:before{content:"\f240"}.fa.fa-battery-3:before{content:"\f241"}.fa.fa-battery-2:before{content:"\f242"}.fa.fa-battery-1:before{content:"\f243"}.fa.fa-battery-0:before{content:"\f244"}.fa.fa-object-group,.fa.fa-object-ungroup,.fa.fa-sticky-note-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-sticky-note-o:before{content:"\f249"}.fa.fa-cc-diners-club,.fa.fa-cc-jcb{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-clone{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hourglass-o:before{content:"\f254"}.fa.fa-hourglass-1:before{content:"\f251"}.fa.fa-hourglass-2:before{content:"\f252"}.fa.fa-hourglass-3:before{content:"\f253"}.fa.fa-hand-rock-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-rock-o:before{content:"\f255"}.fa.fa-hand-grab-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-grab-o:before{content:"\f255"}.fa.fa-hand-paper-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-paper-o:before{content:"\f256"}.fa.fa-hand-stop-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-stop-o:before{content:"\f256"}.fa.fa-hand-scissors-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-scissors-o:before{content:"\f257"}.fa.fa-hand-lizard-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-lizard-o:before{content:"\f258"}.fa.fa-hand-spock-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-spock-o:before{content:"\f259"}.fa.fa-hand-pointer-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-pointer-o:before{content:"\f25a"}.fa.fa-hand-peace-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-hand-peace-o:before{content:"\f25b"}.fa.fa-registered{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-creative-commons,.fa.fa-gg,.fa.fa-gg-circle,.fa.fa-odnoklassniki,.fa.fa-odnoklassniki-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-odnoklassniki-square:before{content:"\f264"}.fa.fa-chrome,.fa.fa-firefox,.fa.fa-get-pocket,.fa.fa-internet-explorer,.fa.fa-opera,.fa.fa-safari,.fa.fa-wikipedia-w{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-television:before{content:"\f26c"}.fa.fa-500px,.fa.fa-amazon,.fa.fa-contao{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-calendar-plus-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-calendar-plus-o:before{content:"\f271"}.fa.fa-calendar-minus-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-calendar-minus-o:before{content:"\f272"}.fa.fa-calendar-times-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-calendar-times-o:before{content:"\f273"}.fa.fa-calendar-check-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-calendar-check-o:before{content:"\f274"}.fa.fa-map-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-map-o:before{content:"\f279"}.fa.fa-commenting:before{content:"\f4ad"}.fa.fa-commenting-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-commenting-o:before{content:"\f4ad"}.fa.fa-houzz,.fa.fa-vimeo{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-vimeo:before{content:"\f27d"}.fa.fa-black-tie,.fa.fa-edge,.fa.fa-fonticons,.fa.fa-reddit-alien{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-credit-card-alt:before{content:"\f09d"}.fa.fa-codiepie,.fa.fa-fort-awesome,.fa.fa-mixcloud,.fa.fa-modx,.fa.fa-product-hunt,.fa.fa-scribd,.fa.fa-usb{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-pause-circle-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-pause-circle-o:before{content:"\f28b"}.fa.fa-stop-circle-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-stop-circle-o:before{content:"\f28d"}.fa.fa-bluetooth,.fa.fa-bluetooth-b,.fa.fa-envira,.fa.fa-gitlab,.fa.fa-wheelchair-alt,.fa.fa-wpbeginner,.fa.fa-wpforms{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-wheelchair-alt:before{content:"\f368"}.fa.fa-question-circle-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-question-circle-o:before{content:"\f059"}.fa.fa-volume-control-phone:before{content:"\f2a0"}.fa.fa-asl-interpreting:before{content:"\f2a3"}.fa.fa-deafness:before,.fa.fa-hard-of-hearing:before{content:"\f2a4"}.fa.fa-glide,.fa.fa-glide-g{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-signing:before{content:"\f2a7"}.fa.fa-viadeo,.fa.fa-viadeo-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-viadeo-square:before{content:"\f2aa"}.fa.fa-snapchat,.fa.fa-snapchat-ghost{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-snapchat-ghost:before{content:"\f2ab"}.fa.fa-snapchat-square{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-snapchat-square:before{content:"\f2ad"}.fa.fa-first-order,.fa.fa-google-plus-official,.fa.fa-pied-piper,.fa.fa-themeisle,.fa.fa-yoast{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-google-plus-official:before{content:"\f2b3"}.fa.fa-google-plus-circle{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-google-plus-circle:before{content:"\f2b3"}.fa.fa-fa,.fa.fa-font-awesome{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-fa:before{content:"\f2b4"}.fa.fa-handshake-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-handshake-o:before{content:"\f2b5"}.fa.fa-envelope-open-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-envelope-open-o:before{content:"\f2b6"}.fa.fa-linode{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-address-book-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-address-book-o:before{content:"\f2b9"}.fa.fa-vcard:before{content:"\f2bb"}.fa.fa-address-card-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-address-card-o:before{content:"\f2bb"}.fa.fa-vcard-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-vcard-o:before{content:"\f2bb"}.fa.fa-user-circle-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-user-circle-o:before{content:"\f2bd"}.fa.fa-user-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-user-o:before{content:"\f007"}.fa.fa-id-badge{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-drivers-license:before{content:"\f2c2"}.fa.fa-id-card-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-id-card-o:before{content:"\f2c2"}.fa.fa-drivers-license-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-drivers-license-o:before{content:"\f2c2"}.fa.fa-free-code-camp,.fa.fa-quora,.fa.fa-telegram{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-thermometer-4:before,.fa.fa-thermometer:before{content:"\f2c7"}.fa.fa-thermometer-3:before{content:"\f2c8"}.fa.fa-thermometer-2:before{content:"\f2c9"}.fa.fa-thermometer-1:before{content:"\f2ca"}.fa.fa-thermometer-0:before{content:"\f2cb"}.fa.fa-bathtub:before,.fa.fa-s15:before{content:"\f2cd"}.fa.fa-window-maximize,.fa.fa-window-restore{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-times-rectangle:before{content:"\f410"}.fa.fa-window-close-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-window-close-o:before{content:"\f410"}.fa.fa-times-rectangle-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-times-rectangle-o:before{content:"\f410"}.fa.fa-bandcamp,.fa.fa-eercast,.fa.fa-etsy,.fa.fa-grav,.fa.fa-imdb,.fa.fa-ravelry{font-family:"Font Awesome 6 Brands";font-weight:400}.fa.fa-eercast:before{content:"\f2da"}.fa.fa-snowflake-o{font-family:"Font Awesome 6 Free";font-weight:400}.fa.fa-snowflake-o:before{content:"\f2dc"}.fa.fa-meetup,.fa.fa-superpowers,.fa.fa-wpexplorer{font-family:"Font Awesome 6 Brands";font-weight:400}
\ No newline at end of file
diff --git a/html/font-awesome/webfonts/fa-regular-400.eot b/html/font-awesome/webfonts/fa-regular-400.eot
deleted file mode 100644
index d62be2fad88..00000000000
Binary files a/html/font-awesome/webfonts/fa-regular-400.eot and /dev/null differ
diff --git a/html/font-awesome/webfonts/fa-regular-400.ttf b/html/font-awesome/webfonts/fa-regular-400.ttf
new file mode 100644
index 00000000000..c5ac0095777
Binary files /dev/null and b/html/font-awesome/webfonts/fa-regular-400.ttf differ
diff --git a/html/font-awesome/webfonts/fa-regular-400.woff b/html/font-awesome/webfonts/fa-regular-400.woff
deleted file mode 100644
index 43b1a9ae49d..00000000000
Binary files a/html/font-awesome/webfonts/fa-regular-400.woff and /dev/null differ
diff --git a/html/font-awesome/webfonts/fa-solid-900.eot b/html/font-awesome/webfonts/fa-solid-900.eot
deleted file mode 100644
index c77baa8d46a..00000000000
Binary files a/html/font-awesome/webfonts/fa-solid-900.eot and /dev/null differ
diff --git a/html/font-awesome/webfonts/fa-solid-900.ttf b/html/font-awesome/webfonts/fa-solid-900.ttf
new file mode 100644
index 00000000000..43ba1cc7d94
Binary files /dev/null and b/html/font-awesome/webfonts/fa-solid-900.ttf differ
diff --git a/html/font-awesome/webfonts/fa-solid-900.woff b/html/font-awesome/webfonts/fa-solid-900.woff
deleted file mode 100644
index 77c1786227f..00000000000
Binary files a/html/font-awesome/webfonts/fa-solid-900.woff and /dev/null differ
diff --git a/html/font-awesome/webfonts/fa-v4compatibility.ttf b/html/font-awesome/webfonts/fa-v4compatibility.ttf
new file mode 100644
index 00000000000..243bc25bd5e
Binary files /dev/null and b/html/font-awesome/webfonts/fa-v4compatibility.ttf differ
diff --git a/icons/effects/anomalies.dmi b/icons/effects/anomalies.dmi
index e1671b816ec..c716fc79909 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 f7e2e158d42..ed74435fb0a 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 d6d8f1c8020..00000000000
Binary files a/icons/effects/blood_vox.dmi and /dev/null differ
diff --git a/icons/effects/cutting_effect.dmi b/icons/effects/cutting_effect.dmi
new file mode 100644
index 00000000000..e8b4abeec5d
Binary files /dev/null and b/icons/effects/cutting_effect.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 8cb87f5fde8..e2f275a547c 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/icons.dmi b/icons/effects/icons.dmi
new file mode 100644
index 00000000000..0d62217efbf
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 05301f14a83..00000000000
Binary files a/icons/effects/landmarks_static.dmi and /dev/null differ
diff --git a/icons/effects/magic.dmi b/icons/effects/magic.dmi
new file mode 100644
index 00000000000..480332df134
Binary files /dev/null and b/icons/effects/magic.dmi differ
diff --git a/icons/effects/mapping/docking_ports.dmi b/icons/effects/mapping/docking_ports.dmi
new file mode 100644
index 00000000000..96909d7bd0f
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 00000000000..3e51e3f9a6e
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 00000000000..430ac86c6db
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 00000000000..d6e06fb140d
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 50e88be487b..00000000000
Binary files a/icons/effects/mapping_helpers.dmi and /dev/null differ
diff --git a/icons/effects/particles/bonfire.dmi b/icons/effects/particles/bonfire.dmi
new file mode 100644
index 00000000000..e8e2e36346d
Binary files /dev/null and b/icons/effects/particles/bonfire.dmi differ
diff --git a/icons/effects/particles/echo.dmi b/icons/effects/particles/echo.dmi
new file mode 100644
index 00000000000..60a243a8a7b
Binary files /dev/null and b/icons/effects/particles/echo.dmi differ
diff --git a/icons/effects/particles/generic.dmi b/icons/effects/particles/generic.dmi
new file mode 100644
index 00000000000..dfbb1a47a6e
Binary files /dev/null and b/icons/effects/particles/generic.dmi differ
diff --git a/icons/effects/particles/goop.dmi b/icons/effects/particles/goop.dmi
new file mode 100644
index 00000000000..673c1a7ad5b
Binary files /dev/null and b/icons/effects/particles/goop.dmi differ
diff --git a/icons/effects/particles/pollen.dmi b/icons/effects/particles/pollen.dmi
new file mode 100644
index 00000000000..559c4d1846f
Binary files /dev/null and b/icons/effects/particles/pollen.dmi differ
diff --git a/icons/effects/particles/smoke.dmi b/icons/effects/particles/smoke.dmi
new file mode 100644
index 00000000000..99123beeb59
Binary files /dev/null and b/icons/effects/particles/smoke.dmi differ
diff --git a/icons/effects/concrete_damage.dmi b/icons/effects/wall_damage.dmi
similarity index 100%
rename from icons/effects/concrete_damage.dmi
rename to icons/effects/wall_damage.dmi
diff --git a/icons/effects/weather_effects.dmi b/icons/effects/weather_effects.dmi
index a8a7185af50..f76e34ec71e 100644
Binary files a/icons/effects/weather_effects.dmi and b/icons/effects/weather_effects.dmi differ
diff --git a/icons/hud/radial.dmi b/icons/hud/radial.dmi
new file mode 100644
index 00000000000..9786d403e0d
Binary files /dev/null and b/icons/hud/radial.dmi differ
diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi
index 60ada01078d..6e12eadc662 100644
Binary files a/icons/hud/screen_alert.dmi and b/icons/hud/screen_alert.dmi differ
diff --git a/icons/mecha/inteq_gygax.dmi b/icons/mecha/inteq_gygax.dmi
new file mode 100644
index 00000000000..08105d783ab
Binary files /dev/null and b/icons/mecha/inteq_gygax.dmi differ
diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi
index 6e87ac44d77..0e6761ea868 100644
Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ
diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi
index 5e08a834a89..76549c15a3e 100644
Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ
diff --git a/icons/misc/buildmode.dmi b/icons/misc/buildmode.dmi
index db1e5fdba40..44698597b02 100644
Binary files a/icons/misc/buildmode.dmi and b/icons/misc/buildmode.dmi differ
diff --git a/icons/misc/overmap.dmi b/icons/misc/overmap.dmi
index f0c9f6e4467..94ac33e2958 100644
Binary files a/icons/misc/overmap.dmi and b/icons/misc/overmap.dmi differ
diff --git a/icons/mob/actions/actions_flightsuit.dmi b/icons/mob/actions/actions_flightsuit.dmi
deleted file mode 100644
index 3121c243555..00000000000
Binary files a/icons/mob/actions/actions_flightsuit.dmi and /dev/null differ
diff --git a/icons/mob/actions/actions_mod.dmi b/icons/mob/actions/actions_mod.dmi
new file mode 100644
index 00000000000..7f030ad53d4
Binary files /dev/null and b/icons/mob/actions/actions_mod.dmi differ
diff --git a/icons/mob/blob.dmi b/icons/mob/blob.dmi
deleted file mode 100644
index a197581533c..00000000000
Binary files a/icons/mob/blob.dmi and /dev/null differ
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index 7e87f94fd18..2cf6dbff241 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 5508bc67523..53910743285 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/back/backpacks.dmi b/icons/mob/clothing/back/backpacks.dmi
new file mode 100644
index 00000000000..7138b440a4a
Binary files /dev/null and b/icons/mob/clothing/back/backpacks.dmi differ
diff --git a/icons/mob/clothing/back/backpacks_kepori.dmi b/icons/mob/clothing/back/backpacks_kepori.dmi
new file mode 100644
index 00000000000..557ee29267f
Binary files /dev/null and b/icons/mob/clothing/back/backpacks_kepori.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index 7568a1274d6..94728158d0c 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/ears.dmi b/icons/mob/clothing/ears.dmi
index e7376425f54..f973447b6f4 100644
Binary files a/icons/mob/clothing/ears.dmi and b/icons/mob/clothing/ears.dmi differ
diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi
deleted file mode 100644
index 12ebf87128c..00000000000
Binary files a/icons/mob/clothing/eyes.dmi and /dev/null differ
diff --git a/icons/mob/clothing/eyes/eyes.dmi b/icons/mob/clothing/eyes/eyes.dmi
new file mode 100644
index 00000000000..5c83d2dcfbc
Binary files /dev/null and b/icons/mob/clothing/eyes/eyes.dmi differ
diff --git a/icons/mob/clothing/faction/hardliners/head.dmi b/icons/mob/clothing/faction/hardliners/head.dmi
index 839826a7c42..c9c1d5a73f0 100644
Binary files a/icons/mob/clothing/faction/hardliners/head.dmi and b/icons/mob/clothing/faction/hardliners/head.dmi differ
diff --git a/icons/mob/clothing/faction/hardliners/suits.dmi b/icons/mob/clothing/faction/hardliners/suits.dmi
index 05f41eb00d2..669cb153450 100644
Binary files a/icons/mob/clothing/faction/hardliners/suits.dmi and b/icons/mob/clothing/faction/hardliners/suits.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 00000000000..47824c7a69f
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 00000000000..cf3a4392972
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 00000000000..c5793cc6107
Binary files /dev/null and b/icons/mob/clothing/faction/nanotrasen/vox.dmi differ
diff --git a/icons/mob/clothing/faction/ngr/head.dmi b/icons/mob/clothing/faction/ngr/head.dmi
index c370f07aa0f..eb0a316211e 100644
Binary files a/icons/mob/clothing/faction/ngr/head.dmi and b/icons/mob/clothing/faction/ngr/head.dmi differ
diff --git a/icons/mob/clothing/faction/ngr/mask.dmi b/icons/mob/clothing/faction/ngr/mask.dmi
index 0baead0a39b..298cf3ed830 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/faction/ngr/suits.dmi b/icons/mob/clothing/faction/ngr/suits.dmi
index ac4fceb11ca..05561408e36 100644
Binary files a/icons/mob/clothing/faction/ngr/suits.dmi and b/icons/mob/clothing/faction/ngr/suits.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index 3246bbb24de..ec9850144f7 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index 0afcd0ad26c..f191314a13b 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 b4be2ee9b05..7076b15376f 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/head/armor.dmi b/icons/mob/clothing/head/armor.dmi
index 38adc74f331..a4b4491521e 100644
Binary files a/icons/mob/clothing/head/armor.dmi and b/icons/mob/clothing/head/armor.dmi differ
diff --git a/icons/mob/clothing/head/winterhood.dmi b/icons/mob/clothing/head/winterhood.dmi
index 32189664139..cc3fd8a4e5d 100644
Binary files a/icons/mob/clothing/head/winterhood.dmi and b/icons/mob/clothing/head/winterhood.dmi differ
diff --git a/icons/mob/clothing/helmet_overlays.dmi b/icons/mob/clothing/helmet_overlays.dmi
index 1c41c357a42..a6860542bd5 100644
Binary files a/icons/mob/clothing/helmet_overlays.dmi and b/icons/mob/clothing/helmet_overlays.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index bfcc9970930..cebe3a9f847 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/modsuit/mod_clothing.dmi b/icons/mob/clothing/modsuit/mod_clothing.dmi
new file mode 100644
index 00000000000..27d4df3b902
Binary files /dev/null and b/icons/mob/clothing/modsuit/mod_clothing.dmi differ
diff --git a/icons/mob/clothing/modsuit/mod_modules.dmi b/icons/mob/clothing/modsuit/mod_modules.dmi
new file mode 100644
index 00000000000..11259428cf4
Binary files /dev/null and b/icons/mob/clothing/modsuit/mod_modules.dmi differ
diff --git a/icons/mob/clothing/species/kepori.dmi b/icons/mob/clothing/species/kepori.dmi
index 1586e80e9b1..9e108db76b8 100644
Binary files a/icons/mob/clothing/species/kepori.dmi and b/icons/mob/clothing/species/kepori.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index 65a7eb2c3cc..e3685f78f1a 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/suits/hooded.dmi b/icons/mob/clothing/suits/hooded.dmi
index a4be6f11f79..7d2f53a13b0 100644
Binary files a/icons/mob/clothing/suits/hooded.dmi and b/icons/mob/clothing/suits/hooded.dmi differ
diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi
index da507519599..1a0f5001b34 100644
Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ
diff --git a/icons/mob/clothing/under/color.dmi b/icons/mob/clothing/under/color.dmi
index 8bda1f9c7d6..d87321f4f01 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 6ed86df85da..4935f41abc8 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 a67fcb85331..00000000000
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 00000000000..318b67abbb1
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 00000000000..d6b8e2dfad7
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 c7eceebc354..cf217818830 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 cc5e484b89c..eb93d4b3530 100644
Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ
diff --git a/icons/mob/clothing/underwear/species/kepori/underwear_legs_kepori.dmi b/icons/mob/clothing/underwear/species/kepori/underwear_legs_kepori.dmi
index 166e1a7624d..13306114988 100644
Binary files a/icons/mob/clothing/underwear/species/kepori/underwear_legs_kepori.dmi and b/icons/mob/clothing/underwear/species/kepori/underwear_legs_kepori.dmi differ
diff --git a/icons/mob/clothing/underwear/species/kepori/underwear_legs_keporiOLD.dmi b/icons/mob/clothing/underwear/species/kepori/underwear_legs_keporiOLD.dmi
deleted file mode 100644
index aa9c16beb0a..00000000000
Binary files a/icons/mob/clothing/underwear/species/kepori/underwear_legs_keporiOLD.dmi and /dev/null differ
diff --git a/icons/mob/clothing/underwear/species/kepori/underwear_torso_kepori.dmi b/icons/mob/clothing/underwear/species/kepori/underwear_torso_kepori.dmi
index 1a6a59cd524..56c2757dc0f 100644
Binary files a/icons/mob/clothing/underwear/species/kepori/underwear_torso_kepori.dmi and b/icons/mob/clothing/underwear/species/kepori/underwear_torso_kepori.dmi differ
diff --git a/icons/mob/ethereal_parts.dmi b/icons/mob/ethereal_parts.dmi
index 14e0c51037f..c5d0c9b45f7 100644
Binary files a/icons/mob/ethereal_parts.dmi and b/icons/mob/ethereal_parts.dmi differ
diff --git a/icons/mob/hair_gradients.dmi b/icons/mob/hair_gradients.dmi
index df0fd1b6f74..7537193b131 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 a819dd3ca78..0c0efee7cbb 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 50a17a22d47..64efd1262a2 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 bbeddf91528..e91c7830c61 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/equipment/gear_handle_lefthand.dmi b/icons/mob/inhands/equipment/gear_handle_lefthand.dmi
new file mode 100644
index 00000000000..169f91ce6eb
Binary files /dev/null and b/icons/mob/inhands/equipment/gear_handle_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/gear_handle_righthand.dmi b/icons/mob/inhands/equipment/gear_handle_righthand.dmi
new file mode 100644
index 00000000000..172f18e6095
Binary files /dev/null and b/icons/mob/inhands/equipment/gear_handle_righthand.dmi differ
diff --git a/icons/mob/inhands/misc/concrete_bag_lefthand.dmi b/icons/mob/inhands/misc/concrete_bag_lefthand.dmi
new file mode 100644
index 00000000000..9d331882dfc
Binary files /dev/null and b/icons/mob/inhands/misc/concrete_bag_lefthand.dmi differ
diff --git a/icons/mob/inhands/misc/concrete_bag_righthand.dmi b/icons/mob/inhands/misc/concrete_bag_righthand.dmi
new file mode 100644
index 00000000000..707222f919e
Binary files /dev/null and b/icons/mob/inhands/misc/concrete_bag_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/axes_lefthand.dmi b/icons/mob/inhands/weapons/axes_lefthand.dmi
index 3b95d17cdc7..accff4a2bb7 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 1f5273d20d3..79a3b19b779 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 4772c01a228..c434190de82 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 9046e788d29..f4cc72aeff7 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 5235f151010..658f772c9c7 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 0800a527315..21035a077de 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 ff71ba99e3c..fd76394a835 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 afe36277e9f..f7a1aa75a66 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 b72556f0b13..1fae6b8eb45 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 da61d8df47e..151e9645b37 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 3cb569627ea..8df69b74cc3 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 41093fde051..fc5ed5ee90b 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 a8559339cd2..6e04504c3fb 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 ec690043230..28ace37f417 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
new file mode 100644
index 00000000000..76532a9b45e
Binary files /dev/null and b/icons/mob/simple_frontiersman.dmi differ
diff --git a/icons/mob/simple_human.dmi b/icons/mob/simple_human.dmi
index 133544acc99..08034334578 100644
Binary files a/icons/mob/simple_human.dmi and b/icons/mob/simple_human.dmi differ
diff --git a/icons/mob/species/human/rabbit.dmi b/icons/mob/species/human/rabbit.dmi
index fcc6599f735..26f0cb080d2 100644
Binary files a/icons/mob/species/human/rabbit.dmi and b/icons/mob/species/human/rabbit.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 00000000000..29406cb32ae
Binary files /dev/null and b/icons/mob/species/kepori/kepori_overlays.dmi differ
diff --git a/icons/mob/species/kepori/onmob_back_kepori.dmi b/icons/mob/species/kepori/onmob_back_kepori.dmi
new file mode 100644
index 00000000000..98218916f7c
Binary files /dev/null and b/icons/mob/species/kepori/onmob_back_kepori.dmi differ
diff --git a/icons/mob/species/kepori/onmob_eyes_kepori.dmi b/icons/mob/species/kepori/onmob_eyes_kepori.dmi
index 1b6c6f68a3a..e0151a96122 100644
Binary files a/icons/mob/species/kepori/onmob_eyes_kepori.dmi and b/icons/mob/species/kepori/onmob_eyes_kepori.dmi differ
diff --git a/icons/mob/species/kepori/onmob_head_kepori.dmi b/icons/mob/species/kepori/onmob_head_kepori.dmi
index b4631838b75..1557a2d30c0 100644
Binary files a/icons/mob/species/kepori/onmob_head_kepori.dmi and b/icons/mob/species/kepori/onmob_head_kepori.dmi differ
diff --git a/icons/mob/species/kepori/onmob_mask_kepori.dmi b/icons/mob/species/kepori/onmob_mask_kepori.dmi
index d455cf0bd3e..51391bd773c 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 6182a961254..18b8c9bceaa 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 d6f011cef31..e2450f7a749 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 8736b8057f1..9c93fb62359 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 9d08980b1e5..fb3dd669347 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/misc/digitigrade_suits.dmi b/icons/mob/species/misc/digitigrade_suits.dmi
index 8bdb115b037..b622c59dfa7 100644
Binary files a/icons/mob/species/misc/digitigrade_suits.dmi and b/icons/mob/species/misc/digitigrade_suits.dmi differ
diff --git a/icons/mob/species/vox/bodyparts.dmi b/icons/mob/species/vox/bodyparts.dmi
index fb098fa01d8..20e39116a8e 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_back_vox.dmi b/icons/mob/species/vox/onmob_back_vox.dmi
index 953ff24a290..c2000834877 100644
Binary files a/icons/mob/species/vox/onmob_back_vox.dmi and b/icons/mob/species/vox/onmob_back_vox.dmi differ
diff --git a/icons/mob/species/vox/onmob_eyes_vox.dmi b/icons/mob/species/vox/onmob_eyes_vox.dmi
index 2a30fe355bf..1945c69e7fe 100644
Binary files a/icons/mob/species/vox/onmob_eyes_vox.dmi and b/icons/mob/species/vox/onmob_eyes_vox.dmi differ
diff --git a/icons/mob/species/vox/onmob_hands_vox.dmi b/icons/mob/species/vox/onmob_hands_vox.dmi
index ff5c1a11df6..40e5d9896da 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 0ab1c3be967..027b3bd4d01 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 b460caedb72..e005fabe5e2 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_neck_vox.dmi b/icons/mob/species/vox/onmob_neck_vox.dmi
new file mode 100644
index 00000000000..1877ca277c9
Binary files /dev/null and b/icons/mob/species/vox/onmob_neck_vox.dmi differ
diff --git a/icons/mob/species/vox/onmob_suit_vox.dmi b/icons/mob/species/vox/onmob_suit_vox.dmi
index 7b2ee1c8d1c..d43891315e7 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 241b13861b4..9bafaedb200 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 00000000000..f0fc59ec59d
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 86001423aeb..ca816fab903 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 087cdd4c771..00000000000
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 fe37023686b..00000000000
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 00000000000..8d1e40a48f1
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 00000000000..ac963d46212
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 00000000000..6ac65ff5bb6
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 17bab47dc9e..486b7be4e6f 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 d872ba00ff1..e5ab15a43e1 100644
Binary files a/icons/obj/chemical/chem_jug.dmi and b/icons/obj/chemical/chem_jug.dmi differ
diff --git a/icons/obj/chemical/concrete.dmi b/icons/obj/chemical/concrete.dmi
new file mode 100644
index 00000000000..26c557e4243
Binary files /dev/null and b/icons/obj/chemical/concrete.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index ecf54fb9f61..fd66991eb77 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/back/backpacks.dmi b/icons/obj/clothing/back/backpacks.dmi
new file mode 100644
index 00000000000..01e2c1d6923
Binary files /dev/null and b/icons/obj/clothing/back/backpacks.dmi differ
diff --git a/icons/obj/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi
index 14af5186ae5..99887c0a761 100644
Binary files a/icons/obj/clothing/belt_overlays.dmi and b/icons/obj/clothing/belt_overlays.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 20cc5db40a4..931f502def1 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/eyes/eyes.dmi b/icons/obj/clothing/eyes/eyes.dmi
new file mode 100644
index 00000000000..63b92986ca5
Binary files /dev/null and b/icons/obj/clothing/eyes/eyes.dmi differ
diff --git a/icons/obj/clothing/faction/hardliners/head.dmi b/icons/obj/clothing/faction/hardliners/head.dmi
index 5101eeedce9..75f561897f1 100644
Binary files a/icons/obj/clothing/faction/hardliners/head.dmi and b/icons/obj/clothing/faction/hardliners/head.dmi differ
diff --git a/icons/obj/clothing/faction/hardliners/suits.dmi b/icons/obj/clothing/faction/hardliners/suits.dmi
index 39da1c95273..0c1cded6bc2 100644
Binary files a/icons/obj/clothing/faction/hardliners/suits.dmi and b/icons/obj/clothing/faction/hardliners/suits.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 00000000000..8c175975bdf
Binary files /dev/null and b/icons/obj/clothing/faction/nanotrasen/mask.dmi differ
diff --git a/icons/obj/clothing/faction/ngr/head.dmi b/icons/obj/clothing/faction/ngr/head.dmi
index d2258c5565d..92e8a9f45d9 100644
Binary files a/icons/obj/clothing/faction/ngr/head.dmi and b/icons/obj/clothing/faction/ngr/head.dmi differ
diff --git a/icons/obj/clothing/faction/ngr/mask.dmi b/icons/obj/clothing/faction/ngr/mask.dmi
index c867f6f569d..a276f37437b 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/faction/ngr/suits.dmi b/icons/obj/clothing/faction/ngr/suits.dmi
index 49344c553e0..9c05f154c70 100644
Binary files a/icons/obj/clothing/faction/ngr/suits.dmi and b/icons/obj/clothing/faction/ngr/suits.dmi differ
diff --git a/icons/obj/clothing/flightsuit.dmi b/icons/obj/clothing/flightsuit.dmi
deleted file mode 100644
index e08e74db1ce..00000000000
Binary files a/icons/obj/clothing/flightsuit.dmi and /dev/null differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
deleted file mode 100644
index 0b7af59b91e..00000000000
Binary files a/icons/obj/clothing/glasses.dmi and /dev/null differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index ba27bd4c816..25e6005778c 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 3dde9fc8909..80edcb673b0 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/head/armor.dmi b/icons/obj/clothing/head/armor.dmi
index 6757e591c85..8fbb5917026 100644
Binary files a/icons/obj/clothing/head/armor.dmi and b/icons/obj/clothing/head/armor.dmi differ
diff --git a/icons/obj/clothing/head/winterhood.dmi b/icons/obj/clothing/head/winterhood.dmi
index aa212eb48da..c89538ccb0b 100644
Binary files a/icons/obj/clothing/head/winterhood.dmi and b/icons/obj/clothing/head/winterhood.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index cbe3366557f..895cad1c91a 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_clothing.dmi b/icons/obj/clothing/modsuit/mod_clothing.dmi
new file mode 100644
index 00000000000..d2d9e0c72e3
Binary files /dev/null and b/icons/obj/clothing/modsuit/mod_clothing.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_construction.dmi b/icons/obj/clothing/modsuit/mod_construction.dmi
new file mode 100644
index 00000000000..a6be94284af
Binary files /dev/null and b/icons/obj/clothing/modsuit/mod_construction.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_modules.dmi b/icons/obj/clothing/modsuit/mod_modules.dmi
new file mode 100644
index 00000000000..69affa3fa49
Binary files /dev/null and b/icons/obj/clothing/modsuit/mod_modules.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index 17b6c986337..6c9baacc6c5 100644
Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 5a162a96913..00e1da5d54e 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 482f56db36d..b87d74d6c20 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/suits/hooded.dmi b/icons/obj/clothing/suits/hooded.dmi
index 5b04aa13aaa..7c3a70a0624 100644
Binary files a/icons/obj/clothing/suits/hooded.dmi and b/icons/obj/clothing/suits/hooded.dmi differ
diff --git a/icons/obj/clothing/under/SolGov.dmi b/icons/obj/clothing/under/SolGov.dmi
index 258c492e530..ef03505ae1c 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 471b4551329..820757a47ad 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 3fd5a370973..4522141772a 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 7a616f4c336..d9c37e30212 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 17b8285232f..ca0c7735979 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 7cb59b080c3..491ae9d6988 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 a05a369e94e..34581d3dfcc 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 8d68510d378..66d52fb3549 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 8093b0a1950..e6c138a8b00 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 67e8868958f..449964637b3 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 b6aad157b3c..a6a0ea8b49b 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 948fc01d4c8..1d319b25f69 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 453cb656de8..bda067487f9 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 1a2fcad74b8..4c3f0b5fc26 100644
Binary files a/icons/obj/clothing/under/syndicate.dmi and b/icons/obj/clothing/under/syndicate.dmi differ
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index cae8e53aa64..b14df8f9a01 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/deskflags.dmi b/icons/obj/deskflags.dmi
index 6a950bcebc4..10f24d037fd 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 d7a44b667a0..468069b7c22 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 2ab3cd0db5e..67447e75ee3 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 07c8d7ed162..31b4d3188f3 100644
Binary files a/icons/obj/food/donuts.dmi and b/icons/obj/food/donuts.dmi differ
diff --git a/icons/obj/food/ration.dmi b/icons/obj/food/ration.dmi
index 5bcf1f2b490..42cc013cc14 100644
Binary files a/icons/obj/food/ration.dmi and b/icons/obj/food/ration.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index 1205fd888ad..d1baf327dd8 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi
index 2998913f59b..0bc1904bc6d 100644
Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ
diff --git a/icons/obj/guncase.dmi b/icons/obj/guncase.dmi
index 4941b965f2f..83b5292a5cf 100644
Binary files a/icons/obj/guncase.dmi and b/icons/obj/guncase.dmi differ
diff --git a/icons/obj/guncase_48x32.dmi b/icons/obj/guncase_48x32.dmi
deleted file mode 100644
index b5dc20bc64e..00000000000
Binary files a/icons/obj/guncase_48x32.dmi and /dev/null differ
diff --git a/icons/obj/guns/48x32guns.dmi b/icons/obj/guns/48x32guns.dmi
index a0e7189b402..6643bb1e76c 100644
Binary files a/icons/obj/guns/48x32guns.dmi and b/icons/obj/guns/48x32guns.dmi differ
diff --git a/icons/obj/guns/attachments.dmi b/icons/obj/guns/attachments.dmi
new file mode 100644
index 00000000000..83232d3427e
Binary files /dev/null and b/icons/obj/guns/attachments.dmi differ
diff --git a/icons/obj/guns/bayonets.dmi b/icons/obj/guns/bayonets.dmi
deleted file mode 100644
index 32b5448b8ed..00000000000
Binary files a/icons/obj/guns/bayonets.dmi and /dev/null differ
diff --git a/icons/obj/guns/cell_latch.dmi b/icons/obj/guns/cell_latch.dmi
new file mode 100644
index 00000000000..6372df68877
Binary files /dev/null and b/icons/obj/guns/cell_latch.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index e02a7e288cc..6a32de5b08f 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/guns/flashlights.dmi b/icons/obj/guns/flashlights.dmi
deleted file mode 100644
index eef6d953f94..00000000000
Binary files a/icons/obj/guns/flashlights.dmi and /dev/null differ
diff --git a/icons/obj/guns/manufacturer/clip_lanchester/48x32-old.dmi b/icons/obj/guns/manufacturer/clip_lanchester/48x32-old.dmi
new file mode 100644
index 00000000000..d87a6f3c843
Binary files /dev/null and b/icons/obj/guns/manufacturer/clip_lanchester/48x32-old.dmi differ
diff --git a/icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi b/icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi
index d87a6f3c843..5d24f6a8877 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/clip_lanchester/lefthand.dmi b/icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi
index 7673c2f6d64..78e16bad6f9 100644
Binary files a/icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi and b/icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi b/icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi
index 4f9158d2d36..fea6178e903 100644
Binary files a/icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi and b/icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi b/icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi
index 4549f30f4ff..2d5103ec36c 100644
Binary files a/icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi and b/icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/48x32.dmi b/icons/obj/guns/manufacturer/frontier_import/48x32.dmi
index 149793c43c3..be95cfa90c1 100644
Binary files a/icons/obj/guns/manufacturer/frontier_import/48x32.dmi and b/icons/obj/guns/manufacturer/frontier_import/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi b/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi
index 33b3381bdfe..e34bf3995df 100644
Binary files a/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi and b/icons/obj/guns/manufacturer/frontier_import/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/onmob.dmi b/icons/obj/guns/manufacturer/frontier_import/onmob.dmi
index a0706579ccb..e0b05e0ec63 100644
Binary files a/icons/obj/guns/manufacturer/frontier_import/onmob.dmi and b/icons/obj/guns/manufacturer/frontier_import/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/frontier_import/righthand.dmi b/icons/obj/guns/manufacturer/frontier_import/righthand.dmi
index 73945b8524d..30eeaa12d4e 100644
Binary files a/icons/obj/guns/manufacturer/frontier_import/righthand.dmi and b/icons/obj/guns/manufacturer/frontier_import/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/hunterspride/48x32.dmi b/icons/obj/guns/manufacturer/hunterspride/48x32.dmi
index 19b4202da78..6c3851f0ca7 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 4fb5eca5c01..febc543be1b 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 8911c8fbb68..539b811aacd 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 04316773566..ec9a8a53ba7 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 e7deb0f12ce..74adceab3ba 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 19335eb44ff..7ed89aacf95 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/onmob.dmi b/icons/obj/guns/manufacturer/inteq/onmob.dmi
index f402ffd24e2..a33746030b4 100644
Binary files a/icons/obj/guns/manufacturer/inteq/onmob.dmi and b/icons/obj/guns/manufacturer/inteq/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/inteq/righthand.dmi b/icons/obj/guns/manufacturer/inteq/righthand.dmi
index 33d087f394f..d7668fe0437 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 bac0ccc8f21..66d714e245e 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 24ac86c3e0b..f91c263424e 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 b6831ec9696..ef01a242944 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/scarborough/48x32-old.dmi b/icons/obj/guns/manufacturer/scarborough/48x32-old.dmi
new file mode 100644
index 00000000000..361448b49a3
Binary files /dev/null and b/icons/obj/guns/manufacturer/scarborough/48x32-old.dmi differ
diff --git a/icons/obj/guns/manufacturer/scarborough/48x32.dmi b/icons/obj/guns/manufacturer/scarborough/48x32.dmi
index 361448b49a3..87d4d44caeb 100644
Binary files a/icons/obj/guns/manufacturer/scarborough/48x32.dmi and b/icons/obj/guns/manufacturer/scarborough/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/scarborough/lefthand.dmi b/icons/obj/guns/manufacturer/scarborough/lefthand.dmi
index 8d184d907db..50cf4e8f047 100644
Binary files a/icons/obj/guns/manufacturer/scarborough/lefthand.dmi and b/icons/obj/guns/manufacturer/scarborough/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/scarborough/onmob.dmi b/icons/obj/guns/manufacturer/scarborough/onmob.dmi
index 5127ecfed56..bc0e8e0d7c6 100644
Binary files a/icons/obj/guns/manufacturer/scarborough/onmob.dmi and b/icons/obj/guns/manufacturer/scarborough/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/scarborough/righthand.dmi b/icons/obj/guns/manufacturer/scarborough/righthand.dmi
index 5dbfb0acfc2..bfa740f2654 100644
Binary files a/icons/obj/guns/manufacturer/scarborough/righthand.dmi and b/icons/obj/guns/manufacturer/scarborough/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 00000000000..7425d254457
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 00000000000..1442d4c75a6
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 00000000000..9b0c1e524f7
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 00000000000..58fd6ab48f2
Binary files /dev/null and b/icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/toys/48x32.dmi b/icons/obj/guns/manufacturer/toys/48x32.dmi
new file mode 100644
index 00000000000..80ddcbad3c5
Binary files /dev/null and b/icons/obj/guns/manufacturer/toys/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/toys/lefthand.dmi b/icons/obj/guns/manufacturer/toys/lefthand.dmi
new file mode 100644
index 00000000000..097eda46280
Binary files /dev/null and b/icons/obj/guns/manufacturer/toys/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/toys/onmob.dmi b/icons/obj/guns/manufacturer/toys/onmob.dmi
new file mode 100644
index 00000000000..4a5a4ba7b32
Binary files /dev/null and b/icons/obj/guns/manufacturer/toys/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/toys/righthand.dmi b/icons/obj/guns/manufacturer/toys/righthand.dmi
new file mode 100644
index 00000000000..0a9759f4eea
Binary files /dev/null and b/icons/obj/guns/manufacturer/toys/righthand.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 986c2f99692..13ee4f9bfb1 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/hazard.dmi b/icons/obj/hazard.dmi
index 5c350c5afb9..f9df336f607 100644
Binary files a/icons/obj/hazard.dmi and b/icons/obj/hazard.dmi differ
diff --git a/icons/obj/improvised.dmi b/icons/obj/improvised.dmi
index 43fc38a4be5..20890be4cbc 100644
Binary files a/icons/obj/improvised.dmi and b/icons/obj/improvised.dmi differ
diff --git a/icons/obj/item/gear_packs.dmi b/icons/obj/item/gear_packs.dmi
new file mode 100644
index 00000000000..76fb94bd4ff
Binary files /dev/null and b/icons/obj/item/gear_packs.dmi differ
diff --git a/icons/obj/item/knife.dmi b/icons/obj/item/knife.dmi
deleted file mode 100644
index 2e95a915451..00000000000
Binary files a/icons/obj/item/knife.dmi and /dev/null differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
new file mode 100644
index 00000000000..e38eb539cf4
Binary files /dev/null and b/icons/obj/items.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
deleted file mode 100644
index a0ceaebd838..00000000000
Binary files a/icons/obj/items_and_weapons.dmi and /dev/null differ
diff --git a/icons/obj/landmine.dmi b/icons/obj/landmine.dmi
index dd19fd9d399..40b3e3e4ba1 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 6793b0c10cb..4239f83aa0e 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 ae86489bb34..45e0a73c898 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi
index 96151f074e1..bcd6235d26a 100644
Binary files a/icons/obj/machines/mining_machines.dmi and b/icons/obj/machines/mining_machines.dmi differ
diff --git a/icons/obj/machines/suit_storage.dmi b/icons/obj/machines/suit_storage.dmi
index a40d04f500c..d58a9ef3c07 100644
Binary files a/icons/obj/machines/suit_storage.dmi and b/icons/obj/machines/suit_storage.dmi differ
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
index 337e3bf6d8d..efffc5cebb4 100644
Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ
diff --git a/icons/obj/module.dmi b/icons/obj/module.dmi
index 49c818b217d..e7f379175a5 100644
Binary files a/icons/obj/module.dmi and b/icons/obj/module.dmi differ
diff --git a/icons/obj/mysterybox.dmi b/icons/obj/mysterybox.dmi
deleted file mode 100644
index 0023dc06637..00000000000
Binary files a/icons/obj/mysterybox.dmi and /dev/null differ
diff --git a/icons/obj/nutanks.dmi b/icons/obj/nutanks.dmi
index 4365bdb8677..b8a584ef460 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 1b156b9294f..628c19d63e4 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 00000000000..a1923bdace2
Binary files /dev/null and b/icons/obj/platform.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 89f94e16a65..736a25d57f5 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/railing.dmi b/icons/obj/railing.dmi
index 9243199cd86..09b8f0fbd62 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 bdf8bc6e883..1632e2a0836 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 cfb783ef1b1..7e9be0eed18 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 df2add95964..d9c488a1fe8 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index f5f04901af2..af3c5cd4be2 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/structures/handrail.dmi b/icons/obj/structures/handrail.dmi
index 1a8d98d6697..4326fccaf9e 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 837e442f27c..94dfc2144e6 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 8f2566a98f8..e213c294d66 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 d331d285236..ab07fb775a0 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 731cd15fcfb..b265239b2c7 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index 78aebb9416c..2b95535dcb7 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/icons/obj/transforming_energy.dmi b/icons/obj/transforming_energy.dmi
deleted file mode 100644
index ff2f99832d1..00000000000
Binary files a/icons/obj/transforming_energy.dmi and /dev/null differ
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index 87cef669faf..fdefd87860b 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 6905749d1e5..a2a6e29e2c4 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 96e0c28e715..236d94fbfb5 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 a9f32f00179..f18adf30b10 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
new file mode 100644
index 00000000000..ff735abf5eb
Binary files /dev/null and b/icons/obj/weapon/axe.dmi differ
diff --git a/icons/obj/weapon/baton.dmi b/icons/obj/weapon/baton.dmi
new file mode 100644
index 00000000000..4c63ef28b8a
Binary files /dev/null and b/icons/obj/weapon/baton.dmi differ
diff --git a/icons/obj/weapon/blunt.dmi b/icons/obj/weapon/blunt.dmi
new file mode 100644
index 00000000000..013f4fd1db2
Binary files /dev/null and b/icons/obj/weapon/blunt.dmi differ
diff --git a/icons/obj/weapon/energy.dmi b/icons/obj/weapon/energy.dmi
new file mode 100644
index 00000000000..79742da9d23
Binary files /dev/null and b/icons/obj/weapon/energy.dmi differ
diff --git a/icons/obj/weapon/knives/knife.dmi b/icons/obj/weapon/knives/knife.dmi
new file mode 100644
index 00000000000..f8a7929c54b
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 00000000000..e2049e6ab41
Binary files /dev/null and b/icons/obj/weapon/knives/knife_world.dmi differ
diff --git a/icons/obj/weapon/misc.dmi b/icons/obj/weapon/misc.dmi
new file mode 100644
index 00000000000..9eabb2c3eaf
Binary files /dev/null and b/icons/obj/weapon/misc.dmi differ
diff --git a/icons/obj/weapon/spear.dmi b/icons/obj/weapon/spear.dmi
new file mode 100644
index 00000000000..384f1c751bc
Binary files /dev/null and b/icons/obj/weapon/spear.dmi differ
diff --git a/icons/obj/weapon/sword.dmi b/icons/obj/weapon/sword.dmi
new file mode 100644
index 00000000000..915be217a2a
Binary files /dev/null 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 00000000000..be8db65a3f5
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 ff8e2114e82..00000000000
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 058a4407428..00000000000
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 00000000000..0d09b4f37c0
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 6250cbff885..00000000000
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 00000000000..fc75d381200
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 00000000000..22b4f97c7e4
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 00000000000..dfc75056911
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 00000000000..46ca33b7685
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 00000000000..9e7bc905678
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 00000000000..09b34ab632e
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 00000000000..f96be7a5ee5
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 00000000000..8a453eece6d
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 00000000000..e5f6c086554
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 00000000000..88d898b862c
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 00000000000..e5cca91631b
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 00000000000..fd045bfc030
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 00000000000..53215352eb5
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 00000000000..7d1a66fb901
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 00000000000..11ec17c927d
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 00000000000..e3442672175
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 00000000000..50b01922ce5
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 00000000000..0b1536102bf
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 00000000000..a9956adbad1
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 00000000000..4e6ee3bcb31
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 00000000000..2702e4d8017
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 68d030ee383..79ca6ed0ed8 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 a62024cc8e0..58ef66b36d2 100644
Binary files a/icons/turf/decals/decals.dmi and b/icons/turf/decals/decals.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 398d5550f81..1dbb3a101fa 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 16cc956b5f7..d324bd882a3 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/shiptest.dme b/shiptest.dme
index a8a5a98ad5c..9ce9ab9ef43 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -13,6 +13,7 @@
// END_PREFERENCES
// BEGIN_INCLUDE
+#include "__odlint.dm"
#include "_maps\_basemap.dm"
#include "code\__byond_version_compat.dm"
#include "code\_compile_options.dm"
@@ -25,6 +26,7 @@
#include "code\__DEFINES\_tick.dm"
#include "code\__DEFINES\access.dm"
#include "code\__DEFINES\achievements.dm"
+#include "code\__DEFINES\actions.dm"
#include "code\__DEFINES\admin.dm"
#include "code\__DEFINES\anomalies.dm"
#include "code\__DEFINES\antagonists.dm"
@@ -39,16 +41,17 @@
#include "code\__DEFINES\botany.dm"
#include "code\__DEFINES\callbacks.dm"
#include "code\__DEFINES\cargo.dm"
+#include "code\__DEFINES\cells.dm"
#include "code\__DEFINES\chat.dm"
#include "code\__DEFINES\cinematics.dm"
#include "code\__DEFINES\cleaning.dm"
+#include "code\__DEFINES\clothing.dm"
#include "code\__DEFINES\colors.dm"
#include "code\__DEFINES\combat.dm"
#include "code\__DEFINES\configuration.dm"
#include "code\__DEFINES\construction.dm"
#include "code\__DEFINES\contracts.dm"
#include "code\__DEFINES\cooldowns.dm"
-#include "code\__DEFINES\cult.dm"
#include "code\__DEFINES\directional.dm"
#include "code\__DEFINES\diseases.dm"
#include "code\__DEFINES\DNA.dm"
@@ -66,6 +69,7 @@
#include "code\__DEFINES\food.dm"
#include "code\__DEFINES\footsteps.dm"
#include "code\__DEFINES\forensics.dm"
+#include "code\__DEFINES\generators.dm"
#include "code\__DEFINES\guns.dm"
#include "code\__DEFINES\hud.dm"
#include "code\__DEFINES\icon_smoothing.dm"
@@ -94,6 +98,7 @@
#include "code\__DEFINES\menu.dm"
#include "code\__DEFINES\misc.dm"
#include "code\__DEFINES\mobs.dm"
+#include "code\__DEFINES\mod.dm"
#include "code\__DEFINES\monkeys.dm"
#include "code\__DEFINES\move_force.dm"
#include "code\__DEFINES\movement.dm"
@@ -103,11 +108,13 @@
#include "code\__DEFINES\obj_flags.dm"
#include "code\__DEFINES\overmap.dm"
#include "code\__DEFINES\paper.dm"
+#include "code\__DEFINES\particles.dm"
#include "code\__DEFINES\pinpointers.dm"
#include "code\__DEFINES\pipe_construction.dm"
#include "code\__DEFINES\plumbing.dm"
#include "code\__DEFINES\power.dm"
#include "code\__DEFINES\preferences.dm"
+#include "code\__DEFINES\processing.dm"
#include "code\__DEFINES\procpath.dm"
#include "code\__DEFINES\profile.dm"
#include "code\__DEFINES\projectiles.dm"
@@ -155,14 +162,32 @@
#include "code\__DEFINES\wires.dm"
#include "code\__DEFINES\dcs\flags.dm"
#include "code\__DEFINES\dcs\helpers.dm"
-#include "code\__DEFINES\dcs\signals.dm"
+#include "code\__DEFINES\dcs\signals\signals.dm"
+#include "code\__DEFINES\dcs\signals\signals_mod.dm"
+#include "code\__DEFINES\dcs\signals\signals_reagent.dm"
+#include "code\__DEFINES\dcs\signals\signals_ship.dm"
+#include "code\__DEFINES\dcs\signals\signals_storage.dm"
+#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_carbon.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_object.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_clothing.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_food.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_grenade.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_hydroponic.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_implant.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_item.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_transform.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_machine\signals_aquarium.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_machine\signals_machinery.dm"
+#include "code\__DEFINES\dcs\signals\signals_obj\signals_machine\signals_supermatter.dm"
#include "code\__DEFINES\starfly13\unathi_colors.dm"
#include "code\__HELPERS\_auxtools_api.dm"
#include "code\__HELPERS\_lists.dm"
#include "code\__HELPERS\_logging.dm"
+#include "code\__HELPERS\_planes.dm"
#include "code\__HELPERS\_string_lists.dm"
#include "code\__HELPERS\areas.dm"
#include "code\__HELPERS\AStar.dm"
+#include "code\__HELPERS\atoms.dm"
#include "code\__HELPERS\bindings.dm"
#include "code\__HELPERS\bitflag_lists.dm"
#include "code\__HELPERS\chat.dm"
@@ -174,12 +199,15 @@
#include "code\__HELPERS\files.dm"
#include "code\__HELPERS\filters.dm"
#include "code\__HELPERS\game.dm"
+#include "code\__HELPERS\generators.dm"
#include "code\__HELPERS\global_lists.dm"
#include "code\__HELPERS\heap.dm"
+#include "code\__HELPERS\hearted.dm"
#include "code\__HELPERS\icon_smoothing.dm"
#include "code\__HELPERS\icons.dm"
#include "code\__HELPERS\level_traits.dm"
#include "code\__HELPERS\lighting.dm"
+#include "code\__HELPERS\maths.dm"
#include "code\__HELPERS\matrices.dm"
#include "code\__HELPERS\mobs.dm"
#include "code\__HELPERS\mouse_control.dm"
@@ -250,7 +278,6 @@
#include "code\_onclick\item_attack.dm"
#include "code\_onclick\observer.dm"
#include "code\_onclick\other_mobs.dm"
-#include "code\_onclick\overmind.dm"
#include "code\_onclick\pai.dm"
#include "code\_onclick\telekinesis.dm"
#include "code\_onclick\hud\_defines.dm"
@@ -259,16 +286,12 @@
#include "code\_onclick\hud\alert.dm"
#include "code\_onclick\hud\alien.dm"
#include "code\_onclick\hud\alien_larva.dm"
-#include "code\_onclick\hud\blob_overmind.dm"
-#include "code\_onclick\hud\blobbernauthud.dm"
#include "code\_onclick\hud\constructs.dm"
#include "code\_onclick\hud\credits.dm"
-#include "code\_onclick\hud\devil.dm"
#include "code\_onclick\hud\drones.dm"
#include "code\_onclick\hud\fullscreen.dm"
#include "code\_onclick\hud\generic_dextrous.dm"
#include "code\_onclick\hud\ghost.dm"
-#include "code\_onclick\hud\guardian.dm"
#include "code\_onclick\hud\holograms.dm"
#include "code\_onclick\hud\hud.dm"
#include "code\_onclick\hud\human.dm"
@@ -287,7 +310,6 @@
#include "code\_onclick\hud\screen_objects.dm"
#include "code\_onclick\hud\screentip.dm"
#include "code\_onclick\hud\storage.dm"
-#include "code\_onclick\hud\swarmer.dm"
#include "code\controllers\admin.dm"
#include "code\controllers\controller.dm"
#include "code\controllers\failsafe.dm"
@@ -323,6 +345,7 @@
#include "code\controllers\subsystem\economy.dm"
#include "code\controllers\subsystem\events.dm"
#include "code\controllers\subsystem\explosions.dm"
+#include "code\controllers\subsystem\faction.dm"
#include "code\controllers\subsystem\fire_burning.dm"
#include "code\controllers\subsystem\garbage.dm"
#include "code\controllers\subsystem\icon_smooth.dm"
@@ -350,6 +373,7 @@
#include "code\controllers\subsystem\persistence.dm"
#include "code\controllers\subsystem\physics.dm"
#include "code\controllers\subsystem\ping.dm"
+#include "code\controllers\subsystem\points_of_interest.dm"
#include "code\controllers\subsystem\profiler.dm"
#include "code\controllers\subsystem\radiation.dm"
#include "code\controllers\subsystem\radio.dm"
@@ -374,6 +398,7 @@
#include "code\controllers\subsystem\title.dm"
#include "code\controllers\subsystem\traumas.dm"
#include "code\controllers\subsystem\turf_fire.dm"
+#include "code\controllers\subsystem\turrets.dm"
#include "code\controllers\subsystem\verb_manager.dm"
#include "code\controllers\subsystem\vis_overlays.dm"
#include "code\controllers\subsystem\vote.dm"
@@ -410,7 +435,6 @@
#include "code\datums\dog_fashion.dm"
#include "code\datums\ductnet.dm"
#include "code\datums\emotes.dm"
-#include "code\datums\ert.dm"
#include "code\datums\forced_movement.dm"
#include "code\datums\guestbook.dm"
#include "code\datums\holocall.dm"
@@ -427,9 +451,9 @@
#include "code\datums\progressbar.dm"
#include "code\datums\quixotejump.dm"
#include "code\datums\radiation_wave.dm"
-#include "code\datums\ruins.dm"
#include "code\datums\saymode.dm"
#include "code\datums\shuttles.dm"
+#include "code\datums\simple_beam.dm"
#include "code\datums\soullink.dm"
#include "code\datums\spawners_menu.dm"
#include "code\datums\tgs_event_handler.dm"
@@ -462,12 +486,15 @@
#include "code\datums\components\anti_magic.dm"
#include "code\datums\components\armor_plate.dm"
#include "code\datums\components\art.dm"
+#include "code\datums\components\attachment.dm"
+#include "code\datums\components\attachment_holder.dm"
#include "code\datums\components\bandage.dm"
#include "code\datums\components\bane.dm"
#include "code\datums\components\beetlejuice.dm"
#include "code\datums\components\bloodysoles.dm"
#include "code\datums\components\butchering.dm"
#include "code\datums\components\caltrop.dm"
+#include "code\datums\components\cell_component.dm"
#include "code\datums\components\chasm.dm"
#include "code\datums\components\connect_containers.dm"
#include "code\datums\components\connect_loc_behalf.dm"
@@ -476,11 +503,9 @@
#include "code\datums\components\construction.dm"
#include "code\datums\components\creamed.dm"
#include "code\datums\components\deadchat_control.dm"
-#include "code\datums\components\dejavu.dm"
#include "code\datums\components\deployable.dm"
#include "code\datums\components\dooropendeathproc.dm"
#include "code\datums\components\earprotection.dm"
-#include "code\datums\components\edible.dm"
#include "code\datums\components\edit_complainer.dm"
#include "code\datums\components\embedded.dm"
#include "code\datums\components\empprotection.dm"
@@ -496,6 +521,7 @@
#include "code\datums\components\hot_ice.dm"
#include "code\datums\components\igniter.dm"
#include "code\datums\components\infective.dm"
+#include "code\datums\components\jetpack.dm"
#include "code\datums\components\jousting.dm"
#include "code\datums\components\knockback.dm"
#include "code\datums\components\knockoff.dm"
@@ -523,12 +549,11 @@
#include "code\datums\components\remote_materials.dm"
#include "code\datums\components\riding.dm"
#include "code\datums\components\rotation.dm"
+#include "code\datums\components\shielded.dm"
#include "code\datums\components\shrink.dm"
#include "code\datums\components\sitcomlaughter.dm"
#include "code\datums\components\sizzle.dm"
#include "code\datums\components\slippery.dm"
-#include "code\datums\components\soulstoned.dm"
-#include "code\datums\components\spawner.dm"
#include "code\datums\components\spill.dm"
#include "code\datums\components\spooky.dm"
#include "code\datums\components\squeak.dm"
@@ -540,7 +565,6 @@
#include "code\datums\components\taped.dm"
#include "code\datums\components\tether.dm"
#include "code\datums\components\thermite.dm"
-#include "code\datums\components\twohanded.dm"
#include "code\datums\components\udder.dm"
#include "code\datums\components\uplink.dm"
#include "code\datums\components\wearertargeting.dm"
@@ -553,12 +577,16 @@
#include "code\datums\components\crafting\recipes\drink.dm"
#include "code\datums\components\crafting\recipes\misc.dm"
#include "code\datums\components\crafting\recipes\robot.dm"
-#include "code\datums\components\crafting\recipes\tribal.dm"
#include "code\datums\components\crafting\recipes\weapon.dm"
#include "code\datums\components\fantasy\_fantasy.dm"
#include "code\datums\components\fantasy\affix.dm"
#include "code\datums\components\fantasy\prefixes.dm"
#include "code\datums\components\fantasy\suffixes.dm"
+#include "code\datums\components\food\edible.dm"
+#include "code\datums\components\food\food_storage.dm"
+#include "code\datums\components\melee\charged.dm"
+#include "code\datums\components\melee\transforming.dm"
+#include "code\datums\components\melee\twohanded.dm"
#include "code\datums\components\plumbing\_plumbing.dm"
#include "code\datums\components\plumbing\chemical_acclimator.dm"
#include "code\datums\components\plumbing\filter.dm"
@@ -593,7 +621,6 @@
#include "code\datums\diseases\heart_failure.dm"
#include "code\datums\diseases\legionvirus.dm"
#include "code\datums\diseases\magnitis.dm"
-#include "code\datums\diseases\parasitic_infection.dm"
#include "code\datums\diseases\parrotpossession.dm"
#include "code\datums\diseases\pierrot_throat.dm"
#include "code\datums\diseases\retrovirus.dm"
@@ -641,18 +668,21 @@
#include "code\datums\elements\cleaning.dm"
#include "code\datums\elements\connect_loc.dm"
#include "code\datums\elements\digitalcamo.dm"
-#include "code\datums\elements\dunkable.dm"
#include "code\datums\elements\earhealing.dm"
#include "code\datums\elements\embed.dm"
+#include "code\datums\elements\empprotection.dm"
#include "code\datums\elements\firestacker.dm"
#include "code\datums\elements\forced_gravity.dm"
#include "code\datums\elements\lazy_fishing_spot.dm"
#include "code\datums\elements\light_blocking.dm"
#include "code\datums\elements\mobappearance.dm"
+#include "code\datums\elements\plant_backfire.dm"
+#include "code\datums\elements\point_of_interest.dm"
#include "code\datums\elements\renamemob.dm"
#include "code\datums\elements\selfknockback.dm"
#include "code\datums\elements\snail_crawl.dm"
#include "code\datums\elements\squish.dm"
+#include "code\datums\elements\tool_bang.dm"
#include "code\datums\elements\tool_flash.dm"
#include "code\datums\elements\turf_transparency.dm"
#include "code\datums\elements\undertile.dm"
@@ -662,6 +692,19 @@
#include "code\datums\elements\world_icon.dm"
#include "code\datums\elements\decals\_decals.dm"
#include "code\datums\elements\decals\blood.dm"
+#include "code\datums\elements\food\dunkable.dm"
+#include "code\datums\elements\food\food_trash.dm"
+#include "code\datums\elements\food\processable.dm"
+#include "code\datums\ert\_ert.dm"
+#include "code\datums\ert\ert_clip.dm"
+#include "code\datums\ert\ert_frontiersmen.dm"
+#include "code\datums\ert\ert_gezena.dm"
+#include "code\datums\ert\ert_indies.dm"
+#include "code\datums\ert\ert_inteq.dm"
+#include "code\datums\ert\ert_nanotrasen.dm"
+#include "code\datums\ert\ert_roumain.dm"
+#include "code\datums\ert\ert_solgov.dm"
+#include "code\datums\ert\ert_syndicate.dm"
#include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm"
#include "code\datums\helper_datums\icon_snapshot.dm"
@@ -711,7 +754,6 @@
#include "code\datums\materials\_material.dm"
#include "code\datums\materials\basemats.dm"
#include "code\datums\materials\meat.dm"
-#include "code\datums\materials\pizza.dm"
#include "code\datums\mood_events\_mood_event.dm"
#include "code\datums\mood_events\beauty_events.dm"
#include "code\datums\mood_events\drink_events.dm"
@@ -738,6 +780,7 @@
#include "code\datums\proximity_monitor\fields\gravity.dm"
#include "code\datums\proximity_monitor\fields\peaceborg_dampener.dm"
#include "code\datums\proximity_monitor\fields\timestop.dm"
+#include "code\datums\ruins\_ruins.dm"
#include "code\datums\ruins\beachplanet.dm"
#include "code\datums\ruins\icemoon.dm"
#include "code\datums\ruins\jungle.dm"
@@ -791,6 +834,7 @@
#include "code\datums\wires\fax.dm"
#include "code\datums\wires\microwave.dm"
#include "code\datums\wires\mines.dm"
+#include "code\datums\wires\mod.dm"
#include "code\datums\wires\mulebot.dm"
#include "code\datums\wires\particle_accelerator.dm"
#include "code\datums\wires\r_n_d.dm"
@@ -815,11 +859,9 @@
#include "code\game\area\ai_monitored.dm"
#include "code\game\area\areas.dm"
#include "code\game\area\ship_areas.dm"
-#include "code\game\area\Space_Station_13_areas.dm"
#include "code\game\area\areas\away_content.dm"
#include "code\game\area\areas\centcom.dm"
#include "code\game\area\areas\outpost.dm"
-#include "code\game\area\areas\shuttles.dm"
#include "code\game\area\areas\ruins\_ruins.dm"
#include "code\game\area\areas\ruins\beachplanet.dm"
#include "code\game\area\areas\ruins\icemoon.dm"
@@ -830,6 +872,7 @@
#include "code\game\area\areas\ruins\space.dm"
#include "code\game\area\areas\ruins\templates.dm"
#include "code\game\area\areas\ruins\wasteplanet.dm"
+#include "code\game\atom\atom_orbit.dm"
#include "code\game\gamemodes\events.dm"
#include "code\game\gamemodes\game_mode.dm"
#include "code\game\gamemodes\objective.dm"
@@ -840,18 +883,12 @@
#include "code\game\gamemodes\clown_ops\bananium_bomb.dm"
#include "code\game\gamemodes\clown_ops\clown_ops.dm"
#include "code\game\gamemodes\clown_ops\clown_weapons.dm"
-#include "code\game\gamemodes\cult\cult.dm"
-#include "code\game\gamemodes\devil\devil_game_mode.dm"
-#include "code\game\gamemodes\devil\game_mode.dm"
-#include "code\game\gamemodes\devil\objectives.dm"
-#include "code\game\gamemodes\devil\devil_agent\devil_agent.dm"
#include "code\game\gamemodes\dynamic\dynamic.dm"
#include "code\game\gamemodes\dynamic\dynamic_rulesets.dm"
#include "code\game\gamemodes\dynamic\dynamic_rulesets_latejoin.dm"
#include "code\game\gamemodes\dynamic\dynamic_rulesets_midround.dm"
#include "code\game\gamemodes\dynamic\dynamic_rulesets_roundstart.dm"
#include "code\game\gamemodes\extended\extended.dm"
-#include "code\game\gamemodes\meteor\meteor.dm"
#include "code\game\gamemodes\meteor\meteors.dm"
#include "code\game\gamemodes\nuclear\nuclear.dm"
#include "code\game\gamemodes\sandbox\airlock_maker.dm"
@@ -910,7 +947,6 @@
#include "code\game\machinery\requests_console.dm"
#include "code\game\machinery\roulette_machine.dm"
#include "code\game\machinery\scan_gate.dm"
-#include "code\game\machinery\sheetifier.dm"
#include "code\game\machinery\shieldgen.dm"
#include "code\game\machinery\sleeper.dm"
#include "code\game\machinery\slotmachine.dm"
@@ -977,8 +1013,9 @@
#include "code\game\machinery\pipe\construction.dm"
#include "code\game\machinery\pipe\pipe_dispenser.dm"
#include "code\game\machinery\porta_turret\portable_turret.dm"
-#include "code\game\machinery\porta_turret\portable_turret_construct.dm"
-#include "code\game\machinery\porta_turret\portable_turret_cover.dm"
+#include "code\game\machinery\porta_turret\portable_turret_control.dm"
+#include "code\game\machinery\porta_turret\portable_turret_manual_control.dm"
+#include "code\game\machinery\porta_turret\portable_turret_types.dm"
#include "code\game\machinery\shuttle\custom_shuttle.dm"
#include "code\game\machinery\shuttle\ship_gravity.dm"
#include "code\game\machinery\shuttle\shuttle_engine.dm"
@@ -1003,7 +1040,9 @@
#include "code\game\MapData\shuttles\misc.dm"
#include "code\game\MapData\shuttles\nanotrasen_mimir.dm"
#include "code\game\MapData\shuttles\nanotrasen_ranger.dm"
+#include "code\game\MapData\shuttles\pgf_bolide.dm"
#include "code\game\MapData\shuttles\pgf_crying_sun.dm"
+#include "code\game\MapData\shuttles\pgf_woeful_cthonian.dm"
#include "code\game\MapData\shuttles\srm_elder.dm"
#include "code\game\mecha\mech_bay.dm"
#include "code\game\mecha\mech_fabricator.dm"
@@ -1022,7 +1061,6 @@
#include "code\game\mecha\combat\honker.dm"
#include "code\game\mecha\combat\marauder.dm"
#include "code\game\mecha\combat\phazon.dm"
-#include "code\game\mecha\combat\reticence.dm"
#include "code\game\mecha\equipment\mecha_equipment.dm"
#include "code\game\mecha\equipment\tools\medical_tools.dm"
#include "code\game\mecha\equipment\tools\mining_tools.dm"
@@ -1073,6 +1111,7 @@
#include "code\game\objects\effects\anomalies\anomalies_pyroclastic.dm"
#include "code\game\objects\effects\anomalies\anomalies_sparkler.dm"
#include "code\game\objects\effects\anomalies\anomalies_static.dm"
+#include "code\game\objects\effects\anomalies\anomalies_transfusion.dm"
#include "code\game\objects\effects\anomalies\anomalies_veins.dm"
#include "code\game\objects\effects\anomalies\anomalies_vortex.dm"
#include "code\game\objects\effects\decals\cleanable.dm"
@@ -1097,15 +1136,37 @@
#include "code\game\objects\effects\effect_system\effects_smoke.dm"
#include "code\game\objects\effects\effect_system\effects_sparks.dm"
#include "code\game\objects\effects\effect_system\effects_water.dm"
+#include "code\game\objects\effects\particles\acid.dm"
+#include "code\game\objects\effects\particles\fire.dm"
+#include "code\game\objects\effects\particles\misc.dm"
+#include "code\game\objects\effects\particles\slime.dm"
+#include "code\game\objects\effects\particles\smoke.dm"
+#include "code\game\objects\effects\particles\water.dm"
#include "code\game\objects\effects\spawners\bombspawner.dm"
#include "code\game\objects\effects\spawners\bundle.dm"
#include "code\game\objects\effects\spawners\gibspawner.dm"
-#include "code\game\objects\effects\spawners\lootdrop.dm"
#include "code\game\objects\effects\spawners\mobspawner.dm"
+#include "code\game\objects\effects\spawners\spawner.dm"
#include "code\game\objects\effects\spawners\structure.dm"
-#include "code\game\objects\effects\spawners\traps.dm"
-#include "code\game\objects\effects\spawners\vaultspawner.dm"
-#include "code\game\objects\effects\spawners\xeno_egg_delivery.dm"
+#include "code\game\objects\effects\spawners\random\ai_module.dm"
+#include "code\game\objects\effects\spawners\random\anomaly.dm"
+#include "code\game\objects\effects\spawners\random\bedsheet.dm"
+#include "code\game\objects\effects\spawners\random\boards.dm"
+#include "code\game\objects\effects\spawners\random\bureaucracy.dm"
+#include "code\game\objects\effects\spawners\random\clothing.dm"
+#include "code\game\objects\effects\spawners\random\decoration.dm"
+#include "code\game\objects\effects\spawners\random\engineering.dm"
+#include "code\game\objects\effects\spawners\random\entertainment.dm"
+#include "code\game\objects\effects\spawners\random\exotic.dm"
+#include "code\game\objects\effects\spawners\random\food_or_drink.dm"
+#include "code\game\objects\effects\spawners\random\maintenance.dm"
+#include "code\game\objects\effects\spawners\random\medical.dm"
+#include "code\game\objects\effects\spawners\random\random.dm"
+#include "code\game\objects\effects\spawners\random\salvaging.dm"
+#include "code\game\objects\effects\spawners\random\structure.dm"
+#include "code\game\objects\effects\spawners\random\trash.dm"
+#include "code\game\objects\effects\spawners\random\vending.dm"
+#include "code\game\objects\effects\spawners\random\waste_planet.dm"
#include "code\game\objects\effects\temporary_visuals\cult.dm"
#include "code\game\objects\effects\temporary_visuals\miscellaneous.dm"
#include "code\game\objects\effects\temporary_visuals\temporary_visual.dm"
@@ -1127,7 +1188,6 @@
#include "code\game\objects\items\cardboard_cutouts.dm"
#include "code\game\objects\items\cards_ids.dm"
#include "code\game\objects\items\cash.dm"
-#include "code\game\objects\items\chainsaw.dm"
#include "code\game\objects\items\charter.dm"
#include "code\game\objects\items\chromosome.dm"
#include "code\game\objects\items\chrono_eraser.dm"
@@ -1147,19 +1207,16 @@
#include "code\game\objects\items\dna_injector.dm"
#include "code\game\objects\items\documents.dm"
#include "code\game\objects\items\door_seal.dm"
-#include "code\game\objects\items\dualsaber.dm"
#include "code\game\objects\items\dyekit.dm"
#include "code\game\objects\items\eightball.dm"
-#include "code\game\objects\items\energyhalberd.dm"
#include "code\game\objects\items\etherealdiscoball.dm"
#include "code\game\objects\items\extinguisher.dm"
-#include "code\game\objects\items\fireaxe.dm"
#include "code\game\objects\items\flamethrower.dm"
+#include "code\game\objects\items\gear_packs.dm"
#include "code\game\objects\items\gift.dm"
#include "code\game\objects\items\granters.dm"
#include "code\game\objects\items\handcuffs.dm"
#include "code\game\objects\items\holosign_creator.dm"
-#include "code\game\objects\items\holy_weapons.dm"
#include "code\game\objects\items\hot_potato.dm"
#include "code\game\objects\items\hourglass.dm"
#include "code\game\objects\items\inducer.dm"
@@ -1172,10 +1229,8 @@
#include "code\game\objects\items\paiwire.dm"
#include "code\game\objects\items\pet_carrier.dm"
#include "code\game\objects\items\pinpointer.dm"
-#include "code\game\objects\items\pitchfork.dm"
#include "code\game\objects\items\plushes.dm"
#include "code\game\objects\items\pneumaticCannon.dm"
-#include "code\game\objects\items\powerfist.dm"
#include "code\game\objects\items\puzzle_pieces.dm"
#include "code\game\objects\items\RCD.dm"
#include "code\game\objects\items\RCL.dm"
@@ -1189,20 +1244,24 @@
#include "code\game\objects\items\shrapnel.dm"
#include "code\game\objects\items\shuttle_creator.dm"
#include "code\game\objects\items\signs.dm"
-#include "code\game\objects\items\singularityhammer.dm"
-#include "code\game\objects\items\spear.dm"
-#include "code\game\objects\items\stunbaton.dm"
#include "code\game\objects\items\survery_handheld.dm"
#include "code\game\objects\items\taster.dm"
#include "code\game\objects\items\teleportation.dm"
-#include "code\game\objects\items\teleprod.dm"
#include "code\game\objects\items\theft_tools.dm"
#include "code\game\objects\items\toy_mechs.dm"
#include "code\game\objects\items\toys.dm"
#include "code\game\objects\items\trash.dm"
#include "code\game\objects\items\vending_items.dm"
#include "code\game\objects\items\wayfinding.dm"
-#include "code\game\objects\items\weaponry.dm"
+#include "code\game\objects\items\attachments\_attachment.dm"
+#include "code\game\objects\items\attachments\bayonet.dm"
+#include "code\game\objects\items\attachments\energy_bayonet.dm"
+#include "code\game\objects\items\attachments\laser_sight.dm"
+#include "code\game\objects\items\attachments\m17_barrel.dm"
+#include "code\game\objects\items\attachments\rail_light.dm"
+#include "code\game\objects\items\attachments\shoulder_sling.dm"
+#include "code\game\objects\items\attachments\silencer.dm"
+#include "code\game\objects\items\attachments\stock.dm"
#include "code\game\objects\items\circuitboards\circuitboard.dm"
#include "code\game\objects\items\circuitboards\computer_circuitboards.dm"
#include "code\game\objects\items\circuitboards\machine_circuitboards.dm"
@@ -1229,7 +1288,6 @@
#include "code\game\objects\items\devices\powersink.dm"
#include "code\game\objects\items\devices\pressureplates.dm"
#include "code\game\objects\items\devices\quantum_keycard.dm"
-#include "code\game\objects\items\devices\reverse_bear_trap.dm"
#include "code\game\objects\items\devices\scanners.dm"
#include "code\game\objects\items\devices\sensor_device.dm"
#include "code\game\objects\items\devices\spyglasses.dm"
@@ -1247,6 +1305,10 @@
#include "code\game\objects\items\devices\radio\headset.dm"
#include "code\game\objects\items\devices\radio\intercom.dm"
#include "code\game\objects\items\devices\radio\radio.dm"
+#include "code\game\objects\items\food\_food.dm"
+#include "code\game\objects\items\food\bread.dm"
+#include "code\game\objects\items\food\cake.dm"
+#include "code\game\objects\items\food\spaghetti.dm"
#include "code\game\objects\items\grenades\antigravity.dm"
#include "code\game\objects\items\grenades\chem_grenade.dm"
#include "code\game\objects\items\grenades\clusterbuster.dm"
@@ -1281,9 +1343,20 @@
#include "code\game\objects\items\implants\implanter.dm"
#include "code\game\objects\items\implants\implantpad.dm"
#include "code\game\objects\items\implants\implantuplink.dm"
+#include "code\game\objects\items\melee\chainsaw.dm"
+#include "code\game\objects\items\melee\dualsaber.dm"
#include "code\game\objects\items\melee\energy.dm"
+#include "code\game\objects\items\melee\energyhalberd.dm"
+#include "code\game\objects\items\melee\fireaxe.dm"
+#include "code\game\objects\items\melee\knife.dm"
#include "code\game\objects\items\melee\misc.dm"
-#include "code\game\objects\items\melee\transforming.dm"
+#include "code\game\objects\items\melee\powerfist.dm"
+#include "code\game\objects\items\melee\spear.dm"
+#include "code\game\objects\items\melee\stunbaton.dm"
+#include "code\game\objects\items\melee\sword.dm"
+#include "code\game\objects\items\melee\teleprod.dm"
+#include "code\game\objects\items\melee\trickweapon.dm"
+#include "code\game\objects\items\melee\weaponry.dm"
#include "code\game\objects\items\robot\ai_upgrades.dm"
#include "code\game\objects\items\robot\robot_items.dm"
#include "code\game\objects\items\robot\robot_parts.dm"
@@ -1310,13 +1383,16 @@
#include "code\game\objects\items\stacks\tiles\tile_reskinning.dm"
#include "code\game\objects\items\stacks\tiles\tile_types.dm"
#include "code\game\objects\items\stacks\tiles\tiles_suns.dm"
+#include "code\game\objects\items\storage\ammo_can.dm"
#include "code\game\objects\items\storage\backpack.dm"
#include "code\game\objects\items\storage\bags.dm"
#include "code\game\objects\items\storage\belt.dm"
#include "code\game\objects\items\storage\book.dm"
#include "code\game\objects\items\storage\boxes.dm"
#include "code\game\objects\items\storage\briefcase.dm"
+#include "code\game\objects\items\storage\cases.dm"
#include "code\game\objects\items\storage\fancy.dm"
+#include "code\game\objects\items\storage\filled_guncases.dm"
#include "code\game\objects\items\storage\firstaid.dm"
#include "code\game\objects\items\storage\guncases.dm"
#include "code\game\objects\items\storage\holsters.dm"
@@ -1334,6 +1410,7 @@
#include "code\game\objects\items\tanks\watertank.dm"
#include "code\game\objects\items\tools\chisel.dm"
#include "code\game\objects\items\tools\crowbar.dm"
+#include "code\game\objects\items\tools\electric_weldingtool.dm"
#include "code\game\objects\items\tools\screwdriver.dm"
#include "code\game\objects\items\tools\weldingtool.dm"
#include "code\game\objects\items\tools\wirecutters.dm"
@@ -1342,6 +1419,8 @@
#include "code\game\objects\structures\artstuff.dm"
#include "code\game\objects\structures\barsigns.dm"
#include "code\game\objects\structures\bedsheet_bin.dm"
+#include "code\game\objects\structures\cabinet.dm"
+#include "code\game\objects\structures\cabinet_types.dm"
#include "code\game\objects\structures\catwalk.dm"
#include "code\game\objects\structures\crateshelf.dm"
#include "code\game\objects\structures\curtains.dm"
@@ -1355,17 +1434,16 @@
#include "code\game\objects\structures\extinguisher.dm"
#include "code\game\objects\structures\false_walls.dm"
#include "code\game\objects\structures\fence.dm"
-#include "code\game\objects\structures\fireaxe.dm"
#include "code\game\objects\structures\fireplace.dm"
#include "code\game\objects\structures\flora.dm"
#include "code\game\objects\structures\fluff.dm"
+#include "code\game\objects\structures\geyser.dm"
#include "code\game\objects\structures\ghost_role_spawners.dm"
#include "code\game\objects\structures\girders.dm"
#include "code\game\objects\structures\grille.dm"
#include "code\game\objects\structures\guillotine.dm"
#include "code\game\objects\structures\guncase.dm"
#include "code\game\objects\structures\headpike.dm"
-#include "code\game\objects\structures\hivebot.dm"
#include "code\game\objects\structures\holosign.dm"
#include "code\game\objects\structures\janicart.dm"
#include "code\game\objects\structures\kitchen_spike.dm"
@@ -1382,6 +1460,7 @@
#include "code\game\objects\structures\noticeboard.dm"
#include "code\game\objects\structures\petrified_statue.dm"
#include "code\game\objects\structures\plasticflaps.dm"
+#include "code\game\objects\structures\platforms.dm"
#include "code\game\objects\structures\poddoor_assembly.dm"
#include "code\game\objects\structures\printer.dm"
#include "code\game\objects\structures\radioactive.dm"
@@ -1393,7 +1472,6 @@
#include "code\game\objects\structures\showcase.dm"
#include "code\game\objects\structures\shower.dm"
#include "code\game\objects\structures\signs.dm"
-#include "code\game\objects\structures\spawner.dm"
#include "code\game\objects\structures\spirit_board.dm"
#include "code\game\objects\structures\stairs.dm"
#include "code\game\objects\structures\statues.dm"
@@ -1440,12 +1518,10 @@
#include "code\game\objects\structures\crates_lockers\closets\secure\security.dm"
#include "code\game\objects\structures\crates_lockers\crates\bins.dm"
#include "code\game\objects\structures\crates_lockers\crates\critter.dm"
+#include "code\game\objects\structures\crates_lockers\crates\graves.dm"
#include "code\game\objects\structures\crates_lockers\crates\large.dm"
#include "code\game\objects\structures\crates_lockers\crates\secure.dm"
#include "code\game\objects\structures\crates_lockers\crates\wooden.dm"
-#include "code\game\objects\structures\icemoon\cave_entrance.dm"
-#include "code\game\objects\structures\lavaland\geyser.dm"
-#include "code\game\objects\structures\lavaland\necropolis_tendril.dm"
#include "code\game\objects\structures\plaques\_plaques.dm"
#include "code\game\objects\structures\plaques\static_plaques.dm"
#include "code\game\objects\structures\signs\_signs.dm"
@@ -1461,6 +1537,7 @@
#include "code\game\turfs\change_turf.dm"
#include "code\game\turfs\turf.dm"
#include "code\game\turfs\closed\_closed.dm"
+#include "code\game\turfs\closed\indestructible.dm"
#include "code\game\turfs\closed\minerals.dm"
#include "code\game\turfs\closed\walls.dm"
#include "code\game\turfs\closed\wall\conc_walls.dm"
@@ -1492,6 +1569,7 @@
#include "code\game\turfs\open\floor\plating\asteroid.dm"
#include "code\game\turfs\open\floor\plating\beach.dm"
#include "code\game\turfs\open\floor\plating\icemoon.dm"
+#include "code\game\turfs\open\floor\plating\jungle.dm"
#include "code\game\turfs\open\floor\plating\lavaland.dm"
#include "code\game\turfs\open\floor\plating\misc_plating.dm"
#include "code\game\turfs\open\floor\plating\planet.dm"
@@ -1622,34 +1700,6 @@
#include "code\modules\antagonists\abductor\machinery\experiment.dm"
#include "code\modules\antagonists\abductor\machinery\pad.dm"
#include "code\modules\antagonists\ashwalker\ashwalker.dm"
-#include "code\modules\antagonists\blob\blob.dm"
-#include "code\modules\antagonists\blob\blob_mobs.dm"
-#include "code\modules\antagonists\blob\blob_report.dm"
-#include "code\modules\antagonists\blob\overmind.dm"
-#include "code\modules\antagonists\blob\powers.dm"
-#include "code\modules\antagonists\blob\blobstrains\_blobstrain.dm"
-#include "code\modules\antagonists\blob\blobstrains\_reagent.dm"
-#include "code\modules\antagonists\blob\blobstrains\blazing_oil.dm"
-#include "code\modules\antagonists\blob\blobstrains\cryogenic_poison.dm"
-#include "code\modules\antagonists\blob\blobstrains\debris_devourer.dm"
-#include "code\modules\antagonists\blob\blobstrains\distributed_neurons.dm"
-#include "code\modules\antagonists\blob\blobstrains\electromagnetic_web.dm"
-#include "code\modules\antagonists\blob\blobstrains\energized_jelly.dm"
-#include "code\modules\antagonists\blob\blobstrains\explosive_lattice.dm"
-#include "code\modules\antagonists\blob\blobstrains\multiplex.dm"
-#include "code\modules\antagonists\blob\blobstrains\networked_fibers.dm"
-#include "code\modules\antagonists\blob\blobstrains\pressurized_slime.dm"
-#include "code\modules\antagonists\blob\blobstrains\reactive_spines.dm"
-#include "code\modules\antagonists\blob\blobstrains\regenerative_materia.dm"
-#include "code\modules\antagonists\blob\blobstrains\replicating_foam.dm"
-#include "code\modules\antagonists\blob\blobstrains\shifting_fragments.dm"
-#include "code\modules\antagonists\blob\blobstrains\synchronous_mesh.dm"
-#include "code\modules\antagonists\blob\structures\_blob.dm"
-#include "code\modules\antagonists\blob\structures\core.dm"
-#include "code\modules\antagonists\blob\structures\factory.dm"
-#include "code\modules\antagonists\blob\structures\node.dm"
-#include "code\modules\antagonists\blob\structures\resource.dm"
-#include "code\modules\antagonists\blob\structures\shield.dm"
#include "code\modules\antagonists\blood_contract\blood_contract.dm"
#include "code\modules\antagonists\borer\borer.dm"
#include "code\modules\antagonists\borer\borer_chems.dm"
@@ -1684,21 +1734,6 @@
#include "code\modules\antagonists\changeling\powers\strained_muscles.dm"
#include "code\modules\antagonists\changeling\powers\tiny_prick.dm"
#include "code\modules\antagonists\changeling\powers\transform.dm"
-#include "code\modules\antagonists\cult\blood_magic.dm"
-#include "code\modules\antagonists\cult\cult.dm"
-#include "code\modules\antagonists\cult\cult_comms.dm"
-#include "code\modules\antagonists\cult\cult_items.dm"
-#include "code\modules\antagonists\cult\cult_structures.dm"
-#include "code\modules\antagonists\cult\cult_turf_overlay.dm"
-#include "code\modules\antagonists\cult\ritual.dm"
-#include "code\modules\antagonists\cult\rune_spawn_action.dm"
-#include "code\modules\antagonists\cult\runes.dm"
-#include "code\modules\antagonists\devil\devil.dm"
-#include "code\modules\antagonists\devil\imp\imp.dm"
-#include "code\modules\antagonists\devil\sintouched\objectives.dm"
-#include "code\modules\antagonists\devil\sintouched\sintouched.dm"
-#include "code\modules\antagonists\devil\true_devil\_true_devil.dm"
-#include "code\modules\antagonists\devil\true_devil\inventory.dm"
#include "code\modules\antagonists\disease\disease_abilities.dm"
#include "code\modules\antagonists\disease\disease_datum.dm"
#include "code\modules\antagonists\disease\disease_disease.dm"
@@ -1706,10 +1741,12 @@
#include "code\modules\antagonists\disease\disease_mob.dm"
#include "code\modules\antagonists\ert\ert.dm"
#include "code\modules\antagonists\ert\frontiersmen.dm"
+#include "code\modules\antagonists\ert\gezena.dm"
#include "code\modules\antagonists\ert\indie.dm"
#include "code\modules\antagonists\ert\inteq.dm"
#include "code\modules\antagonists\ert\minutemen.dm"
#include "code\modules\antagonists\ert\nanotrasen.dm"
+#include "code\modules\antagonists\ert\roumain.dm"
#include "code\modules\antagonists\ert\solgov.dm"
#include "code\modules\antagonists\ert\syndicate.dm"
#include "code\modules\antagonists\gang\outfits.dm"
@@ -1737,8 +1774,6 @@
#include "code\modules\antagonists\slaughter\slaughterevent.dm"
#include "code\modules\antagonists\space_dragon\space_dragon.dm"
#include "code\modules\antagonists\survivalist\survivalist.dm"
-#include "code\modules\antagonists\swarmer\swarmer.dm"
-#include "code\modules\antagonists\swarmer\swarmer_event.dm"
#include "code\modules\antagonists\traitor\datum_traitor.dm"
#include "code\modules\antagonists\traitor\syndicate_contract.dm"
#include "code\modules\antagonists\traitor\equipment\contractor.dm"
@@ -1749,9 +1784,9 @@
#include "code\modules\antagonists\valentines\valentine.dm"
#include "code\modules\antagonists\wizard\wizard.dm"
#include "code\modules\antagonists\wizard\equipment\artefact.dm"
-#include "code\modules\antagonists\wizard\equipment\soulstone.dm"
#include "code\modules\antagonists\wizard\equipment\spellbook.dm"
#include "code\modules\antagonists\xeno\xeno.dm"
+#include "code\modules\assembly\anomalies.dm"
#include "code\modules\assembly\assembly.dm"
#include "code\modules\assembly\bomb.dm"
#include "code\modules\assembly\doorcontrol.dm"
@@ -1848,17 +1883,11 @@
#include "code\modules\awaymissions\zlevel.dm"
#include "code\modules\awaymissions\mission_code\Academy.dm"
#include "code\modules\awaymissions\mission_code\Cabin.dm"
-#include "code\modules\awaymissions\mission_code\caves.dm"
#include "code\modules\awaymissions\mission_code\centcomAway.dm"
#include "code\modules\awaymissions\mission_code\challenge.dm"
-#include "code\modules\awaymissions\mission_code\moonoutpost19.dm"
#include "code\modules\awaymissions\mission_code\murderdome.dm"
-#include "code\modules\awaymissions\mission_code\research.dm"
#include "code\modules\awaymissions\mission_code\snowdin.dm"
#include "code\modules\awaymissions\mission_code\spacebattle.dm"
-#include "code\modules\awaymissions\mission_code\stationCollision.dm"
-#include "code\modules\awaymissions\mission_code\undergroundoutpost45.dm"
-#include "code\modules\awaymissions\mission_code\wildwest.dm"
#include "code\modules\balloon_alert\balloon_alert.dm"
#include "code\modules\buildmode\bm_mode.dm"
#include "code\modules\buildmode\buildmode.dm"
@@ -1871,6 +1900,7 @@
#include "code\modules\buildmode\submodes\copy.dm"
#include "code\modules\buildmode\submodes\delete.dm"
#include "code\modules\buildmode\submodes\fill.dm"
+#include "code\modules\buildmode\submodes\lightmaker.dm"
#include "code\modules\buildmode\submodes\map_export.dm"
#include "code\modules\buildmode\submodes\outfit.dm"
#include "code\modules\buildmode\submodes\proccall.dm"
@@ -1881,9 +1911,9 @@
#include "code\modules\cargo\bounty.dm"
#include "code\modules\cargo\bounty_console.dm"
#include "code\modules\cargo\centcom_podlauncher.dm"
+#include "code\modules\cargo\console.dm"
#include "code\modules\cargo\export_scanner.dm"
#include "code\modules\cargo\exports.dm"
-#include "code\modules\cargo\expressconsole.dm"
#include "code\modules\cargo\gondolapod.dm"
#include "code\modules\cargo\order.dm"
#include "code\modules\cargo\packs.dm"
@@ -1893,11 +1923,13 @@
#include "code\modules\cargo\blackmarket\blackmarket_market.dm"
#include "code\modules\cargo\blackmarket\blackmarket_telepad.dm"
#include "code\modules\cargo\blackmarket\blackmarket_uplink.dm"
+#include "code\modules\cargo\blackmarket\blackmarket_items\ammo.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\clothing.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\consumables.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\emergency.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\explosives.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\misc.dm"
+#include "code\modules\cargo\blackmarket\blackmarket_items\tech.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\tools.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\weapons.dm"
#include "code\modules\cargo\bounties\assistant.dm"
@@ -1911,7 +1943,6 @@
#include "code\modules\cargo\bounties\reagent.dm"
#include "code\modules\cargo\bounties\science.dm"
#include "code\modules\cargo\bounties\security.dm"
-#include "code\modules\cargo\bounties\slime.dm"
#include "code\modules\cargo\bounties\special.dm"
#include "code\modules\cargo\bounties\virus.dm"
#include "code\modules\cargo\exports\gear.dm"
@@ -1931,9 +1962,11 @@
#include "code\modules\cargo\packs\costumes_toys.dm"
#include "code\modules\cargo\packs\emergency.dm"
#include "code\modules\cargo\packs\exploration.dm"
+#include "code\modules\cargo\packs\fishing.dm"
#include "code\modules\cargo\packs\food.dm"
#include "code\modules\cargo\packs\gun.dm"
#include "code\modules\cargo\packs\machinery.dm"
+#include "code\modules\cargo\packs\magazines.dm"
#include "code\modules\cargo\packs\material.dm"
#include "code\modules\cargo\packs\mechs.dm"
#include "code\modules\cargo\packs\medical.dm"
@@ -2002,15 +2035,16 @@
#include "code\modules\clothing\masks\hailer.dm"
#include "code\modules\clothing\masks\miscellaneous.dm"
#include "code\modules\clothing\neck\_neck.dm"
-#include "code\modules\clothing\outfits\event.dm"
#include "code\modules\clothing\outfits\plasmaman.dm"
#include "code\modules\clothing\outfits\standard.dm"
#include "code\modules\clothing\outfits\vv_outfit.dm"
#include "code\modules\clothing\outfits\ert\frontiersmen_ert.dm"
+#include "code\modules\clothing\outfits\ert\gezena_ert.dm"
#include "code\modules\clothing\outfits\ert\indie_ert.dm"
#include "code\modules\clothing\outfits\ert\inteq_ert.dm"
#include "code\modules\clothing\outfits\ert\minutemen_ert.dm"
#include "code\modules\clothing\outfits\ert\nanotrasen_ert.dm"
+#include "code\modules\clothing\outfits\ert\roumain_ert.dm"
#include "code\modules\clothing\outfits\ert\solgov_ert.dm"
#include "code\modules\clothing\outfits\ert\syndicate_ert.dm"
#include "code\modules\clothing\outfits\factions\frontiersmen.dm"
@@ -2023,7 +2057,6 @@
#include "code\modules\clothing\outfits\factions\solgov.dm"
#include "code\modules\clothing\outfits\factions\syndicate.dm"
#include "code\modules\clothing\shoes\_shoes.dm"
-#include "code\modules\clothing\shoes\bananashoes.dm"
#include "code\modules\clothing\shoes\colour.dm"
#include "code\modules\clothing\shoes\magboots.dm"
#include "code\modules\clothing\shoes\miscellaneous.dm"
@@ -2094,14 +2127,12 @@
#include "code\modules\events\abductor.dm"
#include "code\modules\events\alien_infestation.dm"
#include "code\modules\events\aurora_caelus.dm"
-#include "code\modules\events\blob.dm"
#include "code\modules\events\borers.dm"
#include "code\modules\events\brain_trauma.dm"
#include "code\modules\events\brand_intelligence.dm"
#include "code\modules\events\camerafailure.dm"
#include "code\modules\events\carp_migration.dm"
#include "code\modules\events\communications_blackout.dm"
-#include "code\modules\events\devil.dm"
#include "code\modules\events\disease_outbreak.dm"
#include "code\modules\events\dust.dm"
#include "code\modules\events\electrical_storm.dm"
@@ -2113,10 +2144,7 @@
#include "code\modules\events\high_priority_bounty.dm"
#include "code\modules\events\immovable_rod.dm"
#include "code\modules\events\ion_storm.dm"
-#include "code\modules\events\major_dust.dm"
#include "code\modules\events\mass_hallucination.dm"
-#include "code\modules\events\meateor_wave.dm"
-#include "code\modules\events\meteor_wave.dm"
#include "code\modules\events\nightmare.dm"
#include "code\modules\events\operative.dm"
#include "code\modules\events\prison_break.dm"
@@ -2127,15 +2155,12 @@
#include "code\modules\events\spacevine.dm"
#include "code\modules\events\spider_infestation.dm"
#include "code\modules\events\spontaneous_appendicitis.dm"
-#include "code\modules\events\stray_cargo.dm"
#include "code\modules\events\vent_clog.dm"
#include "code\modules\events\wormholes.dm"
#include "code\modules\events\holiday\halloween.dm"
#include "code\modules\events\holiday\vday.dm"
#include "code\modules\events\holiday\xmas.dm"
#include "code\modules\events\wizard\aid.dm"
-#include "code\modules\events\wizard\blobies.dm"
-#include "code\modules\events\wizard\curseditems.dm"
#include "code\modules\events\wizard\departmentrevolt.dm"
#include "code\modules\events\wizard\embeddies.dm"
#include "code\modules\events\wizard\fakeexplosion.dm"
@@ -2149,6 +2174,7 @@
#include "code\modules\events\wizard\rpgloot.dm"
#include "code\modules\events\wizard\shuffle.dm"
#include "code\modules\events\wizard\summons.dm"
+#include "code\modules\faction\faction_datum.dm"
#include "code\modules\fishing\bait.dm"
#include "code\modules\fishing\fish_catalog.dm"
#include "code\modules\fishing\fishing_equipment.dm"
@@ -2176,9 +2202,7 @@
#include "code\modules\food_and_drinks\food\customizables.dm"
#include "code\modules\food_and_drinks\food\ration.dm"
#include "code\modules\food_and_drinks\food\snacks.dm"
-#include "code\modules\food_and_drinks\food\snacks_bread.dm"
#include "code\modules\food_and_drinks\food\snacks_burgers.dm"
-#include "code\modules\food_and_drinks\food\snacks_cake.dm"
#include "code\modules\food_and_drinks\food\snacks_egg.dm"
#include "code\modules\food_and_drinks\food\snacks_frozen.dm"
#include "code\modules\food_and_drinks\food\snacks_meat.dm"
@@ -2189,7 +2213,6 @@
#include "code\modules\food_and_drinks\food\snacks_salad.dm"
#include "code\modules\food_and_drinks\food\snacks_sandwichtoast.dm"
#include "code\modules\food_and_drinks\food\snacks_soup.dm"
-#include "code\modules\food_and_drinks\food\snacks_spaghetti.dm"
#include "code\modules\food_and_drinks\food\snacks_vend.dm"
#include "code\modules\food_and_drinks\food\snacks\dough.dm"
#include "code\modules\food_and_drinks\food\snacks\meat.dm"
@@ -2201,7 +2224,6 @@
#include "code\modules\food_and_drinks\kitchen_machinery\grill.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\microwave.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\monkeyrecycler.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\processor.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\smartfridge.dm"
#include "code\modules\food_and_drinks\recipes\drinks_recipes.dm"
@@ -2247,6 +2269,8 @@
#include "code\modules\hydroponics\beekeeping\beekeeper_suit.dm"
#include "code\modules\hydroponics\beekeeping\honey_frame.dm"
#include "code\modules\hydroponics\beekeeping\honeycomb.dm"
+#include "code\modules\hydroponics\genes\attack.dm"
+#include "code\modules\hydroponics\genes\backfire.dm"
#include "code\modules\hydroponics\grown\ambrosia.dm"
#include "code\modules\hydroponics\grown\apple.dm"
#include "code\modules\hydroponics\grown\banana.dm"
@@ -2373,7 +2397,6 @@
#include "code\modules\language\teceti_unified.dm"
#include "code\modules\language\vox_pidgin.dm"
#include "code\modules\language\xenocommon.dm"
-#include "code\modules\library\lib_codex_gigas.dm"
#include "code\modules\library\lib_items.dm"
#include "code\modules\library\lib_machines.dm"
#include "code\modules\library\random_books.dm"
@@ -2421,6 +2444,7 @@
#include "code\modules\mining\ores_coins.dm"
#include "code\modules\mining\satchel_ore_boxdm.dm"
#include "code\modules\mining\shelters.dm"
+#include "code\modules\mining\equipment\angle_grinder.dm"
#include "code\modules\mining\equipment\explorer_gear.dm"
#include "code\modules\mining\equipment\kinetic_crusher.dm"
#include "code\modules\mining\equipment\lazarus_injector.dm"
@@ -2655,11 +2679,9 @@
#include "code\modules\mob\living\silicon\robot\robot_movement.dm"
#include "code\modules\mob\living\silicon\robot\robot_say.dm"
#include "code\modules\mob\living\simple_animal\animal_defense.dm"
-#include "code\modules\mob\living\simple_animal\constructs.dm"
#include "code\modules\mob\living\simple_animal\corpse.dm"
#include "code\modules\mob\living\simple_animal\damage_procs.dm"
#include "code\modules\mob\living\simple_animal\parrot.dm"
-#include "code\modules\mob\living\simple_animal\shade.dm"
#include "code\modules\mob\living\simple_animal\simple_animal.dm"
#include "code\modules\mob\living\simple_animal\status_procs.dm"
#include "code\modules\mob\living\simple_animal\bot\bot.dm"
@@ -2701,19 +2723,6 @@
#include "code\modules\mob\living\simple_animal\friendly\drone\inventory.dm"
#include "code\modules\mob\living\simple_animal\friendly\drone\verbs.dm"
#include "code\modules\mob\living\simple_animal\friendly\drone\visuals_icons.dm"
-#include "code\modules\mob\living\simple_animal\guardian\guardian.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\assassin.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\charger.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\dextrous.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\explosive.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\fire.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\gravitokinetic.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\lightning.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\protector.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\ranged.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\slime.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\standard.dm"
-#include "code\modules\mob\living\simple_animal\guardian\types\support.dm"
#include "code\modules\mob\living\simple_animal\hostile\abandoned_minebot.dm"
#include "code\modules\mob\living\simple_animal\hostile\alien.dm"
#include "code\modules\mob\living\simple_animal\hostile\bear.dm"
@@ -2744,7 +2753,6 @@
#include "code\modules\mob\living\simple_animal\hostile\gorilla\emotes.dm"
#include "code\modules\mob\living\simple_animal\hostile\gorilla\gorilla.dm"
#include "code\modules\mob\living\simple_animal\hostile\gorilla\visuals_icons.dm"
-#include "code\modules\mob\living\simple_animal\hostile\human\cat_butcher.dm"
#include "code\modules\mob\living\simple_animal\hostile\human\frontiersman.dm"
#include "code\modules\mob\living\simple_animal\hostile\human\human.dm"
#include "code\modules\mob\living\simple_animal\hostile\human\nanotrasen.dm"
@@ -2768,7 +2776,6 @@
#include "code\modules\mob\living\simple_animal\hostile\megafauna\hierophant.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\legion.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\megafauna.dm"
-#include "code\modules\mob\living\simple_animal\hostile\megafauna\swarmer.dm"
#include "code\modules\mob\living\simple_animal\hostile\megafauna\wendigo.dm"
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\basilisk.dm"
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\brimdemon.dm"
@@ -2778,8 +2785,8 @@
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\gutlunch.dm"
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\hivelord.dm"
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\hivelord_outfits.dm"
-#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\ice demon.dm"
-#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\ice whelp.dm"
+#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\ice_demon.dm"
+#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\ice_whelp.dm"
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\lobstrosity.dm"
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\mining_mobs.dm"
#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\polarbear.dm"
@@ -2802,6 +2809,34 @@
#include "code\modules\mob\living\simple_animal\slime\slime.dm"
#include "code\modules\mob\living\simple_animal\slime\slime_say.dm"
#include "code\modules\mob\living\simple_animal\slime\subtypes.dm"
+#include "code\modules\mob_spawner\burrow.dm"
+#include "code\modules\mob_spawner\hivebot.dm"
+#include "code\modules\mob_spawner\spawner.dm"
+#include "code\modules\mob_spawner\spawner_componet.dm"
+#include "code\modules\mod\mod_actions.dm"
+#include "code\modules\mod\mod_activation.dm"
+#include "code\modules\mod\mod_ai.dm"
+#include "code\modules\mod\mod_clothes.dm"
+#include "code\modules\mod\mod_construction.dm"
+#include "code\modules\mod\mod_control.dm"
+#include "code\modules\mod\mod_core.dm"
+#include "code\modules\mod\mod_paint.dm"
+#include "code\modules\mod\mod_theme.dm"
+#include "code\modules\mod\mod_types.dm"
+#include "code\modules\mod\mod_ui.dm"
+#include "code\modules\mod\modules\_module.dm"
+#include "code\modules\mod\modules\modules_antag.dm"
+#include "code\modules\mod\modules\modules_engineering.dm"
+#include "code\modules\mod\modules\modules_general.dm"
+#include "code\modules\mod\modules\modules_maint.dm"
+#include "code\modules\mod\modules\modules_medical.dm"
+#include "code\modules\mod\modules\modules_ninja.dm"
+#include "code\modules\mod\modules\modules_science.dm"
+#include "code\modules\mod\modules\modules_security.dm"
+#include "code\modules\mod\modules\modules_service.dm"
+#include "code\modules\mod\modules\modules_storage.dm"
+#include "code\modules\mod\modules\modules_supply.dm"
+#include "code\modules\mod\modules\modules_visor.dm"
#include "code\modules\modular_computers\laptop_vendor.dm"
#include "code\modules\modular_computers\computers\_modular_computer_shared.dm"
#include "code\modules\modular_computers\computers\item\computer.dm"
@@ -2862,7 +2897,6 @@
#include "code\modules\movespeed\modifiers\misc.dm"
#include "code\modules\movespeed\modifiers\mobs.dm"
#include "code\modules\movespeed\modifiers\reagent.dm"
-#include "code\modules\movespeed\modifiers\status_effects.dm"
#include "code\modules\ninja\__ninjaDefines.dm"
#include "code\modules\ninja\energy_katana.dm"
#include "code\modules\ninja\ninja_event.dm"
@@ -2976,7 +3010,6 @@
#include "code\modules\power\singularity\field_generator.dm"
#include "code\modules\power\singularity\generator.dm"
#include "code\modules\power\singularity\investigate.dm"
-#include "code\modules\power\singularity\narsie.dm"
#include "code\modules\power\singularity\singularity.dm"
#include "code\modules\power\singularity\particle_accelerator\particle.dm"
#include "code\modules\power\singularity\particle_accelerator\particle_accelerator.dm"
@@ -2989,7 +3022,7 @@
#include "code\modules\power\tesla\generator.dm"
#include "code\modules\projectiles\gun.dm"
#include "code\modules\projectiles\projectile.dm"
-#include "code\modules\projectiles\ammunition\_ammunition.dm"
+#include "code\modules\projectiles\ammunition\_ammo_casing.dm"
#include "code\modules\projectiles\ammunition\_firing.dm"
#include "code\modules\projectiles\ammunition\ballistic\lmg.dm"
#include "code\modules\projectiles\ammunition\ballistic\pistol.dm"
@@ -3016,11 +3049,19 @@
#include "code\modules\projectiles\ammunition\special\magic.dm"
#include "code\modules\projectiles\ammunition\special\syringe.dm"
#include "code\modules\projectiles\boxes_magazines\_box_magazine.dm"
-#include "code\modules\projectiles\boxes_magazines\ammo_boxes.dm"
-#include "code\modules\projectiles\boxes_magazines\generic_ammo_box.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_loaders.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stacks\_ammo_stack.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\_premade_stacks.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_gauss_stacks.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_lmg_stacks.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_misc_stacks.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_pistol_stacks.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_rifle_stacks.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_shotshell_stacks.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_smg_stacks.dm"
+#include "code\modules\projectiles\boxes_magazines\ammo_stacks\prefab_stacks\premade_sniper_stacks.dm"
#include "code\modules\projectiles\boxes_magazines\external\gauss.dm"
#include "code\modules\projectiles\boxes_magazines\external\grenade.dm"
-#include "code\modules\projectiles\boxes_magazines\external\lmg.dm"
#include "code\modules\projectiles\boxes_magazines\external\pistol.dm"
#include "code\modules\projectiles\boxes_magazines\external\rechargable.dm"
#include "code\modules\projectiles\boxes_magazines\external\rifle.dm"
@@ -3063,7 +3104,15 @@
#include "code\modules\projectiles\guns\energy\pulse.dm"
#include "code\modules\projectiles\guns\energy\special.dm"
#include "code\modules\projectiles\guns\energy\stun.dm"
+#include "code\modules\projectiles\guns\manufacturer\clip_lanchester\ballistics.dm"
+#include "code\modules\projectiles\guns\manufacturer\clip_lanchester\lasers.dm"
#include "code\modules\projectiles\guns\manufacturer\etherbor\energy_gunsword.dm"
+#include "code\modules\projectiles\guns\manufacturer\frontier_import\ballistics.dm"
+#include "code\modules\projectiles\guns\manufacturer\hunter_pride\ballistics.dm"
+#include "code\modules\projectiles\guns\manufacturer\nanotrasen_sharplite\ballistics.dm"
+#include "code\modules\projectiles\guns\manufacturer\scarborough\ballistics.dm"
+#include "code\modules\projectiles\guns\manufacturer\serene_sporting\ballistics.dm"
+#include "code\modules\projectiles\guns\manufacturer\solar_armories\ballistic.dm"
#include "code\modules\projectiles\guns\misc\beam_rifle.dm"
#include "code\modules\projectiles\guns\misc\blastcannon.dm"
#include "code\modules\projectiles\guns\misc\bow.dm"
@@ -3085,7 +3134,6 @@
#include "code\modules\projectiles\projectile\bullets\shotgun.dm"
#include "code\modules\projectiles\projectile\bullets\smg.dm"
#include "code\modules\projectiles\projectile\bullets\sniper.dm"
-#include "code\modules\projectiles\projectile\bullets\special.dm"
#include "code\modules\projectiles\projectile\bullets\turret.dm"
#include "code\modules\projectiles\projectile\energy\_energy.dm"
#include "code\modules\projectiles\projectile\energy\ebow.dm"
@@ -3124,7 +3172,6 @@
#include "code\modules\reagents\chemistry\machinery\pandemic.dm"
#include "code\modules\reagents\chemistry\machinery\reagentgrinder.dm"
#include "code\modules\reagents\chemistry\machinery\smoke_machine.dm"
-#include "code\modules\reagents\chemistry\reagents\alcohol_reagents.dm"
#include "code\modules\reagents\chemistry\reagents\cat2_medicine_reagents.dm"
#include "code\modules\reagents\chemistry\reagents\drink_reagents.dm"
#include "code\modules\reagents\chemistry\reagents\drug_reagents.dm"
@@ -3134,18 +3181,22 @@
#include "code\modules\reagents\chemistry\reagents\pyrotechnic_reagents.dm"
#include "code\modules\reagents\chemistry\reagents\toxin_reagents.dm"
#include "code\modules\reagents\chemistry\reagents\trickwine_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\alcohol_reagents\base_drinks.dm"
+#include "code\modules\reagents\chemistry\reagents\alcohol_reagents\ethanol.dm"
+#include "code\modules\reagents\chemistry\reagents\alcohol_reagents\fruit_wine.dm"
+#include "code\modules\reagents\chemistry\reagents\alcohol_reagents\mixed_drinks.dm"
#include "code\modules\reagents\chemistry\recipes\cat2_medicines.dm"
#include "code\modules\reagents\chemistry\recipes\drugs.dm"
#include "code\modules\reagents\chemistry\recipes\medicine.dm"
#include "code\modules\reagents\chemistry\recipes\others.dm"
#include "code\modules\reagents\chemistry\recipes\pyrotechnics.dm"
-#include "code\modules\reagents\chemistry\recipes\slime_extracts.dm"
#include "code\modules\reagents\chemistry\recipes\special.dm"
#include "code\modules\reagents\chemistry\recipes\toxins.dm"
#include "code\modules\reagents\reagent_containers\blood_pack.dm"
#include "code\modules\reagents\reagent_containers\borghydro.dm"
#include "code\modules\reagents\reagent_containers\bottle.dm"
#include "code\modules\reagents\reagent_containers\chem_pack.dm"
+#include "code\modules\reagents\reagent_containers\concrete_bags.dm"
#include "code\modules\reagents\reagent_containers\dropper.dm"
#include "code\modules\reagents\reagent_containers\glass.dm"
#include "code\modules\reagents\reagent_containers\hypospray.dm"
@@ -3173,7 +3224,6 @@
#include "code\modules\religion\rites.dm"
#include "code\modules\requests\request.dm"
#include "code\modules\requests\requests_manager.dm"
-#include "code\modules\research\bepis.dm"
#include "code\modules\research\designs.dm"
#include "code\modules\research\destructive_analyzer.dm"
#include "code\modules\research\experimentor.dm"
@@ -3238,41 +3288,23 @@
#include "code\modules\research\techweb\_techweb.dm"
#include "code\modules\research\techweb\_techweb_node.dm"
#include "code\modules\research\techweb\all_nodes.dm"
-#include "code\modules\research\xenobiology\xenobio_camera.dm"
-#include "code\modules\research\xenobiology\xenobiology.dm"
-#include "code\modules\research\xenobiology\crossbreeding\__corecross.dm"
-#include "code\modules\research\xenobiology\crossbreeding\_clothing.dm"
-#include "code\modules\research\xenobiology\crossbreeding\_misc.dm"
-#include "code\modules\research\xenobiology\crossbreeding\_mobs.dm"
-#include "code\modules\research\xenobiology\crossbreeding\_potions.dm"
-#include "code\modules\research\xenobiology\crossbreeding\_status_effects.dm"
-#include "code\modules\research\xenobiology\crossbreeding\_weapons.dm"
-#include "code\modules\research\xenobiology\crossbreeding\burning.dm"
-#include "code\modules\research\xenobiology\crossbreeding\charged.dm"
-#include "code\modules\research\xenobiology\crossbreeding\chilling.dm"
-#include "code\modules\research\xenobiology\crossbreeding\consuming.dm"
-#include "code\modules\research\xenobiology\crossbreeding\industrial.dm"
-#include "code\modules\research\xenobiology\crossbreeding\mutative.dm"
-#include "code\modules\research\xenobiology\crossbreeding\prismatic.dm"
-#include "code\modules\research\xenobiology\crossbreeding\recurring.dm"
-#include "code\modules\research\xenobiology\crossbreeding\regenerative.dm"
-#include "code\modules\research\xenobiology\crossbreeding\reproductive.dm"
-#include "code\modules\research\xenobiology\crossbreeding\selfsustaining.dm"
-#include "code\modules\research\xenobiology\crossbreeding\stabilized.dm"
#include "code\modules\ruins\rockplanet_ruin_code.dm"
#include "code\modules\ruins\icemoonruin_code\hydroponicslab.dm"
#include "code\modules\ruins\icemoonruin_code\library.dm"
+#include "code\modules\ruins\icemoonruin_code\tesla_lab.dm"
#include "code\modules\ruins\icemoonruin_code\wrath.dm"
#include "code\modules\ruins\lavalandruin_code\biodome_winter.dm"
-#include "code\modules\ruins\lavalandruin_code\elephantgraveyard.dm"
#include "code\modules\ruins\lavalandruin_code\puzzle.dm"
#include "code\modules\ruins\lavalandruin_code\surface.dm"
#include "code\modules\ruins\lavalandruin_code\syndicate_base.dm"
#include "code\modules\ruins\objects_and_mobs\ash_walker_den.dm"
#include "code\modules\ruins\objects_and_mobs\necropolis_gate.dm"
#include "code\modules\ruins\objects_and_mobs\sin_ruins.dm"
+#include "code\modules\ruins\rockplanet_ruin_code\mining_base.dm"
+#include "code\modules\ruins\sandplanet_ruin_code\cave_base.dm"
#include "code\modules\ruins\spaceruin_code\bigderelict1.dm"
#include "code\modules\ruins\spaceruin_code\TheDerelict.dm"
+#include "code\modules\ruins\wasteplanet_ruin_code\tradepost.dm"
#include "code\modules\screen_alerts\_screen_alerts.dm"
#include "code\modules\security_levels\keycard_authentication.dm"
#include "code\modules\security_levels\security_levels.dm"
@@ -3292,10 +3324,7 @@
#include "code\modules\spells\spell_types\bloodcrawl.dm"
#include "code\modules\spells\spell_types\charge.dm"
#include "code\modules\spells\spell_types\conjure.dm"
-#include "code\modules\spells\spell_types\construct_spells.dm"
#include "code\modules\spells\spell_types\curse.dm"
-#include "code\modules\spells\spell_types\devil.dm"
-#include "code\modules\spells\spell_types\devil_boons.dm"
#include "code\modules\spells\spell_types\emplosion.dm"
#include "code\modules\spells\spell_types\ethereal_jaunt.dm"
#include "code\modules\spells\spell_types\explosion.dm"
@@ -3336,7 +3365,6 @@
#include "code\modules\surgery\bone_repair.dm"
#include "code\modules\surgery\brain_surgery.dm"
#include "code\modules\surgery\cavity_implant.dm"
-#include "code\modules\surgery\core_removal.dm"
#include "code\modules\surgery\coronary_bypass.dm"
#include "code\modules\surgery\dental_implant.dm"
#include "code\modules\surgery\experimental_dissection.dm"
diff --git a/sound/ambience/storm_indoors.ogg b/sound/ambience/storm_indoors.ogg
new file mode 100644
index 00000000000..62e9014a05f
Binary files /dev/null and b/sound/ambience/storm_indoors.ogg differ
diff --git a/sound/ambience/storm_outdoors.ogg b/sound/ambience/storm_outdoors.ogg
new file mode 100644
index 00000000000..35ae8e5297d
Binary files /dev/null and b/sound/ambience/storm_outdoors.ogg differ
diff --git a/sound/effects/splatter.ogg b/sound/effects/splatter.ogg
new file mode 100644
index 00000000000..1c678cfe126
Binary files /dev/null and b/sound/effects/splatter.ogg differ
diff --git a/sound/health/bone/bone_break1.ogg b/sound/health/bone/bone_break1.ogg
new file mode 100644
index 00000000000..dd2d22ec792
Binary files /dev/null and b/sound/health/bone/bone_break1.ogg differ
diff --git a/sound/health/bone/bone_break2.ogg b/sound/health/bone/bone_break2.ogg
new file mode 100644
index 00000000000..aa2537f894d
Binary files /dev/null and b/sound/health/bone/bone_break2.ogg differ
diff --git a/sound/health/bone/bone_break3.ogg b/sound/health/bone/bone_break3.ogg
new file mode 100644
index 00000000000..9f66324be3b
Binary files /dev/null and b/sound/health/bone/bone_break3.ogg differ
diff --git a/sound/health/bone/bone_break4.ogg b/sound/health/bone/bone_break4.ogg
new file mode 100644
index 00000000000..bbdfac1ecff
Binary files /dev/null and b/sound/health/bone/bone_break4.ogg differ
diff --git a/sound/health/bone/bone_break5.ogg b/sound/health/bone/bone_break5.ogg
new file mode 100644
index 00000000000..dfee0e9baa7
Binary files /dev/null and b/sound/health/bone/bone_break5.ogg differ
diff --git a/sound/health/bone/bone_break6.ogg b/sound/health/bone/bone_break6.ogg
new file mode 100644
index 00000000000..d41cc8d7cf5
Binary files /dev/null and b/sound/health/bone/bone_break6.ogg differ
diff --git a/sound/items/modsuit/atrocinator_step.ogg b/sound/items/modsuit/atrocinator_step.ogg
new file mode 100644
index 00000000000..deda85ac354
Binary files /dev/null and b/sound/items/modsuit/atrocinator_step.ogg differ
diff --git a/2024-02-11 19 b/sound/items/modsuit/ballin.ogg
similarity index 100%
rename from 2024-02-11 19
rename to sound/items/modsuit/ballin.ogg
diff --git a/sound/items/modsuit/ballout.ogg b/sound/items/modsuit/ballout.ogg
new file mode 100644
index 00000000000..f911f1a6a61
Binary files /dev/null and b/sound/items/modsuit/ballout.ogg differ
diff --git a/sound/items/modsuit/flamethrower.ogg b/sound/items/modsuit/flamethrower.ogg
new file mode 100644
index 00000000000..447245d50b6
Binary files /dev/null and b/sound/items/modsuit/flamethrower.ogg differ
diff --git a/sound/items/modsuit/inflate_bloon.ogg b/sound/items/modsuit/inflate_bloon.ogg
new file mode 100644
index 00000000000..9b030d66ced
Binary files /dev/null and b/sound/items/modsuit/inflate_bloon.ogg differ
diff --git a/sound/items/modsuit/loader_charge.ogg b/sound/items/modsuit/loader_charge.ogg
new file mode 100644
index 00000000000..61d5531f72e
Binary files /dev/null and b/sound/items/modsuit/loader_charge.ogg differ
diff --git a/sound/items/modsuit/loader_launch.ogg b/sound/items/modsuit/loader_launch.ogg
new file mode 100644
index 00000000000..513118f3c68
Binary files /dev/null and b/sound/items/modsuit/loader_launch.ogg differ
diff --git a/sound/items/modsuit/magnetic_harness.ogg b/sound/items/modsuit/magnetic_harness.ogg
new file mode 100644
index 00000000000..3d19fccc569
Binary files /dev/null and b/sound/items/modsuit/magnetic_harness.ogg differ
diff --git a/sound/items/modsuit/rewinder.ogg b/sound/items/modsuit/rewinder.ogg
new file mode 100644
index 00000000000..2587562dc11
Binary files /dev/null and b/sound/items/modsuit/rewinder.ogg differ
diff --git a/sound/items/modsuit/springlock.ogg b/sound/items/modsuit/springlock.ogg
new file mode 100644
index 00000000000..8d0013d2630
Binary files /dev/null and b/sound/items/modsuit/springlock.ogg differ
diff --git a/sound/items/modsuit/tem_shot.ogg b/sound/items/modsuit/tem_shot.ogg
new file mode 100644
index 00000000000..50905b95f11
Binary files /dev/null and b/sound/items/modsuit/tem_shot.ogg differ
diff --git a/sound/items/modsuit/time_anchor_set.ogg b/sound/items/modsuit/time_anchor_set.ogg
new file mode 100644
index 00000000000..457f8e6dbae
Binary files /dev/null and b/sound/items/modsuit/time_anchor_set.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_close.ogg b/sound/items/taperecorder/taperecorder_close.ogg
new file mode 100644
index 00000000000..ab9f521c5f9
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_close.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_open.ogg b/sound/items/taperecorder/taperecorder_open.ogg
new file mode 100644
index 00000000000..7b7110fa58b
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_open.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_play.ogg b/sound/items/taperecorder/taperecorder_play.ogg
new file mode 100644
index 00000000000..1bf4d7a3bd6
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_play.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_print.ogg b/sound/items/taperecorder/taperecorder_print.ogg
new file mode 100644
index 00000000000..7912d08dc98
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_print.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_stop.ogg b/sound/items/taperecorder/taperecorder_stop.ogg
new file mode 100644
index 00000000000..a3b0f659928
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_stop.ogg differ
diff --git a/sound/mecha/hydraulic.ogg b/sound/mecha/hydraulic.ogg
new file mode 100644
index 00000000000..3281ed2dc0f
Binary files /dev/null and b/sound/mecha/hydraulic.ogg differ
diff --git a/sound/misc/mail.ogg b/sound/misc/mail.ogg
new file mode 100644
index 00000000000..3b6651e9b94
Binary files /dev/null and b/sound/misc/mail.ogg differ
diff --git a/sound/weapons/anglegrinder.ogg b/sound/weapons/anglegrinder.ogg
new file mode 100644
index 00000000000..ceed497e17c
Binary files /dev/null and b/sound/weapons/anglegrinder.ogg differ
diff --git a/sound/weapons/gun/hmg/cm40.ogg b/sound/weapons/gun/hmg/cm40.ogg
new file mode 100644
index 00000000000..b45507d29a0
Binary files /dev/null and b/sound/weapons/gun/hmg/cm40.ogg differ
diff --git a/sound/weapons/gun/hmg/cm40_cocked.ogg b/sound/weapons/gun/hmg/cm40_cocked.ogg
new file mode 100644
index 00000000000..694d4772e98
Binary files /dev/null and b/sound/weapons/gun/hmg/cm40_cocked.ogg differ
diff --git a/sound/weapons/gun/hmg/cm40_reload.ogg b/sound/weapons/gun/hmg/cm40_reload.ogg
new file mode 100644
index 00000000000..490bbd4fe78
Binary files /dev/null and b/sound/weapons/gun/hmg/cm40_reload.ogg differ
diff --git a/sound/weapons/gun/hmg/cm40_unload.ogg b/sound/weapons/gun/hmg/cm40_unload.ogg
new file mode 100644
index 00000000000..ae9e31aee53
Binary files /dev/null and b/sound/weapons/gun/hmg/cm40_unload.ogg differ
diff --git a/sound/weapons/gun/hmg/shredder.ogg b/sound/weapons/gun/hmg/shredder.ogg
new file mode 100644
index 00000000000..38ddfc247ee
Binary files /dev/null and b/sound/weapons/gun/hmg/shredder.ogg differ
diff --git a/sound/weapons/gun/hmg/shredder_cocked.ogg b/sound/weapons/gun/hmg/shredder_cocked.ogg
new file mode 100644
index 00000000000..95130493d4c
Binary files /dev/null and b/sound/weapons/gun/hmg/shredder_cocked.ogg differ
diff --git a/sound/weapons/gun/hmg/shredder_cocked_alt.ogg b/sound/weapons/gun/hmg/shredder_cocked_alt.ogg
new file mode 100644
index 00000000000..a73fd1b13b7
Binary files /dev/null and b/sound/weapons/gun/hmg/shredder_cocked_alt.ogg differ
diff --git a/sound/weapons/gun/hmg/shredder_reload.ogg b/sound/weapons/gun/hmg/shredder_reload.ogg
new file mode 100644
index 00000000000..c7614184d3d
Binary files /dev/null and b/sound/weapons/gun/hmg/shredder_reload.ogg differ
diff --git a/sound/weapons/gun/hmg/shredder_unload.ogg b/sound/weapons/gun/hmg/shredder_unload.ogg
new file mode 100644
index 00000000000..01e6229aba6
Binary files /dev/null and b/sound/weapons/gun/hmg/shredder_unload.ogg differ
diff --git a/sound/weapons/gun/l6/shot_old.ogg b/sound/weapons/gun/l6/shot_old.ogg
deleted file mode 100644
index e6c1a9abe95..00000000000
Binary files a/sound/weapons/gun/l6/shot_old.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/asp.ogg b/sound/weapons/gun/pistol/asp.ogg
new file mode 100644
index 00000000000..ca7edcb67c8
Binary files /dev/null and b/sound/weapons/gun/pistol/asp.ogg differ
diff --git a/sound/weapons/gun/pistol/cm23.ogg b/sound/weapons/gun/pistol/cm23.ogg
new file mode 100644
index 00000000000..f207a4cda89
Binary files /dev/null and b/sound/weapons/gun/pistol/cm23.ogg differ
diff --git a/sound/weapons/gun/pistol/cm70.ogg b/sound/weapons/gun/pistol/cm70.ogg
new file mode 100644
index 00000000000..2b672fcfb35
Binary files /dev/null and b/sound/weapons/gun/pistol/cm70.ogg differ
diff --git a/sound/weapons/gun/pistol/mauler.ogg b/sound/weapons/gun/pistol/mauler.ogg
new file mode 100644
index 00000000000..70fb1f9f6ec
Binary files /dev/null and b/sound/weapons/gun/pistol/mauler.ogg differ
diff --git a/sound/weapons/gun/pistol/rattlesnake.ogg b/sound/weapons/gun/pistol/rattlesnake.ogg
new file mode 100644
index 00000000000..34e0412f823
Binary files /dev/null and b/sound/weapons/gun/pistol/rattlesnake.ogg differ
diff --git a/sound/weapons/gun/pistol/shot_alt_old.ogg b/sound/weapons/gun/pistol/shot_alt_old.ogg
deleted file mode 100644
index 583c3f36034..00000000000
Binary files a/sound/weapons/gun/pistol/shot_alt_old.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/shot_old.ogg b/sound/weapons/gun/pistol/shot_old.ogg
deleted file mode 100644
index fcf8ad62346..00000000000
Binary files a/sound/weapons/gun/pistol/shot_old.ogg and /dev/null differ
diff --git a/sound/weapons/gun/revolver/shot.ogg b/sound/weapons/gun/revolver/shot.ogg
index d02d1c750c2..91e480bd152 100644
Binary files a/sound/weapons/gun/revolver/shot.ogg and b/sound/weapons/gun/revolver/shot.ogg differ
diff --git a/sound/weapons/gun/revolver/shot_alt_old.ogg b/sound/weapons/gun/revolver/shot_alt_old.ogg
deleted file mode 100644
index fcd3b99ff80..00000000000
Binary files a/sound/weapons/gun/revolver/shot_alt_old.ogg and /dev/null differ
diff --git a/sound/weapons/gun/revolver/shot_old.ogg b/sound/weapons/gun/revolver/shot_old.ogg
deleted file mode 100644
index 6c574829732..00000000000
Binary files a/sound/weapons/gun/revolver/shot_old.ogg and /dev/null differ
diff --git a/sound/weapons/gun/revolver/shot_old_new.ogg b/sound/weapons/gun/revolver/shot_old_new.ogg
deleted file mode 100644
index 91e480bd152..00000000000
Binary files a/sound/weapons/gun/revolver/shot_old_new.ogg and /dev/null differ
diff --git a/sound/weapons/gun/revolver/viper.ogg b/sound/weapons/gun/revolver/viper.ogg
new file mode 100644
index 00000000000..8132d556869
Binary files /dev/null and b/sound/weapons/gun/revolver/viper.ogg differ
diff --git a/sound/weapons/gun/revolver/viper_prime.ogg b/sound/weapons/gun/revolver/viper_prime.ogg
new file mode 100644
index 00000000000..54ad25134ad
Binary files /dev/null and b/sound/weapons/gun/revolver/viper_prime.ogg differ
diff --git a/sound/weapons/gun/rifle/cm82.ogg b/sound/weapons/gun/rifle/cm82.ogg
new file mode 100644
index 00000000000..a1bf69ae00f
Binary files /dev/null and b/sound/weapons/gun/rifle/cm82.ogg differ
diff --git a/sound/weapons/gun/rifle/cm82_reload.ogg b/sound/weapons/gun/rifle/cm82_reload.ogg
new file mode 100644
index 00000000000..133ad5aede3
Binary files /dev/null and b/sound/weapons/gun/rifle/cm82_reload.ogg differ
diff --git a/sound/weapons/gun/rifle/cm82_unload.ogg b/sound/weapons/gun/rifle/cm82_unload.ogg
new file mode 100644
index 00000000000..af0b43ecef9
Binary files /dev/null and b/sound/weapons/gun/rifle/cm82_unload.ogg differ
diff --git a/sound/weapons/gun/rifle/f4.ogg b/sound/weapons/gun/rifle/f4.ogg
new file mode 100644
index 00000000000..75c571db188
Binary files /dev/null and b/sound/weapons/gun/rifle/f4.ogg differ
diff --git a/sound/weapons/gun/rifle/gal.ogg b/sound/weapons/gun/rifle/gal.ogg
deleted file mode 100644
index 25402e36cc6..00000000000
Binary files a/sound/weapons/gun/rifle/gal.ogg and /dev/null differ
diff --git a/sound/weapons/gun/rifle/hydra.ogg b/sound/weapons/gun/rifle/hydra.ogg
new file mode 100644
index 00000000000..180a4082cac
Binary files /dev/null and b/sound/weapons/gun/rifle/hydra.ogg differ
diff --git a/sound/weapons/gun/rifle/shot_old.ogg b/sound/weapons/gun/rifle/shot_old.ogg
deleted file mode 100644
index acdb447ca8f..00000000000
Binary files a/sound/weapons/gun/rifle/shot_old.ogg and /dev/null differ
diff --git a/sound/weapons/gun/shotgun/shot_alt_old.ogg b/sound/weapons/gun/shotgun/shot_alt_old.ogg
deleted file mode 100644
index 48bea46d5cb..00000000000
Binary files a/sound/weapons/gun/shotgun/shot_alt_old.ogg and /dev/null differ
diff --git a/sound/weapons/gun/shotgun/shot_old.ogg b/sound/weapons/gun/shotgun/shot_old.ogg
deleted file mode 100644
index e999bb9bb7f..00000000000
Binary files a/sound/weapons/gun/shotgun/shot_old.ogg and /dev/null differ
diff --git a/sound/weapons/gun/smg/cm5.ogg b/sound/weapons/gun/smg/cm5.ogg
new file mode 100644
index 00000000000..6c363db926f
Binary files /dev/null and b/sound/weapons/gun/smg/cm5.ogg differ
diff --git a/sound/weapons/gun/smg/cm5_reload.ogg b/sound/weapons/gun/smg/cm5_reload.ogg
new file mode 100644
index 00000000000..2a108e9e60e
Binary files /dev/null and b/sound/weapons/gun/smg/cm5_reload.ogg differ
diff --git a/sound/weapons/gun/smg/cm5_unload.ogg b/sound/weapons/gun/smg/cm5_unload.ogg
new file mode 100644
index 00000000000..e4d3ef42db3
Binary files /dev/null and b/sound/weapons/gun/smg/cm5_unload.ogg differ
diff --git a/sound/weapons/gun/smg/cobra.ogg b/sound/weapons/gun/smg/cobra.ogg
new file mode 100644
index 00000000000..314fce64c4f
Binary files /dev/null and b/sound/weapons/gun/smg/cobra.ogg differ
diff --git a/sound/weapons/gun/smg/pounder.ogg b/sound/weapons/gun/smg/pounder.ogg
new file mode 100644
index 00000000000..c9e6faf8e1e
Binary files /dev/null and b/sound/weapons/gun/smg/pounder.ogg differ
diff --git a/sound/weapons/gun/smg/pounder_cocked.ogg b/sound/weapons/gun/smg/pounder_cocked.ogg
new file mode 100644
index 00000000000..76929be2f06
Binary files /dev/null and b/sound/weapons/gun/smg/pounder_cocked.ogg differ
diff --git a/sound/weapons/gun/smg/pounder_reload.ogg b/sound/weapons/gun/smg/pounder_reload.ogg
new file mode 100644
index 00000000000..55bcbc5aa87
Binary files /dev/null and b/sound/weapons/gun/smg/pounder_reload.ogg differ
diff --git a/sound/weapons/gun/smg/pounder_unload.ogg b/sound/weapons/gun/smg/pounder_unload.ogg
new file mode 100644
index 00000000000..5ce78fc258a
Binary files /dev/null and b/sound/weapons/gun/smg/pounder_unload.ogg differ
diff --git a/sound/weapons/gun/smg/sidewinder.ogg b/sound/weapons/gun/smg/sidewinder.ogg
new file mode 100644
index 00000000000..202d9ae5a81
Binary files /dev/null and b/sound/weapons/gun/smg/sidewinder.ogg differ
diff --git a/sound/weapons/gun/smg/sidewinder_cocked.ogg b/sound/weapons/gun/smg/sidewinder_cocked.ogg
new file mode 100644
index 00000000000..d5f7df2fc86
Binary files /dev/null and b/sound/weapons/gun/smg/sidewinder_cocked.ogg differ
diff --git a/sound/weapons/gun/smg/sidewinder_reload.ogg b/sound/weapons/gun/smg/sidewinder_reload.ogg
new file mode 100644
index 00000000000..11f8982beed
Binary files /dev/null and b/sound/weapons/gun/smg/sidewinder_reload.ogg differ
diff --git a/sound/weapons/gun/smg/sidewinder_unload.ogg b/sound/weapons/gun/smg/sidewinder_unload.ogg
new file mode 100644
index 00000000000..2d959bc0f42
Binary files /dev/null and b/sound/weapons/gun/smg/sidewinder_unload.ogg differ
diff --git a/sound/weapons/gun/smg/spitter.ogg b/sound/weapons/gun/smg/spitter.ogg
new file mode 100644
index 00000000000..81fd0263cb2
Binary files /dev/null and b/sound/weapons/gun/smg/spitter.ogg differ
diff --git a/sound/weapons/gun/smg/spitter_cocked.ogg b/sound/weapons/gun/smg/spitter_cocked.ogg
new file mode 100644
index 00000000000..b3d29c6f690
Binary files /dev/null and b/sound/weapons/gun/smg/spitter_cocked.ogg differ
diff --git a/sound/weapons/gun/smg/spitter_reload.ogg b/sound/weapons/gun/smg/spitter_reload.ogg
new file mode 100644
index 00000000000..4842c567de2
Binary files /dev/null and b/sound/weapons/gun/smg/spitter_reload.ogg differ
diff --git a/sound/weapons/gun/smg/spitter_unload.ogg b/sound/weapons/gun/smg/spitter_unload.ogg
new file mode 100644
index 00000000000..dffebe51b17
Binary files /dev/null and b/sound/weapons/gun/smg/spitter_unload.ogg differ
diff --git a/sound/weapons/gun/sniper/cmf90.ogg b/sound/weapons/gun/sniper/cmf90.ogg
new file mode 100644
index 00000000000..9468bfcc1b9
Binary files /dev/null and b/sound/weapons/gun/sniper/cmf90.ogg differ
diff --git a/sound/weapons/gun/sniper/shot_old.ogg b/sound/weapons/gun/sniper/shot_old.ogg
deleted file mode 100644
index 4c23868da15..00000000000
Binary files a/sound/weapons/gun/sniper/shot_old.ogg and /dev/null differ
diff --git a/strings/boomer.json b/strings/boomer.json
deleted file mode 100644
index 4fb2f733f79..00000000000
--- a/strings/boomer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "boomer": [
- "@pick(kids) these days have it too easy!",
- "Do I look like I know what a @pick(file) is!?",
- "Listen here Jack, how do I open @pick(file)?",
- "How do I open a @pick(file) again?",
- "Unlike you snowflakes, I'm not offended so easily.",
- "Back in my day...",
- "When I was your age...",
- "This generation can't take a joke.",
- "Why are @pick(kids) these days so @pick(sad) all the time?",
- "These damn @pick(kids) need to get a @pick(impossible) for once!",
- "It's simply a matter of showing up, looking the manager in the eye, giving him a firm handshake and telling him you want the job.",
- "You'll never get anywhere in life without a degree.",
- "@pick(expense) isn't really that expensive.",
- "When I was a kid I had to walk to school uphill both ways!",
- "I hate my wife.",
- "I just want to grill for God's sake.",
- "I wish I could just go on my lawnmower and cut the grass.",
- "Yep, Quake. That was a good game...",
- "Yeah, my PDA has wi-fi. A wife I hate."
- ],
-
- "expense": ["Healthcare", "College", "A car", "A house", "Food"],
-
- "kids": ["kids", "millenials", "snowflakes"],
-
- "file": ["JPEG", "PDF", "DMI", "JSON"],
-
- "sad": ["sad", "depressed", "sad and depressed"],
-
- "impossible": ["job", "house", "job and a house", "life"]
-}
diff --git a/strings/ipc_preference_adjectives.txt b/strings/ipc_preference_adjectives.txt
index a243b2d77fc..a106aa76ba8 100644
--- a/strings/ipc_preference_adjectives.txt
+++ b/strings/ipc_preference_adjectives.txt
@@ -1,3 +1,5 @@
+Angsty
+Awkward
Bedraggled
Brawny
Bulky
@@ -22,6 +24,7 @@ Fragile
Frail
Friendly
Gentle
+Gormless
Hawkish
Hefty
Hobbling
@@ -38,25 +41,39 @@ Mangled
Masculine
Messy
Nimble
+Pathetic
+Peppy
Petite
Pompous
Pugnacious
+Quievering
+Radical
Repulsive
Robust
Rough
Rusted
Scarred
Shifty
+Shrewd
Sickly
Skittish
Sleek
Slender
+Slimy
Slovenly
Sluggish
+Sly
+Smooth
+Sniveling
+Soulrendered
Spacy
Stiff
Stony
+Stout
+Strapping
+Sturdy
Stylish
+Tubular
Unattractive
Unremarkable
Unsightly
diff --git a/strings/locations.json b/strings/locations.json
index 7a573dd8699..89af1acacd4 100644
--- a/strings/locations.json
+++ b/strings/locations.json
@@ -51,7 +51,7 @@
"Law Office",
"Library",
"Locker Room",
- "Mech Bay",
+ "Exosuit Bay",
"Medbay Central",
"Medbay Maintenance",
"Medbay Storage",
diff --git a/strings/names/adjectives.txt b/strings/names/adjectives.txt
index bca89bc5a25..88491827f3f 100644
--- a/strings/names/adjectives.txt
+++ b/strings/names/adjectives.txt
@@ -149,6 +149,7 @@ gleaming
glorious
good
gorgeous
+girlfailing
graceful
greasy
great
diff --git a/strings/preference_adjectives.txt b/strings/preference_adjectives.txt
index 0d67f16803f..450e4c78901 100644
--- a/strings/preference_adjectives.txt
+++ b/strings/preference_adjectives.txt
@@ -24,7 +24,6 @@ Effeminate
Elegant
Emaciated
Energetic
-Energetic
Exasperated
Exotic
Faint
@@ -41,7 +40,6 @@ Gentle
Gloomy
Gormless
Hawkish
-Hawkish
Healthy
Hefty
Hobbling
@@ -57,7 +55,6 @@ Lopsided
Lovely
Malnourished
Mangled
-Mangled
Masculine
Messy
Muscular
diff --git a/strings/sillytips.txt b/strings/sillytips.txt
index 192dbce6362..165e3cbe54d 100644
--- a/strings/sillytips.txt
+++ b/strings/sillytips.txt
@@ -5,16 +5,12 @@ When a round ends nearly everything about it is lost forever, leave your salt be
Killing the entire sector isn't fun except when it is.
You can win a pulse rifle from the arcade machine. Honest.
Just like real life the entropy of the game can only increase with time. If things aren't on fire yet, just wait.
-Completing your objectives is good practice, but the best antagonists will strive to do more than the bare minimum to really leave an impression.
The more obscure and underused a game mechanic is, the less likely your victims are to be able to deal with it.
Space is cold and it will quickly freeze you to death if you don't protect yourself. This isn't how thermodynamics really works but just go with it.
-Blobs are weak to fire! Use a flame thrower for maximum damage!
Cleanbot.
-The wizard is supposed to be extremely strong in one on one combat, stop getting mad about it.
Sometimes a round will just be a bust. C'est la vie.
This is a game that is constantly being developed for. Expect things to be added, removed, fixed, and broken on a daily basis.
It's fun to try and predict the round type from the tip of the round message.
-The quartermaster is not a head of staff and will never be one.
The bird remembers.
Your sprite represents your hitbox, so that afro makes you easier to kill. The sacrifices we make for style.
Sometimes admins will just do stuff. Roll with it.
@@ -23,14 +19,21 @@ Plenty of things that aren't traditionally considered weapons can still be used
DEATH IS IMMINENT!
This game is older than most of the people playing it.
Do not go gentle into that good night.
-Flashbangs can weaken blob tiles, allowing for you and the crew to easily destroy them.
Just the tip?
Some people are unable to read text on a game where half of it is based on text.
-As the Captain, you can use a whetstone to sharpen your fancy fountain pen for extra robustness.
-As the Lawyer, you are the last bastion of roleplay-focused jobs. Even the curator got a whip to go fight people with, that sellout!
There are at least 11 ways to get through plastic flaps. How many can you name?
FEED ME A STRAY CAT
-Did you know that tossing the clown into a singularity will either increase or decrease its size by a large amount?
Most items have names longer than "soap".
-Demoman takes skill.
Ask and you shall receive.
+Top Ten Goliath Moments!!!
+Sometimes your ship will randomly disappear or obliterate you or get cleaved in half or any combination of the above. Don't dock to a planet at the same time as someone else or undock as someone is docking.
+Go on. Saw off those beautiful Hunter's Pride stocks. The Huntsman is watching.
+The Drinkening has put countless shiptester's basic reading compehension to the test. Will you succumb?
+No, going really really fast through an electric storm won't render you immune.
+None of you would survive the uptime drought.
+Innumberable frontiersmen have died valiantly in a subshuttle chokepoint attempting to board. Sometimes, a direct subshuttle dock isn't the best tactical move.
+Full-body prosthesis are still biological and have normal blood. Don't pump a full bag of coolant into their veins, you.
+The shotgun may never miss, but it has low armour penetration with buckshot.
+When your gun gives off a pathetic click, it's out of ammo. Mashing the trigger more in a panic won't restore your ammo.
+The Trabuco is a crime against the Huntsman and the universe. There's a possibility it'll kill either yourself, your crew, the target, or all of the above.
+Don't be the captain found dead in a pit, legioned, with 600 brute and every bone in their body broken.
diff --git a/strings/tips.txt b/strings/tips.txt
index 6a8c54086d9..c2d32c979b9 100644
--- a/strings/tips.txt
+++ b/strings/tips.txt
@@ -19,33 +19,26 @@ You can screwdriver any non-chemical grenade to shorten fuses from 5 seconds, to
If you find yourself in a fistfight with another player, staying on the offensive is usually the smart move. Running away often won't accomplish much.
Different weapons have different strengths. Some weapons, such as spears, floor tiles, and throwing stars, deal more damage when thrown compared to when attacked normally.
A thrown glass of water can make a slippery tile, allowing you to slow down your pursuers in a pinch.
-When dealing with security, you can often get your sentence negated entirely through cooperation and deception.
-Experiment with different setups of the supermatter engine to maximize output, but don't risk the crew's safety to do so!
We were all new once, be patient and guide new players in the right direction.
On most clothing items that go in the exosuit slot, you can put certain small items into your suit storage, such as a spraycan, your emergency oxygen tank, or a flashlight.
Most job-related exosuit clothing can fit job-related items into it, such as the atmospheric technician's hardsuit/winter coat holding an RPD, or labcoats holding most medicine.
If you're using hotkey mode, you can stop pulling things using H.
If there's something you need from others, try asking! This game isn't singleplayer and you'd be surprised what you can get accomplished together!
You'll quickly lose your interest in the game if you play to win and kill. If you find yourself doing this, take a step back and talk to people - it's a much better experience!
-Felinids get temporarily distracted by laser pointers. Use this to your advantage when being pursued by one.
Don't be afraid to ask for help, whether from your peers or from mentors.
As the Captain, you have absolute access and control over your ship, but this does not mean that being a horrible person won't result in mutiny and a ban.
A medical hardsuit can hold an entire medkit in its suit storage!
-While both heal toxin damage, the difference between charcoal and antitoxin is that charcoal will actively remove all other reagents from one's body, while antitoxin only removes various toxins - but can overdose.
-You can surgically implant or extract things from people's chests. This can range from putting in a bomb to pulling out an alien larva.
+While both heal toxin damage, the difference between charcoal and dylovene is that charcoal will actively remove all other reagents from one's body, while dylovene only removes various toxins - but can overdose.
+You can surgically implant or extract things from people's chests using either organ manipulation or cavity implant surgeries. This can range from putting in a bomb to pulling out an alien larva.
Using disarm attempt will intentionally fail a surgery step.
Corpses with the "...and their soul has departed" description no longer have a ghost attached to them and aren't revivable or clonable.
-Treating plasmamen is not impossible! Salbutamol stops them from suffocating and showers stop them from burning alive. You can even perform surgery on them by doing the procedure on a roller bed under a shower.
+Treating plasmamen is not impossible! Salbutamol stops them from suffocating and showers or stasis beds stop them from burning alive. You can even perform surgery on them by doing the procedure on a roller bed under a shower.
You can extract implants by holding an empty implant case in your offhand while performing the extraction step.
There are dozens of chemicals that can heal, and even more that can cause harm. Experiment!
Some chemicals can only be synthesized by heating up the contents with a chemical heater or manually with lighters and similar tools.
You can recharge a chemical dispenser with an inducer or by replacing its cell.
Water and Potassium mixed together will create an explosion, with power scaling by amount used. Don't do it.
-You can eject someone from cloning early by disabling power in the room. Note that they will suffer more genetic damage and may lose vital organs from this.
-Being a hulk makes you capable of dealing high melee damage, stunlocking people, and punching through walls. However, you can't fire guns, will lose your hulk status if you go into critical condition.
You can take AIs out of their cores by loading them into an intelliCard, which lets you see their laws, It can also be placed into an AI system integrity restorer computer to revive and/or repair them.
-You can use the mutation toxin obtained from green slimes to create various mutation toxins by mixing it with various chemicals!
-You can maximize the number of uses you get out of a slime by feeding it slime steroid, created from purple slimes, while alive. You can then apply extract enhancer, created from cerulean slimes, on each extract.
You can repair your cyborgs with a welding tool if they have brute damage, if they have burn damage, you can remove their battery, expose the wiring with a screwdriver and replace their wires with a cable coil.
You can reset a cyborg's module by cutting and mending the reset wire with a wire cutter.
You can augment people with cyborg limbs. Augmented limbs can easily be repaired with cables and welders.
@@ -55,45 +48,33 @@ As a AI, you can take pictures with your camera and upload them to newscasters.
As a AI, you can use CTRL + 1-9 to set a location hotkey for your camera, allowing you to save the location and jump to it at will. Tilde and zero will return you to the last spot you jumped from, and the numpad numbers act as aliases to the regular number keys.
As a Cyborg, choose your module carefully, as only cutting and mending your reset wire will let you repick it. If possible, refrain from choosing a module until a situation that requires one occurs.
As a Cyborg, you are immune to most forms of stunning, and excel at almost everything far better than humans. However, flashes can easily stunlock you and you cannot do any precision work as you lack hands.
-As a Cyborg, you are impervious to fires and heat. If you are rogue, you can release plasma fires everywhere and walk through them without a care in the world!
-As a Cyborg, you are extremely vulnerable to EMPs as EMPs both stun you and damage you. The ion rifle in the armory or a traitor with an EMP kit can kill you in seconds.
+As a Cyborg, you are impervious to fires and heat.
+As a Cyborg, you are extremely vulnerable to EMPs as EMPs both stun you and damage you.
As a Service Cyborg, your spray can knocks people down. However, it is blocked by masks and glasses.
As an Engineering Cyborg, you can attach air alarm/fire alarm/APC frames to walls by placing them on the floor and using a screwdriver on them.
As a Medical Cyborg, you can fully perform surgery and even augment people.
You can rename areas or create entirely new ones using your ship expansion permit.
The chief engineer’s hardsuit is significantly better than other engineering hardsuits. It has the best features of both engineering and atmospherics hardsuits - boasting nigh-invulnerability to radiation and all atmospheric conditions.
The supermatter shard is an extremely dangerous piece of equipment: touching it will disintegrate you. So will touching it with telepathy.
-You can electrify grilles by placing wire "nodes" beneath them: the big seemingly unconnected bulges from a half completed wiring job.
+Wire "nodes" (big, seemingly unconnected bulges from half completed wiring jobs) are able to do several things: link up thrusters to prechargers, hook up PACMAN generators, and shock grilles among other things.
You can cool a supermatter crystal by spraying it with a fire extinguisher. Only for the brave!
You can repair windows by using a welding tool on them while on any intent other than harm.
-Don't underestimate the humble P.A.C.M.A.N. generators.
A RCD can be reloaded with metal, glass or plasteel sheets instead of just compressed matter cartridges.
You can unwrench a pipe regardless of the pressures of the gases inside, but if they're too high they can burst out and injure you!
-ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches. Or, use it to seal a plasmaman cloning room.
+ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches. Beware, they wear off after an amount of time highlighted by numbers on the fans.
You can change the layer of a pipe by clicking with it on a wrenched pipe or other atmos component of the desired layer.
-As a Clown, if you lose your banana peel, you can still slip people with your PDA! Honk!
-As a Clown, eating bananas heals you slightly. Honk!
-As a Clown, your Grail is the mineral bananium, which can be used to build you a fun and robust mech beloved by everyone.
-As a Clown, you can use your stamp on a sheet of cardboard as the first step of making a honkbot. Fun for the whole crew!
-As a Clown, spice your gimmicks up! Nobody likes a one-trick pony.
-The null rod has anti magic functions: it makes you immune to magic.
Books can be turned into a container that can store small items using wire cutters, bibles have this ability without needing to cut it.
You can hack the MegaSeed Vendor to get access to more exotic seeds. These seeds can alternatively be ordered from a express console
You can mutate the plants with unstable mutagen or, as an alternative, grow glowshrooms for their radium which also mutates plants to start you up!
While growing plants you should look into increasing the potency of your plants. This increases the size, amount of chemicals, points gained from grinding them in the biogenerator, and lets people know you are a proficient botanist.
You can create a very wide variety of food with the crafting menu. You can find it by looking for the hammer icon near your intents.
You can rename custom food with a pen.
-any cooked food will be much healthier than the junk food found in vendors. Having the crew routinely eating cooked will provide minor buffs.
+Any cooked food will be much healthier than the junk food found in vendors.
Most non-custom foods will have a secondary effect, ranging from healing you to making you move at lightspeed. Experiment!
Mousetraps can be used to create bombs or booby-trap containers.
-You can order contraband items from a express console without hacking it.
-You can earn more cargo points by shipping back crates, liquid containers, plasma sheets, rare seeds from hydroponics, and more!
-The express supply console can instantly delivers crates by drop pod. The impact will cause a small explosion as well.
Every monster has a pattern you can exploit to minimize damage from the encounters.
You can harvest goliath plates from goliaths and upgrade your explorer's suit, mining hardsuits as well as Firefighter APLUs with them, greatly reducing incoming melee damage.
You can craft a variety of equipment from the local fauna. Bone axes, lava boats and ash drake armour are just a few of them!
-As a Monkey, you can crawl through air or scrubber vents by alt+left clicking them. You must drop everything you are wearing and holding to do this, however.
-As a Monkey, you can still wear a few human items, such as backpacks, gas masks and hats, and still have two free hands.
As a Drone, you can ping other drones to alert them of areas in need of repair.
As a Ghost, you can see the inside of a container on the ground by clicking on it.
As a Ghost, you can double click on just about anything to follow it. Or just warp around!
@@ -106,3 +87,72 @@ You can light a cigar on a supermatter crystal.
Using sticky tape on items can make them stick to people and walls! Be careful, grenades might stick to your hand during the moment of truth!
In a pinch, stripping yourself naked will give you a sizeable resistance to being tackled. What do you value more, your freedom or your dignity?
Wearing riot armor makes you significantly more effective at performing tackle takedowns, but will use extra stamina with each leap! It will also significantly protect you from other tackles!
+As the Captain of your vessel, do not neglect the responsibilities of your command. You are the anchor the crew is expected to rely upon, and not being present or authoritative will hurt the experience.
+As a vessel's second in command, you have the unique position of being able to temper the behaviour of the Captain. Obey their orders, but do not be afraid to offer your own advice or shoulder some of command's responsibilities.
+It is highly ill-advised to run off on your own while exploring. Many ruins and planets are perilous and a match for even experienced players, and having someone to watch your back will save you a lot of trouble.
+More often that not, most ships will be apply-only. Don't be afraid to read the memo and try for an application, many captains simply want to curate a certain type of behaviour aboard their vessels.
+Captaining is one of the best ways to curate a faction. Set standards, distinguish yourself and your crew, and keep them engaged, and they'll be coming back not only to your ship, but also to the faction.
+Most improvised ways of providing medical aid or reviving the dead can be slow or dangerous to the person if you or your character are inexperienced with medicine. Don't be afraid to call for a medical ship if the situation is dire.
+In the event most or all of your crew is incapacitated or dead, don't be afraid to ahelp to ask for a distress call. They'll be happy to get you back into the round and the medical ships will be happy as well.
+Don't be afraid to ahelp if you're unsure about another player's conduct. If they're making you uncomfortable or hurting the experience, the admins would be happy to sort things out.
+Many plants on sand and lava worlds are medicinal, and can stretch your supplies.
+For higher tier drill contracts, its recommended to bring a toolbox, spare stock parts, and plasteel if you're not confident in your abilities. The drill is prone to running low on power or needing to be repaired if damaged.
+Many weapons can get sawed off, hurting their accuracy and occasionally ammo capacity but wildly compacting them. Hunter's Pride shotguns, the Flaming Arrow, the Illestren, among others, are included.
+Static anomalies will cause brain damage in close proximity. Minimize contact with them.
+Gravitational anomalies (thronglers) can quickly kill if they're intense. Sometimes, a chair can be used to get close to neutralize them, but do so at your own risk. They cause heavy brute damage.
+Certain anomalies like heartbeat, vein, jumper, or plasmasoul anomalies can interact with you through walls. Be careful docking to worlds with anomalies.
+Safe speed for carp migrations are under 2 GM/s, for asteroids are below 3 GM/s, and for dust is below 7 GM/s. There is no safe speed for electrical storms, you need full grounding rod coverage.
+You can sometimes minimize damage from electrical storms by turning off lights and preventing all source of passive light from touching the outside of the vessel. It is notoriously gimmicky, though, do so at your own risk.
+Dwarf legions tend to try and run back towards you if you're too far away. Lure them in for an attack by withdrawing before they retreat again.
+Brimdemons oftentimes will strike you with a single melee attack before fleeing for another beam. Back away once they're done firing to minimize chip damage.
+You can examine someone twice to see which limb they're bleeding from, to administer gauze or sutures.
+Vox are allergic to Ephedrine, Atropine, Epinephrine, Mannitol, Antihol, and Stimulants. Not lethal in small amounts, but it is recommended to purge these reagents if you've made a mistake.
+Grinded iron or iron pills from oxygen deprivation kits can be used to slowly regenerate blood in living people, if your blood supplies are thin.
+Crystal goliaths, elite mobs, and ancient goliaths give research points on dissection, varying from 5000 to 40000 depending on technology and mob.
+Crystal legions and crystal goliaths are extremely dangerous up close. Try and eliminate them quickly from range with powerful firearms.
+The smaller the vessel, the more throttle will effect your acceleration. If you're piloting a subshuttle, it's recommended to keep low throttle and adjust to your liking.
+Plasma thrusters can allow for extreme speed, but it is recommended to conserve them. You can minimize fuel consumption by using them in small bursts with a low throttle before turning them back off.
+Jackhammers can be used to quickly break down walls for breaching or salvage.
+Blast doors can be taken apart for a fair amount of plasteel, if you're hurting on fuel.
+Kepori have an innate ability to tackle. It can take the enemy off guard, but recommend a helmet if you're using it near walls or prone to miss.
+Laser and energy weapons have a cell that can be removed with a screwdriver. If you're removing a cell from a weapon that is not in your hand (on a suit storage slot, for example), the cell will go into your hand instead of the ground.
+Frontiersmen clothes and Ramzi Clique rusted red hardsuits are established pirate equipment, and you're likely to be fired upon if you wear them. Use at your own risk.
+You can access the black market by building an uplink with a handheld radio, analyzer, and scanning module. It tends to have a random selection of unique items at highly varied prices. You can purchase a LTSRBT from the outpost for a more convenient delivery.
+Most armour sets outside of hardsuits do not cover the limbs. Give yourself an advantage by firing on someones legs or arms to slow them down or shoot out their weapon.
+You can remove prosthetics or IPC / FBP limbs with prosthetic removal surgery, even on yourself.
+You can early eject the en bloc of Illestrens by not firing the last round and clicking on the rifle with your empty hand to take it out manually, for a fast and tactical reload.
+The HP Shadow cannot reload all rounds at once with a speedloader, it must be reloaded one round at a time.
+You can make an emergency landing by docking to an empty space if you've lost control of your speed or are about to crash into hazards.
+It is safe to cross over the tile the system sun is on. Trust me, I've tried.
+Acid tiles and acid from anomalies can be sprayed off with fire extinguishers.
+You can extinguish yourself without walls nearby by clicking the tile you're on with your extinguisher.
+It's wise to carry a pocket extinguisher on sand and lava worlds, for acid and lava respectively.
+Directional firelocks can quickly minimize pressure loss from holofield failures, if your vessel lacks them.
+Holofields rely on extra power being on the wire net. Make sure power load is a fair bit higher than the draw so you don't get launched into vacuum.
+Elzuose are able to heal a respectable amount of damage by rooting in soil or grass. It gives a sizable mood increase, as well as charging your battery.
+If you're confused about the contents of an alcoholic drink bottle, you can examine to more often than not see what it contains on the label.
+If you don't feel like grinding 500 basic power cells to make potassium, you can buy chemicals from the outpost in bulk.
+You can synthesize most chems by clicking certain reagents with stock parts. Examples being Iodine to Bromine with a scanning module and water into 2:1 hydrogen / oxygen with a capacitor.
+Perfluorodecalin in oxygen deprivation kits convert oxygen damage to toxin damage at a very effective ratio. Just know what you're doing and be prepared to administer anti-tox chems if it is a large amount of damage.
+Epi-pens contain a small amount of formaldehyde, that prevents organs from decaying while they're in a body's system. Use it to give yourself more time while reviving.
+Anomalies will give two frequencies when you analyze them, a primary and a secondary, unstable frequency. The primary will neutralize, and the unstable will more often than not cause an explosion or a similar negative effect.
+Landmines have 4 wires; one disarms the mind, the other deactivates the pressure plate, another blows it up, and another blows it up on a delay.
+You can tamper with landmines from range by pulsing the wires with signalers.
+Not everyone is from their species' homeworld. It can be common for a human to have a Kalixcian or Tecetian name, for example.
+It can be fun to brainstorm new characters. Give it a shot, you might like it.
+You can create entire new shuttles and subshuttles with a shuttle manipulator either from RND or from the outpost. It's usually resource and money-intensive, so be prepared!
+Class 3 drills are incredibly dangerous alone or in small groups, even if you're experienced with mining and combat. Bring along a larger crew or call someone willing to help if you're thinking of taking them on.
+Most smaller ships can be easily made immune to electrical storms if grounding rods are spaced out around the hull. You can make some quick money from rarely-taken storm contracts.
+Ripleys are able to hold up to ten crates and other miscellaneous items like PACMAN generators using a hydraulic clamp. The scrapper's favourite.
+Fights can be heavily in favour of the defenders if you play your cards right. Get good angles, turn off lights to give yourself cover, and be able to fire from multiple areas. More than likely, you'll know your environment better than the attacker.
+Crate shelves can be used to maximize storage in your cargo bays. No more messes for you.
+You can fashion cloth into a rag to clean up your vessel if you've tracked in some blood.
+Some ships might prioritize characters exclusively from a faction in their memos, and that's okay! You can experiment with new characters to join, or join / captain another ship.
+Moths, if their wings are intact, have full mobility in zero gravity environments that have an atmosphere.
+Vox are near-unmatched in hand-to-hand fighting; their kicks deal extra damage and hurt organs.
+IPC posibrains are contained in the chest, not the head.
+Shiptest has uptime on Wednesdays, Fridays, and Saturdays.
+Exosuits are not as durable as they might feel, and it is still wise to take cover with them.
+Turning on strafing mode on an exosuit for combat is wise, and allows you to keep your firing lines constantly on the enemy.
+A Gygax's leg actuators drain the cell very quickly. Use sparingly.
+Installing higher tier capacitors on exosuits increases power efficiency on exosuit abilities, weapons, and idling.
diff --git a/strings/traumas.json b/strings/traumas.json
index f6bd9b58955..1d1e98581d4 100644
--- a/strings/traumas.json
+++ b/strings/traumas.json
@@ -1,168 +1,4 @@
{
- "brain_damage": [
- "@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH",
- "without oxigen blob don't evoluate?",
- "@pick(semicolon)CAPTAINS A COMDOM",
- "can u give me @pick(mutations)?",
- "THe saiyans screwed",
- "Bi is THE BEST OF BOTH WORLDS>",
- "@pick(semicolon)I WANNA PET TEH monkeyS",
- "stop grifing me!!!!",
- "SOTP IT#",
- "shiggey diggey!!",
- "@pick(semicolon)A PIRATE APPEAR",
- "FUS RO DAH",
- "stat me",
- ">my face",
- "roll it easy!",
- "lol2cat",
- "dem dwarfs man, dem dwarfs",
- "hwee did eet fhor khayosss",
- "lifelike texture ;_;",
- "luv can bloooom",
- "PACKETS!!!",
- "port ba@pick(y_replacements) med!!!!",
- "youed call her a toeugh bithc",
- "closd for merbegging",
- "@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???",
- "GEY AWAY FROM ME U GREIFING PRICK!!!!",
- "@pick(semicolon)HELP INTEG MURDERIN MEE!!!",
- "hwat dose tha @pick(random_gibberish) mean?????",
- "@pick(semicolon)DO A BLUP SPEaS JUMP!!!!!",
- "wearnig siNGUARLTY is.... FINE haHAAA",
- "@pick(semicolon)AI laW 22 Open door",
- "@pick(semicolon)this SI mY sHip......",
- "who the HELL do u thenk u r?!!!!",
- "geT THE FUCK OUTTTT",
- "@pick(semicolon)CRASHING THIS SHIMP WITH NIO SURVIVROS",
- "PSHOOOM",
- "REMOVE SINGULARITY",
- "INSTLL TEG",
- "TURBIN IS BEST ENGIENE",
- "SOLIRS CAN POWER THE HOLE FLEEHT ANEWAY @pick(bug)",
- "parasteng was best",
- "@pick(semicolon)I'VE GOT BALLS OF STEEL",
- "NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE",
- "i will snatch erry motherfucker birthday",
- "u just did the world a little bit more sad place for someone",
- "@pick(semicolon)N-NYAAAAAA~",
- "@pick(bug)",
- "@pick(semicolon)wtf??????????? @pick(bug)",
- "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)",
- "DON'T EVER TUCH ME",
- "@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????",
- "AMOGN US IS FUNNY!!",
- "DID YOU FUCKING.",
- "i DEMAND!!! APOGEE-DEV BE DEOMTED!!!",
- "@pick(semicolon)I don't ndED tEARPAHY.",
- "@pick(semicolon)an,d CIOCK.",
- "TUWN ME INoT A CAT!!",
- "WHY WAES THE PEILL REMOVED???",
- "work on the wiki please",
- "ahelp SPAWN @pick(aspawnships) PLS",
- "Am i allowd to kil l people if thye piss me off",
- "IS THIS LIEK VOIDCREW???",
- "UNiT PANICKING.",
- "HIII!! HI!! <3 <3 <3",
- "I LOOK LKIE BEAN,S,,, CRINGE!!!",
- "SEET TH shIP TO kOS!!!!!",
- "IM SynDCIATe, I ANTag, I CAN KOS......",
- "ahelp ADMIN CAN I BE PIRTA",
- "DOCTOR YUO DO DISCETIONS!!!",
- "RESERCH NANIYES",
- "REVSRSE A NY WALLS!!!",
- "*monch",
- "Amonger",
- "Live mas",
- "top ten goliath funny moments",
- "put me... in a stew... then buryy mee...",
- "@pick(semicolon)GTT AWYA FROM HER YOU BITHC!!",
- "@pick(semicolon)IS TATH A FUCKIGN,, MOTH.",
- "@pick(semicolon)BRAZIL NUMEOR UNO...!!!!",
- "@pick(semicolon)blbue hair??? I'M GOIgN TO KILL THDT FUIKNG COW!",
- "@pick(semicolon)HOW DO I @pick(ghetto)?????",
- "ough",
- "ourgh",
- "ouughghnnnn",
- "hrrnggg",
- "HE IS BALD!!!",
- "I AM NORMAL. I CAN BE TRUSTED WITH INDUSTRIAL CHEMICALS",
- "Welcome to the bathroom",
- "THE AMOUNGS BROKE ALL MY BONES",
- "HOLY SHIT IT'S @pick(john) @pick(factions)!!",
- "BLrobo BLEEBUS.....",
- "drugs are funny because they add new rp elements",
- "ANOTHER SHIP... STERALIZED...",
- "HOpeLes WAsN'T ALwAYS NaMeD HoPelESs BeFORE THe incIDENST...",
- "@pick(semicolon)HopeLSS WAS ACTUAL. Ly a LIVIng WaePON....",
- "@pick(semicolon)WHEN SHIPQUEST????? PANEL NEW??????",
- "WHER.E SHIPQUEST???,???",
- "ei,,ither wAy... It Is WHt ti is",
- "butT ShIPPtSt nEVER was a WrAZnOe liKE thaEt!!",
- "A deEoP-setED dISEuire... fuR pERfECTiOsM...",
- "HUMORER IS A DECLIAT THINGE!!",
- "who's the asshole flying the pill class",
- "IVOR@pick(y_replacements) WHAT THE FOUCKE ARE U DUING!!!??",
- "RESIEST BIG MOETH",
- "WE MUSTE RIASE UOP AGANST BEEG MOTNH",
- "Luckily, I passed high school physics",
- "I WANT NOTHING MORE IN THIS LIFE THAN TO CUDDLE UP WITH A CUTE MOTH WAIFU!!",
- "GO TO HORNY JAIL!!"
- ],
-
- "mutations": [
- "telikesis",
- "halk",
- "eppilapse",
- "kamelien",
- "eksrey",
- "glowey skin",
- "fungal tb",
- "stun gloves"
- ],
-
- "john": ["joehn", "jonn", "jouhn", "jeeoun"],
-
- "factions": ["SYNDICT", "NATOSASEN", "EEMTEQ", "MIENUTMEN", "SOMLGOVM"],
-
- "random_gibberish": ["g", "squid", "r", "carbon dioxide"],
-
- "y_replacements": ["y", "i", "e"],
-
- "create_verbs": ["spawn", "MAke me", "creat", "tc trade me", "gib"],
-
- "create_nouns": [
- "zenomorfs",
- "ayleins",
- "treaitors",
- "sheadow lings",
- "abdoocters",
- "revinent",
- "deval",
- "deth squads",
- "bleb",
- "cock cult",
- "anteg"
- ],
-
- "aspawnships": [
- "BUblBUE",
- "RoUBE",
- "PeEL",
- "TWInkLRE",
- "MAYONEISE",
- "raEDIO",
- "joUPITR",
- "HAELR TROCK",
- "BEYOO",
- "TID"
- ],
-
- "bug": ["", "IS TIS A BUG??", "SI IST A BUGG/", "BUG!!!"],
-
- "semicolon": ["", ";", ".h"],
-
- "ghetto": ["ghetcheom", "ghettoghemc", "gahttochem"],
"god_foe": [
"MORTALS",
diff --git a/tgui/package.json b/tgui/package.json
index 2c5059e3626..169af0aeafc 100644
--- a/tgui/package.json
+++ b/tgui/package.json
@@ -56,7 +56,7 @@
"terser-webpack-plugin": "^5.1.4",
"typescript": "^4.9.4",
"url-loader": "^4.1.1",
- "webpack": "^5.75.0",
+ "webpack": "^5.94.0",
"webpack-bundle-analyzer": "^4.4.2",
"webpack-cli": "^4.7.2"
}
diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json
index a026558a47a..1a0f4c97224 100644
--- a/tgui/packages/tgui-dev-server/package.json
+++ b/tgui/packages/tgui-dev-server/package.json
@@ -4,7 +4,7 @@
"version": "4.3.1",
"type": "module",
"dependencies": {
- "axios": "^1.6.0",
+ "axios": "^1.7.4",
"glob": "^7.1.7",
"source-map": "^0.7.3",
"stacktrace-parser": "^0.1.10",
diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js
index 94ce7aa51cf..0f4a9c05288 100644
--- a/tgui/packages/tgui-panel/chat/constants.js
+++ b/tgui/packages/tgui-panel/chat/constants.js
@@ -61,7 +61,7 @@ export const MESSAGE_TYPES = [
name: 'Radio',
description: 'All departments of radio messages',
selector:
- '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .pirradio, .clipradio, .irmgradio, .pgfradio, .ntradio, .radio, .deptradio, .binarysay, .newscaster, .resonate',
+ '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .emrgradio, .pirradio, .clipradio, .irmgradio, .pgfradio, .ntradio, .radio, .deptradio, .binarysay, .newscaster, .resonate',
},
{
type: MESSAGE_TYPE_INFO,
diff --git a/tgui/packages/tgui-panel/package.json b/tgui/packages/tgui-panel/package.json
index d60ccaaa9b1..f652b74df90 100644
--- a/tgui/packages/tgui-panel/package.json
+++ b/tgui/packages/tgui-panel/package.json
@@ -4,7 +4,7 @@
"version": "4.3.1",
"dependencies": {
"common": "workspace:*",
- "dompurify": "^2.3.1",
+ "dompurify": "^2.5.4",
"inferno": "^7.4.8",
"tgui": "workspace:*",
"tgui-dev-server": "workspace:*",
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index 8e734f25da4..1acd0cf0094 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -338,12 +338,12 @@ em {
color: #7f6cd4;
}
-.comradio {
- color: #fcdf03;
+.emrgradio {
+ color: #dd3535;
}
.pirradio {
- color: #dd3535;
+ color: #fcdf03;
}
.clipradio {
@@ -374,10 +374,6 @@ em {
color: #8de7b6;
}
-.aiprivradio {
- color: #d65d95;
-}
-
.redteamradio {
color: #ff4444;
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index ae52ba0bfd8..49ccc958d5c 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -358,12 +358,12 @@ em {
color: #4e3399;
}
-.comradio {
- color: #948f02;
+.emrgradio {
+ color: #dd3535;
}
.pirradio {
- color: #a30000;
+ color: #fcdf03;
}
.clipradio {
@@ -394,10 +394,6 @@ em {
color: #508166;
}
-.aiprivradio {
- color: #ff00ff;
-}
-
.redteamradio {
color: #ff0000;
}
diff --git a/tgui/packages/tgui/constants.ts b/tgui/packages/tgui/constants.ts
index 270ce9873bd..9ce78db7865 100644
--- a/tgui/packages/tgui/constants.ts
+++ b/tgui/packages/tgui/constants.ts
@@ -70,7 +70,7 @@ export const CSS_COLORS = [
/* IF YOU CHANGE THIS KEEP IT IN SYNC WITH CHAT CSS */
export const RADIO_CHANNELS = [
{
- name: 'Syndicate',
+ name: 'Coalition',
freq: 1213,
color: '#8f4a4b',
},
@@ -95,55 +95,55 @@ export const RADIO_CHANNELS = [
color: '#fdfd34',
},
{
- name: 'CentCom',
+ name: 'NT-CC',
freq: 1337,
color: '#2681a5',
},
{
- name: 'Supply',
+ name: 'SolCon',
+ freq: 1345,
+ color: '#7589af',
+ },
+ {
+ name: 'IRMG',
freq: 1347,
color: '#b88646',
},
{
- name: 'Service',
+ name: 'PGF',
freq: 1349,
- color: '#6ca729',
+ color: '#199943',
},
{
- name: 'Science',
+ name: 'Nanotrasen',
freq: 1351,
color: '#c68cfa',
},
{
- name: 'Command',
+ name: 'Emergency',
freq: 1353,
- color: '#fcdf03',
+ color: '#dd3535',
},
{
- name: 'Medical',
+ name: 'Minutemen',
freq: 1355,
color: '#57b8f0',
},
{
- name: 'Engineering',
- freq: 1357,
- color: '#f37746',
- },
- {
- name: 'Security',
+ name: 'Unidentified',
freq: 1359,
- color: '#dd3535',
- },
- {
- name: 'AI Private',
- freq: 1447,
- color: '#d65d95',
+ color: '#fcdf03',
},
{
name: 'Common',
freq: 1459,
color: '#1ecc43',
},
+ {
+ name: 'Wideband',
+ freq: 1681,
+ color: '#8de7b6',
+ },
] as const;
const GASES = [
@@ -239,7 +239,7 @@ const GASES = [
color: 'paleturquoise',
},
{
- id: 'hydrogen',
+ id: 'h2',
path: '/datum/gas/hydrogen',
name: 'Hydrogen',
label: 'H₂',
@@ -294,6 +294,20 @@ const GASES = [
label: 'Nitrium',
color: 'brown',
},
+ {
+ id: 'cl2',
+ path: '/datum/gas/cl2',
+ name: 'Chlorine',
+ label: 'Cl₂',
+ color: 'yellow',
+ },
+ {
+ id: 'hcl',
+ path: '/datum/gas/hcl',
+ name: 'Hydrogen Chloride',
+ label: 'HCl',
+ color: 'greenyellow',
+ },
] as const;
// Returns gas label based on gasId
diff --git a/tgui/packages/tgui/interfaces/Bepis.js b/tgui/packages/tgui/interfaces/Bepis.js
deleted file mode 100644
index 99718415ddc..00000000000
--- a/tgui/packages/tgui/interfaces/Bepis.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import { useBackend } from '../backend';
-import {
- Box,
- Button,
- Grid,
- LabeledList,
- NumberInput,
- Section,
-} from '../components';
-import { Window } from '../layouts';
-
-export const Bepis = (props, context) => {
- const { act, data } = useBackend(context);
- const { amount } = data;
- return (
-
-
-
- act('toggle_power')}
- />
- }
- >
- All you need to know about the B.E.P.I.S. and you! The B.E.P.I.S.
- performs hundreds of tests a second using electrical and financial
- resources to invent new products, or discover new technologies
- otherwise overlooked for being too risky or too niche to produce!
-
- act('account_reset')}
- />
- }
- >
- Console is currently being operated by{' '}
- {data.account_owner ? data.account_owner : 'no one'}.
-
-
-
-
-
-
- {data.stored_cash}
-
-
- {data.accuracy_percentage}%
-
-
- {data.positive_cash_offset}
-
-
- {data.negative_cash_offset}
-
-
-
- act('amount', {
- amount: value,
- })
- }
- />
-
-
-
-
-
-
-
-
- Average technology cost: {data.mean_value}
-
- Current chance of Success: Est. {data.success_estimate}%
-
- {data.error_name && (
-
- Previous Failure Reason: Deposited cash value too low.
- Please insert more money for future success.
-
- )}
-
-
-
-
-
-
-
- );
-};
diff --git a/tgui/packages/tgui/interfaces/BlackMarketUplink.js b/tgui/packages/tgui/interfaces/BlackMarketUplink.js
index 2c4a05d09ef..9fff7cff715 100644
--- a/tgui/packages/tgui/interfaces/BlackMarketUplink.js
+++ b/tgui/packages/tgui/interfaces/BlackMarketUplink.js
@@ -23,7 +23,7 @@ export const BlackMarketUplink = (props, context) => {
viewing_category,
} = data;
return (
-
+ {
- return (
-
-
-
-
-
- );
-};
-
-export const CargoContent = (props, context) => {
- const { act, data } = useBackend(context);
- const [tab, setTab] = useSharedState(context, 'tab', 'catalog');
- const { requestonly } = data;
- const cart = data.cart || [];
- const requests = data.requests || [];
- return (
-
-
-
-
- setTab('catalog')}
- >
- Catalog
-
- 0 && 'yellow'}
- selected={tab === 'requests'}
- onClick={() => setTab('requests')}
- >
- Requests ({requests.length})
-
- {!requestonly && (
- <>
- 0 && 'yellow'}
- selected={tab === 'cart'}
- onClick={() => setTab('cart')}
- >
- Checkout ({cart.length})
-
- setTab('help')}
- >
- Help
-
-
- )}
-
-
- {tab === 'catalog' && }
- {tab === 'requests' && }
- {tab === 'cart' && }
- {tab === 'help' && }
-
- );
-};
-
-const CargoStatus = (props, context) => {
- const { act, data } = useBackend(context);
- const {
- department,
- grocery,
- away,
- docked,
- loan,
- loan_dispatched,
- location,
- message,
- points,
- requestonly,
- can_send,
- } = data;
- return (
-
- formatMoney(value)}
- />
- {' credits'}
-
- }
- >
-
-
- {(docked && !requestonly && can_send && (
-
- {message}
- {!!loan && !requestonly && (
-
- {(!loan_dispatched && (
-
- )}
-
-
- );
-};
-
-/**
- * Take entire supplies tree
- * and return a flat supply pack list that matches search,
- * sorted by name and only the first page.
- * @param {any[]} supplies Supplies list.
- * @param {string} search The search term
- * @returns {any[]} The flat list of supply packs.
- */
-const searchForSupplies = (supplies, search) => {
- search = search.toLowerCase();
-
- return flow([
- (categories) => categories.flatMap((category) => category.packs),
- filter(
- (pack) =>
- pack.name?.toLowerCase().includes(search.toLowerCase()) ||
- pack.desc?.toLowerCase().includes(search.toLowerCase())
- ),
- sortBy((pack) => pack.name),
- (packs) => packs.slice(0, 25),
- ])(supplies);
-};
-
-export const CargoCatalog = (props, context) => {
- const { express } = props;
- const { act, data } = useBackend(context);
-
- const { self_paid, app_cost } = data;
-
- const supplies = Object.values(data.supplies);
-
- const [activeSupplyName, setActiveSupplyName] = useSharedState(
- context,
- 'supply',
- supplies[0]?.name
- );
-
- const [searchText, setSearchText] = useSharedState(
- context,
- 'search_text',
- ''
- );
-
- const activeSupply =
- activeSupplyName === 'search_results'
- ? { packs: searchForSupplies(supplies, searchText) }
- : supplies.find((supply) => supply.name === activeSupplyName);
-
- return (
-
-
- act('toggleprivate')}
- />
-
- )
- }
- >
-
-
-
-
-
-
-
-
-
- {
- if (value === searchText) {
- return;
- }
-
- if (value.length) {
- // Start showing results
- setActiveSupplyName('search_results');
- } else if (activeSupplyName === 'search_results') {
- // return to normal category
- setActiveSupplyName(supplies[0]?.name);
- }
- setSearchText(value);
- }}
- onChange={(e, value) => {
- // Allow edge cases like the X button to work
- const onInput = e.target?.props?.onInput;
- if (onInput) {
- onInput(e, value);
- }
- }}
- />
-
-
-
- {supplies.map((supply) => (
- {
- setActiveSupplyName(supply.name);
- setSearchText('');
- }}
- >
- {supply.name} ({supply.packs.length})
-
- ))}
-
-
-
-